lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r927696 - in /lucene/dev/trunk/lucene: ./ contrib/ contrib/benchmark/ contrib/fast-vector-highlighter/ contrib/highlighter/ contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ contrib/highlighter/src/test/org/apache/lucen...
Date Fri, 26 Mar 2010 05:21:14 GMT
Author: rmuir
Date: Fri Mar 26 05:21:13 2010
New Revision: 927696

URL: http://svn.apache.org/viewvc?rev=927696&view=rev
Log:
LUCENE-2323: reorganize contrib modules (phase 1)

Added:
    lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/
    lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/
    lucene/dev/trunk/lucene/contrib/queries/lib/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/regex/lib/
    lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/regex/src/java/org/apache/lucene/search/regex/
    lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/regex/src/java/org/apache/regexp/
    lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/regex/src/test/org/apache/lucene/search/regex/
    lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/
    lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/
    lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/ext/
    lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/
    lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/
    lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/
    lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/ext/
    lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/
      - copied from r927689, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/
Removed:
    lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/ext/
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/
    lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/
    lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/
    lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/ext/
    lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/
    lucene/dev/trunk/lucene/contrib/regex/
Modified:
    lucene/dev/trunk/lucene/build.xml
    lucene/dev/trunk/lucene/contrib/CHANGES.txt
    lucene/dev/trunk/lucene/contrib/benchmark/build.xml
    lucene/dev/trunk/lucene/contrib/highlighter/build.xml
    lucene/dev/trunk/lucene/contrib/misc/build.xml
    lucene/dev/trunk/lucene/contrib/queries/README.txt
    lucene/dev/trunk/lucene/contrib/queries/build.xml
    lucene/dev/trunk/lucene/contrib/queries/pom.xml.template
    lucene/dev/trunk/lucene/contrib/queryparser/build.xml
    lucene/dev/trunk/lucene/docs/contributions.html
    lucene/dev/trunk/lucene/docs/demo.html
    lucene/dev/trunk/lucene/docs/demo2.html
    lucene/dev/trunk/lucene/docs/demo3.html
    lucene/dev/trunk/lucene/docs/demo4.html
    lucene/dev/trunk/lucene/docs/fileformats.html
    lucene/dev/trunk/lucene/docs/gettingstarted.html
    lucene/dev/trunk/lucene/docs/index.html
    lucene/dev/trunk/lucene/docs/linkmap.html
    lucene/dev/trunk/lucene/docs/linkmap.pdf
    lucene/dev/trunk/lucene/docs/lucene-contrib/index.html
    lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf
    lucene/dev/trunk/lucene/docs/queryparsersyntax.html
    lucene/dev/trunk/lucene/docs/scoring.html
    lucene/dev/trunk/lucene/docs/systemrequirements.html
    lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
    lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/site.xml

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Mar 26 05:21:13 2010
@@ -287,14 +287,12 @@ The source distribution does not contain
           <packageset dir="contrib/icu/src/java"/>
           <packageset dir="contrib/db/bdb-je/src/java"/>
           <packageset dir="contrib/db/bdb/src/java"/>
-          <packageset dir="contrib/fast-vector-highlighter/src/java"/>
           <packageset dir="contrib/highlighter/src/java"/>
           <packageset dir="contrib/instantiated/src/java"/>
           <packageset dir="contrib/lucli/src/java"/>
           <packageset dir="contrib/memory/src/java"/>
           <packageset dir="contrib/misc/src/java"/>
           <packageset dir="contrib/queries/src/java"/>
-          <packageset dir="contrib/regex/src/java"/>
           <packageset dir="contrib/remote/src/java"/>
           <packageset dir="contrib/spatial/src/java"/>
           <packageset dir="contrib/spellchecker/src/java"/>
@@ -319,15 +317,13 @@ The source distribution does not contain
           <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
           <group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
           <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
-          <group title="contrib: Fast Vector Highlighter" packages="org.apache.lucene.search.vectorhighlight*"/>
-          <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
+          <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight:*org.apache.lucene.search.vectorhighlight*"/>
           <group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
           <group title="contrib: Lucli" packages="lucli*"/>
           <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
-          <group title="contrib: Misc " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
-          <group title="contrib: Queries" packages="org.apache.lucene.search.similar*"/>
+          <group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
+          <group title="contrib: Queries" packages="org.apache.lucene.search.similar*:org.apache.lucene.search.regex*:org.apache.regexp*"/>
           <group title="contrib: Query Parser" packages="org.apache.lucene.queryParser.*"/>
-          <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
           <group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
           <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
           <group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>

Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Fri Mar 26 05:21:13 2010
@@ -112,6 +112,10 @@ Build
  * 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)
+
+ * 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)
    
 Optimizations
 

Modified: lucene/dev/trunk/lucene/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/benchmark/build.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/benchmark/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/benchmark/build.xml Fri Mar 26 05:21:13 2010
@@ -130,7 +130,6 @@
         <pathelement path="${common.dir}/build/classes/demo"/>
         <pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
         <pathelement path="${common.dir}/build/contrib/memory/classes/java"/>
-        <pathelement path="${common.dir}/build/contrib/fast-vector-highlighter/classes/java"/>
         <pathelement path="${common.dir}/build/contrib/analyzers/common/classes/java"/>
     	<fileset dir="lib">
     		<include name="**/*.jar"/>
@@ -244,12 +243,7 @@
          <fileset dir="${common.dir}/contrib/memory" includes="build.xml"/>
       </subant>
     </target>
-    <target name="compile-vector-highlighter">
-      <subant target="compile">
-         <fileset dir="${common.dir}/contrib/fast-vector-highlighter" includes="build.xml"/>
-      </subant>
-    </target>
 
-    <target name="init" depends="common.init,compile-demo,compile-memory,compile-highlighter,compile-vector-highlighter"/>
+    <target name="init" depends="common.init,compile-demo,compile-memory,compile-highlighter"/>
     
 </project>

Modified: lucene/dev/trunk/lucene/contrib/highlighter/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/build.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/build.xml Fri Mar 26 05:21:13 2010
@@ -28,25 +28,25 @@
   <property name="memory.jar" location="${common.dir}/build/contrib/memory/lucene-memory-${version}.jar"/>
   <available property="memory.jar.present" type="file" file="${memory.jar}"/>
   
-  <property name="regex.jar" location="${common.dir}/build/contrib/regex/lucene-regex-${version}.jar"/>
-  <available property="regex.jar.present" type="file" file="${regex.jar}"/>
+  <property name="queries.jar" location="${common.dir}/build/contrib/queries/lucene-queries-${version}.jar"/>
+  <available property="queries.jar.present" type="file" file="${queries.jar}"/>
 
   <path id="classpath">
     <pathelement path="${lucene.jar}"/>
     <pathelement path="${memory.jar}"/>
-    <pathelement path="${regex.jar}"/>
+    <pathelement path="${queries.jar}"/>
     <pathelement path="${project.classpath}"/>
   </path>
 
-  <target name="compile-core" depends="build-memory, build-regex, common.compile-core" />
+  <target name="compile-core" depends="build-memory, build-queries, common.compile-core" />
 
   <target name="build-memory" unless="memory.jar.present">
     <echo>Highlighter building dependency ${memory.jar}</echo>
     <ant antfile="../memory/build.xml" target="default" inheritall="false" dir="../memory" />
   </target>
   
-  <target name="build-regex" unless="regex.jar.present">
-    <echo>Highlighter building dependency ${regex.jar}</echo>
-    <ant antfile="../regex/build.xml" target="default" inheritall="false" dir="../regex" />
+  <target name="build-queries" unless="queries.jar.present">
+    <echo>Highlighter building dependency ${queries.jar}</echo>
+    <ant antfile="../queries/build.xml" target="default" inheritall="false" dir="../queries" />
   </target>
 </project>

Modified: lucene/dev/trunk/lucene/contrib/misc/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/build.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/misc/build.xml Fri Mar 26 05:21:13 2010
@@ -27,17 +27,4 @@
 
   <import file="../contrib-build.xml"/>
 
-  <property name="javacc.path" location="src/java/org/apache/lucene/queryParser/precedence"/>
-
-  <target name="javacc" depends="javacc-check" description="generate precedence query parser from jj (requires javacc 3.2)">
-    <delete>
-      <fileset dir="${javacc.path}" includes="*.java">
-        <containsregexp expression="Generated.*By.*JavaCC"/>
-      </fileset>
-    </delete>
-    <invoke-javacc target="${javacc.path}/PrecedenceQueryParser.jj"
-                   outputDir="${javacc.path}"
-    />
-  </target>
-
 </project>

Modified: lucene/dev/trunk/lucene/contrib/queries/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/README.txt?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/README.txt (original)
+++ lucene/dev/trunk/lucene/contrib/queries/README.txt Fri Mar 26 05:21:13 2010
@@ -17,6 +17,7 @@ but reduces the overall score of docs co
 a sequence. An example might be a collection of primary keys from a database query result or perhaps 
 a choice of "category" labels picked by the end user.
 
+==== RegexQuery - Implements the regular expression term search query. 
 
 Mark Harwood
 25/02/2006

Modified: lucene/dev/trunk/lucene/contrib/queries/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/build.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/queries/build.xml Fri Mar 26 05:21:13 2010
@@ -23,5 +23,14 @@
     Queries - various query object exotica not in core
   </description>
 
+  <path id="additional.dependencies">
+    <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
+  </path>
+
+  <pathconvert property="project.classpath"
+               targetos="unix"
+               refid="additional.dependencies"
+  />
+
   <import file="../contrib-build.xml"/>
 </project>

Modified: lucene/dev/trunk/lucene/contrib/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/pom.xml.template?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/pom.xml.template (original)
+++ lucene/dev/trunk/lucene/contrib/queries/pom.xml.template Fri Mar 26 05:21:13 2010
@@ -35,4 +35,11 @@
     Queries - various query object exotica not in core
   </description>
   <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>${jakarta-regexp-version}</version>
+    </dependency>
+  </dependencies>
 </project>

Modified: lucene/dev/trunk/lucene/contrib/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/build.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/build.xml Fri Mar 26 05:21:13 2010
@@ -28,7 +28,9 @@
   <!--
     NOTE: see the README.javacc for details on how to fully regenerate the parser
   -->
-  <target name="javacc" depends="init,javacc-check" if="javacc.present">
+  <target name="javacc" depends="javacc-flexible,javacc-precedence"/>
+
+  <target name="javacc-flexible" depends="init,javacc-check" if="javacc.present">
     <invoke-javacc target="src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj"
                    outputDir="src/java/org/apache/lucene/queryParser/standard/parser"
     />
@@ -86,5 +88,17 @@
   	                         flags="g"
   	                         byline="false"/>
   </target>
+  
+  <property name="javacc.precedence.path" location="src/java/org/apache/lucene/queryParser/precedence"/>
 
+  <target name="javacc-precedence" depends="javacc-check" description="generate precedence query parser from jj (requires javacc 3.2)">
+    <delete>
+      <fileset dir="${javacc.precedence.path}" includes="*.java">
+        <containsregexp expression="Generated.*By.*JavaCC"/>
+      </fileset>
+    </delete>
+    <invoke-javacc target="${javacc.precedence.path}/PrecedenceQueryParser.jj"
+                   outputDir="${javacc.precedence.path}"
+    />
+  </target>
 </project>

Modified: lucene/dev/trunk/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/contributions.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/contributions.html (original)
+++ lucene/dev/trunk/lucene/docs/contributions.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo.html (original)
+++ lucene/dev/trunk/lucene/docs/demo.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo2.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo2.html (original)
+++ lucene/dev/trunk/lucene/docs/demo2.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo3.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo3.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo3.html (original)
+++ lucene/dev/trunk/lucene/docs/demo3.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo4.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo4.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo4.html (original)
+++ lucene/dev/trunk/lucene/docs/demo4.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/fileformats.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/fileformats.html (original)
+++ lucene/dev/trunk/lucene/docs/fileformats.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
@@ -439,7 +433,6 @@ document.write("Last Published: " + docu
 	        written to the index (they can still be read, but on
 	        merge the new segment will write them,
 	        uncompressed). See issue LUCENE-1960 for details.
-
             </p>
 </div>
 

Modified: lucene/dev/trunk/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/gettingstarted.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/trunk/lucene/docs/gettingstarted.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/index.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/index.html (original)
+++ lucene/dev/trunk/lucene/docs/index.html Fri Mar 26 05:21:13 2010
@@ -151,9 +151,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -178,9 +175,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/linkmap.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/linkmap.html (original)
+++ lucene/dev/trunk/lucene/docs/linkmap.html Fri Mar 26 05:21:13 2010
@@ -151,9 +151,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -178,9 +175,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
@@ -367,12 +361,6 @@ document.write("Last Published: " + docu
 		    
 <ul>
 <li>
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-fast-vector-highlighter</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
 <a href="api/contrib-highlighter/index.html">Highlighter</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-highlighter</em>
 </li>
 </ul>
@@ -418,12 +406,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-queryparser</em>
 </li>
 </ul>
-		    
-<ul>
-<li>
-<a href="api/contrib-regex/index.html">Regex</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-regex</em>
-</li>
-</ul>
 			
 		    
 <ul>

Modified: lucene/dev/trunk/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/linkmap.pdf?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/linkmap.pdf (original)
+++ lucene/dev/trunk/lucene/docs/linkmap.pdf Fri Mar 26 05:21:13 2010
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1056 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1070 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.>u03/(kqGU.rkq4nbes=Z7SEG+\`X+DT4N$e0TZ(@>S4,If8W/D<r%%/MJYfS;;6Xf04*c:M-@4k9RhW^gOSf61^A%?uS%k!Rr2*,j$)E&.flfZW6Mnj>pB51^J(8lRO>aH1A*OO55Y\\6W:ib=-V;/INj4<M'I[K%ZuDAc]cNZX_%M#]N==]31HO7Y7$Y-hah/%^uT.TXATs<@5=D>-8p5;H[Ytg`D;]DE0/hW`IY2<U38/4Zi5=ZNMQDQMh"tp.DRqRV?1M!kPH+C7WMa+>MLcs#g;6$h>N.bS*5QG9tu^r=G>8#`8V:%X*Y)>PqWlY#fr*KZ_JI-lSc^,RJXRk%4Bm(_AVR(tO1"BV.5hg>qg=0GPi"K\7F.?F5b%@M!n-VO8k#A3G=O,!^,6>,45S5?D;,7:Xd=cQQ@m%?;7`XFYEa[npMe#ksI$g'.)(XADoG3uC`M@sEZ4M[jX*h6Wi?12e+:MN)9O4*4&:F(3b\^=DSB2q+QDY46Nm4T7BQKY-eZVGJ,c4taqT*Uk+AZh8NMJ!Di'8)>:HPH/_KbYU[hkjQUTNGosWO8jD73#:>Wp%8;3jupN@eCOf_67eaYbA(u0R&"^?]-[c9U$,bX=:+Wn`Uui&WdBCpZb2Cm/i\1qAp!\jTSqL+`o/3fr<D1p*`cA^[^>8#%k%>jNsdg)-OE!O5@+HB:D`hj4IH^UZ"Xk'lc:1=h9Pn]N0uoPRP2;qI".jr!m[e2n,d'/d76e,)4nnnc#cu-#(mOt*]f>%&SGb)LPhf"G(2,ZX4tA1<0c!lc%_o,]2/6.[a`(W%K0m21c<-Oik3W[iMM/51Y]76@MJ\arf6?*bousKnT'-?0;`+6dZPsGNr1&5T!%tdQp9pR7BQ3!-PoD#h_Lm;S)O,^JN?8[f#QJ-=0q@42K;8X.:N<p\0/R<W+<+LI2Pc'IT`^=Yh^tQ324XN/gJA$_HDs3^nTD.>!>,OB)0#tn-s!.)ds#
 _[=?K'h=LD=V"XSp>c9#I=_H%'FYRfXB#+8Pk*9mIBY8+rXIk*p7a=;$qB)D%jG*~>
+Gau1.?#Q2d(kqGM/%BCKiqXP'9[ZpVeS1J@?*2RDJJ;8h)*"1u?U#K#YfU-GFDKA1)tf`Ap3AB!Y%R2UM2*O1hKgu1l78GlmpUr5-pPc\<?J+M&0?)^XnVMT2AbVg2og@in!r4pjjQ-A%3=cu^<l:LS)JZnPp.eKF7+JJf%8?<GmJW>L)ol6^`i+3elgiX$)[-\l.==%fb8IecEb%t=ZSD!C:buoU%L7QhMTHDEtXpA,O0\.p2p_&m)[&h64a>aq]3]CQ,+ZCVM0!qk[ChWq`$/B&qd=VpX>b0+?pIV49Pe,;mI@;*<L9c5nUoZ^n)e#%K<)ZpKP1GOiXSD.N4u`KHW75Ot(o4%#CqoL?2bMg8F,@Ia6E7PGoD`-;=04NhS-]Ld>Dl>@g\-O>bRcb6J.TVF>mZZu^pN;)BC_rJ\:eH?-Y(B.]@Aha>ZK<nKj\kn)&PZ;T3JrF@n`N8ZrY/I&^kgTdK;12@b48'b$KfVqLnM\DQqO.E.phGfV@\/%Lf4oR3JKU_Nqdl^O>/hY64(%<l>VX#>>r[MV-n?"QeO`%5a0gdO\Tmn1X>%&3b&,pb^(`(#r\S;*XocBcHC9)nS)&4g>dX#pGW2+DOQmO&pGr3%@=:)@c`U,R``NY'"ZFil#6ZA&@9^0\O@#3KEN73Q<j;WWK3?DV(f](=>4ri9T]I:b[S:l8@I_#a#:$:8p]M,3#=I"`-2<;f*pPCuRR+[ZSq<!a%T2-.e^c=7mrd`X)\1"=>_ooEG1RXN+ae4<c9ul`_i>bNrW#/\[pE/s]XH:3V%@*\r's2@0VTj3)(GA2-o!qqPGtUEWe^rp'S9_bknt?%f$g=U,KIju&&o$p&#urY7L<g1)@H8Wp`*-(0lr)o.;.6s-L;=_7kT!idPZeI[UYMR/Qg&''[[Y%j0S\BV(9PaVp$>1qSo,'o#l;>L*c5%&^s&iXD_q8Q>H2bS*'=B&3BY)@A_JjY0a9ti]T<-UGJ:+mpJS%
 Y(_52BR%^4-+lq@f4O['eMd7%_mFuA#IR^`rF'7nRUcn5KmGHW!c+_SO2d0GRY4Zk)J77ZV!@ip"n,~>
 endstream
 endobj
 6 0 obj
@@ -20,10 +20,10 @@ endobj
 >>
 endobj
 7 0 obj
-<< /Length 1136 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1052 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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?<dDkeUF'UjNbq/f7#bet4(iK*<NgZX!kq.M&+X2L)`L'/'>D1R2u0=`[`AQfkWc@.D;:8(HMYEJO:KS.pnpfSV0I0kWr#p<@&$?O9U0B&Zo!algU<i%:lAYI7F'au%&!uou]=0P09Mb9095R6Sl8a/p&6R$7fD1t"1b95c]j9ZAV0Up+C]C:a.Q-t*#f.=:#9A.76.kM:s>jCM1q?Ug$@lIZKe9<oJM/Lf[]=n0Ap?HjHrs?K.SUV-L3rpEIFrU>+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<iHoR<+ri'd"qMcBe<1l><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/<Le[V#D\SLF[k1U.@NR)^mSd2%Skf(--#rY\Bh;8k:*5hUKO&HEN7n*>g<+k^e+IqC8:Yr6_@`/'g^H5sPO=`Zet/9a2j8hLCeU32cNea&Y&37Gh#:?bZbj_]P?mt0c/PRJ_+tt;A.UaY-^H*0!7OK>BX`4
 g]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~>
+GatUs>Ar4L'Z],,'R<q*n9e%&fN)M1e4OLBlD/QkggFeb0%:3(I/>o_&r2oH!M5;pkPmX;\MuO+ak%DO&-gKaX<u:s:QP\O(HIjZ]uV&r*)^D]428NmA'D*G.7+I.T>'*9=WjJ1,Vn1eHC_lmq=!S2b5('KIV:0ZP\O_WFTK>.'`'36`A.n"6(6jaI$quXl0*bjpo%&H$`F7%@4,&'a$V&J+\dYSj'*`_KS_gAcX7g$N@XUu:mk:ja.jGO\E/eQfQ`f5&^,U&2P]:WUl;MCoX"<&gFeUO7clG`=^lcCELP(/:-t]o$@PlR9+4[<HZ%0=+qI+!*YW6]DG'OUZUSG\PM-[s^=<r8]ZOV\*6[!`pOVe$18h3ZSKVBW:\"6UWH=IX8&JdE32`Xn$11T#L_T]&`qN(!@Bpr6#sH(0C^Q\?<XJqfeFTf]oFu2[X^$Tir-#ZepTZ0qkM3Nr6`_oIQIJj5QANi+QW0*DSgeYGg1Un711Vu9?h\b]$a)S^-QSS;:'*>EH>Kms<G:Ge:4L2ZeUscP9c3C5&=pr16^Gp*%J*H2m6]VeAWgCS,Z.o+.qOt(I"7[\p2%LG[UPSYBegTj\9\0a;^a=_%l&D(/>$34N$]dRmsHG<L2".\QY0_PgJa]?.Mh%TQuH+KX_/!D[)-q83$(D_fK'k`b<2sHDG<4=L!&N@5s\aOG;a>Rk.<`Uk@\[,MM\`cmWO.T3nmi9j_.J=i'm;XP#84+'`Tj>,hB![>q5#m,SqPh<)7L>2[$1iPgtd!:pEOX\#qugcM4)+-n-g)L.'Vf*9,u%>"6Ju]r\4Cn,(O=r<.:+5l3J[%hluP"<d&4O3GN4cAZ$l.9qmU&r+LT(0b9c+^QAa?g5]eMbNM[iGXXr>PZS-(PkUX+d_H@=;VTWjs]Jq-4c<0i[#300q$$+*cZQ74P+Mki7c]$SM1YW?SZbG/nLST9uIn<3HOht+cImP\*<UZ_Y%\NqX]SmJ&Vo)(5@p
 [f&B]<`q<@8?$i0Go"@kjQ!&)g'LfJ9S]@J'2+m8;@nSt+hrPKXHhSW7S\DB~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000003216 00000 n 
-0000003280 00000 n 
-0000003330 00000 n 
+0000003146 00000 n 
+0000003210 00000 n 
+0000003260 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001219 00000 n 
-0000001325 00000 n 
-0000002553 00000 n 
-0000002659 00000 n 
-0000002771 00000 n 
-0000002881 00000 n 
-0000002992 00000 n 
-0000003100 00000 n 
+0000001233 00000 n 
+0000001339 00000 n 
+0000002483 00000 n 
+0000002589 00000 n 
+0000002701 00000 n 
+0000002811 00000 n 
+0000002922 00000 n 
+0000003030 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3452
+3382
 %%EOF

Modified: lucene/dev/trunk/lucene/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/lucene-contrib/index.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/trunk/lucene/docs/lucene-contrib/index.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">
@@ -282,9 +276,6 @@ document.write("Last Published: " + docu
 <a href="#highlighter">highlighter</a>
 </li>
 <li>
-<a href="#fast-vector-highlighter">fast-vector-highlighter</a>
-</li>
-<li>
 <a href="#icu">icu</a>
 </li>
 <li>
@@ -303,7 +294,7 @@ document.write("Last Published: " + docu
 <a href="#queryparser">queryparser</a>
 </li>
 <li>
-<a href="#regex">regex</a>
+<a href="#queries">queries</a>
 </li>
 <li>
 <a href="#remote">remote</a>
@@ -405,84 +396,78 @@ document.write("Last Published: " + docu
 <p>A set of classes for highlighting matching terms in search results.</p>
 <p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a>
 </p>
-<a name="N10080"></a><a name="fast-vector-highlighter"></a>
-<h3 class="boxed">fast-vector-highlighter</h3>
-<p>An alternative set of classes for highlighting matching terms in search results that relies on stored term vectors.
-                This highlighter can be much faster than the standard highlighter, especially on large fields.</p>
-<p>See <a href="../api/contrib-fast-vector-highlighter/index.html">fast-vector-highlighter javadoc</a>
-</p>
-<a name="N1008F"></a><a name="icu"></a>
+<a name="N10080"></a><a name="icu"></a>
 <h3 class="boxed">icu</h3>
 <p>Provides integration with ICU (International Components for Unicode) for
                 stronger Unicode and internationalization support. </p>
 <p>See <a href="../api/contrib-icu/index.html">icu javadoc</a>
 </p>
-<a name="N1009E"></a><a name="instantiated"></a>
+<a name="N1008F"></a><a name="instantiated"></a>
 <h3 class="boxed">instantiated</h3>
 <p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
 <p>See <a href="../api/contrib-instantiated/index.html">instantiated javadoc</a>
 </p>
-<a name="N100AD"></a><a name="lucli"></a>
+<a name="N1009E"></a><a name="lucli"></a>
 <h3 class="boxed">lucli</h3>
 <p>An application that allows Lucene index manipulation from the command-line.</p>
 <p>See <a href="../api/contrib-lucli/index.html">lucli javadoc</a>
 </p>
-<a name="N100BC"></a><a name="memory"></a>
+<a name="N100AD"></a><a name="memory"></a>
 <h3 class="boxed">memory</h3>
 <p>High-performance single-document main memory index.</p>
 <p>See <a href="../api/contrib-memory/index.html">memory javadoc</a>
 </p>
-<a name="N100CB"></a><a name="misc"></a>
+<a name="N100BC"></a><a name="misc"></a>
 <h3 class="boxed">misc</h3>
 <p>A variety of miscellaneous files, including QueryParsers, and other alternate Lucene class implementations and tools.</p>
 <p>See <a href="../api/contrib-misc/index.html">misc javadoc</a>
 </p>
-<a name="N100DA"></a><a name="queryparser"></a>
+<a name="N100CB"></a><a name="queryparser"></a>
 <h3 class="boxed">queryparser</h3>
 <p>A new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.</p>
 <p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a>
 </p>
-<a name="N100E9"></a><a name="regex"></a>
-<h3 class="boxed">regex</h3>
-<p>Queries with additional regex matching capabilities.</p>
-<p>See <a href="../api/contrib-regex/index.html">regex javadoc</a>
+<a name="N100DA"></a><a name="queries"></a>
+<h3 class="boxed">queries</h3>
+<p>Additional queries for Lucene.</p>
+<p>See <a href="../api/contrib-queries/index.html">queries javadoc</a>
 </p>
-<a name="N100F8"></a><a name="remote"></a>
+<a name="N100E9"></a><a name="remote"></a>
 <h3 class="boxed">remote</h3>
 <p>Classes to help use Lucene with RMI.</p>
 <p>See <a href="../api/contrib-remote/index.html">remote javadoc</a>
 </p>
-<a name="N10107"></a><a name="spatial"></a>
+<a name="N100F8"></a><a name="spatial"></a>
 <h3 class="boxed">spatial</h3>
 <p>Classes to help with efficient distance based sorting.</p>
 <p>See <a href="../api/contrib-spatial/index.html">spatial javadoc</a>
 </p>
-<a name="N10116"></a><a name="spellchecker"></a>
+<a name="N10107"></a><a name="spellchecker"></a>
 <h3 class="boxed">spellchecker</h3>
 <p>Provides tools for spellchecking and suggestions with Lucene.</p>
 <p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
 </p>
-<a name="N10125"></a><a name="surround"></a>
+<a name="N10116"></a><a name="surround"></a>
 <h3 class="boxed">surround</h3>
 <p>A QueryParser that supports the Span family of queries as well as pre and infix notation.</p>
 <p>See <a href="../api/contrib-surround/index.html">surround javadoc</a>
 </p>
-<a name="N10134"></a><a name="swing"></a>
+<a name="N10125"></a><a name="swing"></a>
 <h3 class="boxed">swing</h3>
 <p>Swing components designed to integrate with Lucene.</p>
 <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
 </p>
-<a name="N10143"></a><a name="wikipedia"></a>
+<a name="N10134"></a><a name="wikipedia"></a>
 <h3 class="boxed">wikipedia</h3>
 <p>Tools for working with wikipedia content.</p>
 <p>See <a href="../api/contrib-wikipedia/index.html">wikipedia javadoc</a>
 </p>
-<a name="N10152"></a><a name="wordnet"></a>
+<a name="N10143"></a><a name="wordnet"></a>
 <h3 class="boxed">wordnet</h3>
 <p>Tools to help utilize wordnet synonyms with Lucene</p>
 <p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
 </p>
-<a name="N10161"></a><a name="xml-query-parser"></a>
+<a name="N10152"></a><a name="xml-query-parser"></a>
 <h3 class="boxed">xml-query-parser</h3>
 <p>A QueryParser that can read queries written in an XML format.</p>
 <p>See <a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a>

Modified: lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf (original)
+++ lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf Fri Mar 26 05:21:13 2010
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1038 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1002 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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><JB.bJ)>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`@/<Cjt[4@32=r"GS*bt&YE'+H2=@Zit(n.bXL#I4#(eJ=jJXrR8J?4[@V(c\J+,N*MsECHL>1()ok1B.c9YLrToa)9Q$01!uPPpl@Hie?kgBHp_$q@VU/52\V"VaL^eZ"jYSoRh\M\u$,<Uj?6=]+%XK:>?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)=_<oFln_bH9(1,>l#rs/5DaJugl,BNPgJbs=lrqR5Pof(9ppY/*Pc&0ObA]51(0$RRY02aU%2qjH7S-<$t]TUfXMa(a=*`B(=gG)]Y7RLj>8^g8L.a)B$<T:KOaOWm+&,WI.+,OITkgN"dt"6*#)(?].faoXS&Sk^/%ET7G@h\I,lDW@bQRqKXY6tYbksiad&4p#CdK`drP.k%rUb@.VCJq@=)Mq/O=\/d>G#<?YB,q^fU0SL!`<,Tg\(W>Y:GSP,,>4pd=sUmn_[(R"p=L+%#Ol,oDPpee0&7?QU&
 5X4Q_ne**8k,E8o;eeLVfAN;U6fF;RGGjMVK70iJB-O,+m~>
+Gb!$G9lldX&;KZQ'fnA\X85)/*1KWCkk*:P\$cNnjd6>Y8)UuHYO>*%Y]cm//lfu'*1:(]%uXc-dVZSjE%d%R-mRtg_<a\+@,u=D$%j<p')PrO0Iju-Uc\-qq/N%g>CAk>,)Y@9o#i3.'l'rOII"&=>#RQ=OImfs$mS8q^PmOpS;J$B1@0`gZ\QtOU$Smm]c$gpTfZPf:#DQeS6bj/RBR\]:4oM2O5jnn(%'FhoK^b4fb:k2rVr5_=(3ZH'p,7/7CUTJ8P-l=SW:Pp8_$7W<b:CWO#Dt^gbU`&@0\rRR4HF+AhhPhij5ZX9RFl%Zh`BB'%4;QQBU)`r]sW]G*eUETChj=B#u!B5utiD31'n>nS=2Lq"h:M<oV=TVn#/QkS[CLgaIVU4DmgeD7/p1!%bJCKkps7+HV\=e''5Sa:Ia:fU%eJ#.Im.HgYR9)oWUndt45-=f^/GkB4R%A20"1.3rHo1c("B%s_<jPA7^`/*Odd3T)ZQOJ!n`i&H1`GI9GV-O8cfRK%S+#Tfe#ZVff9,,9fsdH'/8?_CgZ%IH#GbTp:ajN>JZRA34XcNe;^qogl\(#1BD*H=K5_)*nAb!F&B\1)L;.)?N4g:%OYarL(cScK;TRmG*i\0H(A.)E]HDY8?a('$/&d)&P2JU-%8=_=2Nln_bG9(1,>jdo6Wc4\7O\0Z4G.&#>[Z@kA`ro@uegG6t9%DZ@#Ob/Si0aEXMRY*?fU%7J?H7(Tm)&srcY]22UOAS>c/?25?n+G4'2$4bE#*Q310BSp)_Qe>8p3L"T^3:LR4rnZ;Q>.<Uga#e%E>Rc!;8TRrlUq%<6b!itBk.];Ef_q/mD<hZmp3JESn-s)Ph6&\<sASf/tUlrVE7`;/><aC'\kDa.$5]CPKi+Qimo0%MZ1.?)N-"?kQI,#7?^Q1":Y#4nQigm)7tYFN])@m`J9ae/0%hB4taN455eN#g1+aA2tp>k@3)F"MUKXfBXk;deCO-AJ*Ag
 2d/O/`lqd]~>
 endstream
 endobj
 6 0 obj
@@ -43,7 +43,6 @@ endobj
 44 0 R
 46 0 R
 48 0 R
-50 0 R
 ]
 endobj
 8 0 obj
@@ -109,7 +108,7 @@ endobj
 20 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 450.466 231.476 438.466 ]
+/Rect [ 108.0 450.466 138.164 438.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 21 0 R
@@ -119,7 +118,7 @@ endobj
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 432.266 138.164 420.266 ]
+/Rect [ 108.0 432.266 178.832 420.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 23 0 R
@@ -129,7 +128,7 @@ endobj
 24 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 414.066 178.832 402.066 ]
+/Rect [ 108.0 414.066 144.836 402.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 25 0 R
@@ -139,7 +138,7 @@ endobj
 26 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 395.866 144.836 383.866 ]
+/Rect [ 108.0 395.866 163.496 383.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 27 0 R
@@ -149,7 +148,7 @@ endobj
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 377.666 168.496 365.666 ]
+/Rect [ 108.0 377.666 151.168 365.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 29 0 R
@@ -159,7 +158,7 @@ endobj
 30 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 359.466 151.168 347.466 ]
+/Rect [ 108.0 359.466 185.14 347.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 31 0 R
@@ -169,7 +168,7 @@ endobj
 32 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 341.266 185.14 329.266 ]
+/Rect [ 108.0 341.266 163.156 329.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 33 0 R
@@ -179,7 +178,7 @@ endobj
 34 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 323.066 155.152 311.066 ]
+/Rect [ 108.0 323.066 161.824 311.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 35 0 R
@@ -189,7 +188,7 @@ endobj
 36 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 304.866 161.824 292.866 ]
+/Rect [ 108.0 304.866 159.832 292.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 37 0 R
@@ -199,7 +198,7 @@ endobj
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 286.666 159.832 274.666 ]
+/Rect [ 108.0 286.666 188.476 274.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 39 0 R
@@ -209,7 +208,7 @@ endobj
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 268.466 188.476 256.466 ]
+/Rect [ 108.0 268.466 171.16 256.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 41 0 R
@@ -219,7 +218,7 @@ endobj
 42 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 250.266 171.16 238.266 ]
+/Rect [ 108.0 250.266 157.168 238.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 43 0 R
@@ -229,7 +228,7 @@ endobj
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 232.066 157.168 220.066 ]
+/Rect [ 108.0 232.066 175.828 220.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 45 0 R
@@ -239,7 +238,7 @@ endobj
 46 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 213.866 175.828 201.866 ]
+/Rect [ 108.0 213.866 167.824 201.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 47 0 R
@@ -249,7 +248,7 @@ endobj
 48 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 195.666 167.824 183.666 ]
+/Rect [ 108.0 195.666 211.804 183.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 49 0 R
@@ -257,279 +256,261 @@ endobj
 >>
 endobj
 50 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 177.466 211.804 165.466 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 51 0 R
-/H /I
->>
-endobj
-52 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<E>[$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<OPuLtjP36_$PKJ<26m-K\0Vrklhc_fY<c.5#j;gnRV0oj=^VJGTA>;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`kq2
 j;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<INCr"nDKmW8S%Y6W<[@X#Xr"^2_fcu^GA?tI+O'G/TLXX`K)*H\A*JYOenc):a"mK%Z*lb%m^#^0g4J8cHJf!CX,"*S7+lTsid.MSCtU//Sl5s-lK'24:`A?9)(?'?aE.Y:T\Fm`!X61#Y`UjE7K9!!cl`HY:Ig'670d<[B\3TM,n(g[/Q8-19W/K4$3XL)L$X:(.+IpH%os[aO?t/'U6:NF>)+c'[$8[3d^@^##4`q?0U(FeTd<ECW7<<BMd`=C^CG7]N^MUA,QLmkCmjpm"1=>MFT\.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-]<Q\,Tso@/0rgE:!"oZS'*~>
 endstream
 endobj
-53 0 obj
+51 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 52 0 R
+/Contents 50 0 R
 >>
 endobj
-54 0 obj
-<< /Length 1328 /Filter [ /ASCII85Decode /FlateDecode ]
+52 0 obj
+<< /Length 1335 /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'0<UnVB@O3CqibfVX80CZi#u\MJp/aEHpT]p"F]T2]PUZ[NAT1erRoBZ(HD6=7VmAMKjB%Es/%aP;%k>nN[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<M%Ie*/.-qj0h7u/IM5mog_F0@RTD2+5m8Hmae*2\4<_tO,LD83!>(_HHIuIin)Zu@2uKSs+eYOqn(2'i60[JEi@BcPkh\*<u#jXWmWNMj6'=<<MmK80<@+`<97G7CGD^i67F$e<)/um5YpnAhp3K^NceVF40'uc#sdOBJ\!mG/uU$d!"n+.I_ppt*-ENS*L1Kd=tOUG>S[Hr"TsF^Es77X!XT_S$Qj;9=`7lH!Wk.Mf2@N+V;14Irr0S[oaNlsf0Q$LrnhJ>ebu6R_/"hK=K,pp0kTiA5"<t6HgJ[+hg-trAMi6_MBg48j]$gDGA,ZRW2)SU\7=K
 jPJkpAIS=gr-kMUg+;Xb-EublJ^`o@q]%;)-dq9C5lGGb2WWu<@59Eg(W^UnBZIJP%J%"Ia</'eVZVRX=fjsDRQYMh!'Jf_Zn,^j&XtE3uU<M^.T2.-bbV_"6&r`L(E1r/l1cgk>mVsKlM9e-=DHhc!ESo8$m8N/mM$]6Jcbe/\qP>/!WmVe+]Z%9sXZ^'i83SN6IJ%9Kgl51*=c<XjJe&DWaF392GQB#@VoU/$F*C`RhNX.<ECn@u6!^k8le,QD5FV;Md-W3l7iZ,S)IWp3Bs\a5dg`r`FlQ9Jc9=eZc.lAjGB.HK#s>OVT*CkT`Z(sJR?Pe/Pdl2CK.k9`~>
+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<Tl_]K0h5s^XO4BN?7+'5)A^'=-,.9C:j-G)U4YBK4bor-:g\ISTI<kf,F?kgQlAjQ19$0f/-Nh[^NgL1$?a*5@52kqdilm<]\_*#oYJ?Zk1heGb\8EaG=5oa#He$Wt_mj(^@no.LI.H3.$ns*X8Qlq$e#?*ctWNNA?XDIO[W$\Q;]D7[K41i)Sk%h,lmDdmb1g9-X&eRTDdcA7.:3AQ(6=Rm7@nu205_+`:iZK3N]55+&iR;Hr$Uasr)Y8$$#T@hU)RS@'Q*kMrU>"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";8a<Bkqf"Q%E#=dp:&"MCiVE=jEPdN",5R<`cS,W";%bldP.+#Sc%ZI_,:&X9\$+.L+Mu-9G2n*LqgG%^#8ubrLW]5RaU+!bg-h9R2REfkB)=JNGiZkDKr`"O:T=J,dUf#8qC#o))2]g%4j'P'/r,d6a@>L`e+$<?\&-oT!fe;:KeE57Qm5:5hMpaPKOIqO@gDl7>4$@6%2<l&D;ofAL:#4u'"l^0ckp#(DLP>=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@%U03cV<h/HG\NQJhWTC-!'E%F\QiKTqi^u!Jk9Jjgf)e4o&E&@)ND1-!>3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~>
 endstream
 endobj
-55 0 obj
+53 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 54 0 R
+/Contents 52 0 R
 >>
 endobj
-56 0 obj
-<< /Length 1312 /Filter [ /ASCII85Decode /FlateDecode ]
+54 0 obj
+<< /Length 1303 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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'^<P7K(jOQO[#fNVNN"u^%]74['QV=1/tI;5YP>Gb1'_W0<]5,RNFjMH.`o4eR/1&)>F!+?"7.7UooTj;nFn>\6$,Y<OrY'rS$A1$H@@jRq>Cq&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<M=UlAm!)jnpZFfKpOhk=2<E\U]&jsp8W<E8Da2PMK&TBmf-c(Y9>)>hQ:];K[OrrG'MP%laFI'mLVhG3p^A:2VO2FM/Kg?uSFPr\5VWAI?JF7)9jqJ"2XVYg\hV#mhUJ]^/N:k5629[]<Q&cI_[YQj8]lE-YCHiq<mV)1plYn)FC]@]jaVd
 ?4D.&iV:`0aBa0!m3`b-.=$P@^L'TA0cj&'=0!)#J74hTiD)S7OC!'oaLE/F6P,<1TN5;'X$r_1.SeMS@T@M,1;E,/3-75<uaKorjmeSaLEP?d-8-,j.KE+Ll9i)2*.6D;?rEeZB4pJH2Q6n/aDUYGomlbVs=08g0-qPPW6e%nbo#K9ImUa/_osdtI)Q&2W\Deq&UHM*BW&LtG&M0-/6`M9V/;42Qs-]\0J7aX+9#-%>NVIq8Is(7IEi9DGl;RE^PLPX1+c.9mO3&7D6*c78Q[7IOCDU6$kRia_eMOBZrF#-N"ChNse<;>cceZ@,AW>(~>
+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<hd:fl_]__-R"bL1A4oOe7,0Ji`HFG*9+p'ET`eBT7L^:@OT\nUn6XAo.0!2FV.bhGrNX[&eW,h24>?++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%]gW<PQM,U=Mf*b_Z$-pt%aQuUAVIt9J`$FaaH:@Q66Ae`M!SNMXhJQ$uX"#a?SM'9/k$6aZBb3#>D"@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<U'=7gu:eE\0^bUfaM\C5P=noPS:s"23Mrg7$Tm1@p%QW)e8CFB^WRPkdcA3(krtZ3o6R@CRJ/,f.nPq0Mn1-"&`s-Nip];8B/srUl/VR_bo_nlc6#*()<M3pW]@H8=6:65YFm>+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)a
 6!(+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~>
 endstream
 endobj
-57 0 obj
+55 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 56 0 R
+/Contents 54 0 R
 >>
 endobj
-58 0 obj
-<< /Length 952 /Filter [ /ASCII85Decode /FlateDecode ]
+56 0 obj
+<< /Length 770 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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=<ta<Q<UjE*R\KY*,WjEk0]=f%VPGf8n4D<l$gP\DF0Y(`oYmi(]LnDs/t.ce^3I/Sf2qGQN>Fad3eF:^gJ[^n"B^qcR^ciOZecPFS%T[nKEq_)+ds"jK9L\G>;99*)8<E-Um,($N/9$q8JO1Pe#Ma<^i8*P".CKHYOgd0>RR:14_-7[N^#`$eK-7NlEd4&RAFaAW3ra.5ga&&#l[=]VD!AXEc[[F4YE"kqKRjAW+iQ$"5C7b8#d?*C0+<.hhC:LU\m,iTPop$o7Gbol`6]cS%<R<pdFj2td)iX`Uu1G'+^,8d/6*K:IR:q6:)V\<Qt!)IKaWnnTi&1JF%#QjY:*Pes%jMOjr=mn9.1U,6H1Lb5H'OIm81Lf-67&"<^&<%<lQ)[#=Lp7X$L6!Y!.#3KG5sf"j/6#JlCL-6ms%rmGm0d?,RW?#FrO]WFiAGrS&]O6G3r+#B1h08jHosHY1:K9k4ZXRUHX7KJVS?rf<S,G)0VjPEqe1:,6Ri@81@d[.EuOaBX(8G;^?ULnX(tdWi>*@*5(EP0lZH1h90$7SPdq:P`uU:kXk5>udn9a?-dkXV'#t9ADR2F*jE,So8.q:9K)"[?DN3P"i50=j<o6Ehk2<ZHYhS=RhJkoEn-3+RA&EpR\kGb\0#S\hO.Gh!"Yo;f9e[lM.h$oR_OSM;E7!Yel.XO=WO>jR(G4\nD)D,]3;++R89epu.FT2d;QY@[np2NtE9FMeN:[@CrNtDFBP4]d=+RIn^F(mk?F[c#SR<<~>
+Gatn$?Z4XP'ZJu$.K%g^E,.OYlo_`,W&/Wp]B3PM[YGP*GRXs:To=Er3WEj+$gNg'"Nbe,I88)6-<F@B.>scBJsQ+W';ZO"8s7-l1>\NsBIn`+'H)TGU\j9?r<<>Q]DH'[&Y\nb[YSnWK^FPfY)uXR0LOM3I6W'TlJ/hWZ^bn,\m2i;=8nB/X4]N0M6bHu!t6rM3(D/T&^hXZ:*i5=M2ks@H@pOi0a0R^-4DSh"4mU:\8rZOVA'0,SRV^hJhssh:O8eu3qmKG6!5AI`$!5OYTm#!U6n3i8LKs,<O$\@Mop8S.e=A8[b(1eeDN#;X3+V22>!1:=Y;Fj5rPAl1==,UiX(@lL%YJ)\8@m^aUX8-#SNSmW]j%2>:)1<V\7ug2U=0OW34qO8ei:Hm:oqj5AJ-mlS^_e<I%\bNtK(]buCZ3iF)c/i$a9Q<oi;g0e&Q,Vk[b=2WA748$Rj;pUZ_Sn!#h+2S%KjF-Ih@;NQj-b)l,r(uq1\V:3+r2",b4=/`1T95p2`XtV>t];fkPPn27*g28o0TY5DrSo7tRK5J?Ja1!LU3RGTd5l0BV`fXV%.?ZTb[ttC6LsUSq?#K5dWh%p#8ju)&lLT`Wn(hr"s)<pG$l5=dfBNs[Ad.Y621)jL[MZ62;3*...=-nrq(`ZEh?+DG^P"jM@H2C3,/Q@9#tL03VsXNPY,fg`kiJgu/7ast&'Ba0.)q+EZ9F\bn<.PPLMB]TF5r6RX'Ia3CL*4`[2"BG>4&Fn/'IBMc+sSX(Z^^nHi~>
 endstream
 endobj
-59 0 obj
+57 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 58 0 R
+/Contents 56 0 R
 >>
 endobj
-61 0 obj
+59 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 60 0 R
- /First 62 0 R
- /Last 82 0 R
- /Count -21
+ /Parent 58 0 R
+ /First 60 0 R
+ /Last 79 0 R
+ /Count -20
  /A 9 0 R
 >> endobj
-62 0 obj
+60 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
+ /Parent 59 0 R
+ /Next 61 0 R
  /A 11 0 R
 >> endobj
-63 0 obj
+61 0 obj
 <<
  /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
- /Parent 61 0 R
+ /Parent 59 0 R
+ /Prev 60 0 R
+ /Next 62 0 R
+ /A 13 0 R
+>> endobj
+62 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 59 0 R
+ /Prev 61 0 R
+ /Next 63 0 R
+ /A 15 0 R
+>> endobj
+63 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
+ /Parent 59 0 R
  /Prev 62 0 R
  /Next 64 0 R
- /A 13 0 R
+ /A 17 0 R
 >> endobj
 64 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 61 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 59 0 R
  /Prev 63 0 R
  /Next 65 0 R
- /A 15 0 R
+ /A 19 0 R
 >> endobj
 65 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
- /Parent 61 0 R
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
+ /Parent 59 0 R
  /Prev 64 0 R
  /Next 66 0 R
- /A 17 0 R
+ /A 21 0 R
 >> endobj
 66 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 61 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 59 0 R
  /Prev 65 0 R
  /Next 67 0 R
- /A 19 0 R
+ /A 23 0 R
 >> endobj
 67 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 61 0 R
+ /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Parent 59 0 R
  /Prev 66 0 R
  /Next 68 0 R
- /A 21 0 R
+ /A 25 0 R
 >> endobj
 68 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165)
- /Parent 61 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 59 0 R
  /Prev 67 0 R
  /Next 69 0 R
- /A 23 0 R
+ /A 27 0 R
 >> endobj
 69 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 61 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143)
+ /Parent 59 0 R
  /Prev 68 0 R
  /Next 70 0 R
- /A 25 0 R
+ /A 29 0 R
 >> endobj
 70 0 obj
 <<
- /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
+ /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 59 0 R
  /Prev 69 0 R
  /Next 71 0 R
- /A 27 0 R
+ /A 31 0 R
 >> endobj
 71 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 61 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 59 0 R
  /Prev 70 0 R
  /Next 72 0 R
- /A 29 0 R
+ /A 33 0 R
 >> endobj
 72 0 obj
 <<
- /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
+ /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 59 0 R
  /Prev 71 0 R
  /Next 73 0 R
- /A 31 0 R
+ /A 35 0 R
 >> endobj
 73 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 61 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 59 0 R
  /Prev 72 0 R
  /Next 74 0 R
- /A 33 0 R
+ /A 37 0 R
 >> endobj
 74 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 61 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 59 0 R
  /Prev 73 0 R
  /Next 75 0 R
- /A 35 0 R
+ /A 39 0 R
 >> endobj
 75 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 61 0 R
+ /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 59 0 R
  /Prev 74 0 R
  /Next 76 0 R
- /A 37 0 R
+ /A 41 0 R
 >> endobj
 76 0 obj
 <<
- /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
+ /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\167\0\151\0\156\0\147)
+ /Parent 59 0 R
  /Prev 75 0 R
  /Next 77 0 R
- /A 39 0 R
+ /A 43 0 R
 >> endobj
 77 0 obj
 <<
- /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
+ /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141)
+ /Parent 59 0 R
  /Prev 76 0 R
  /Next 78 0 R
- /A 41 0 R
+ /A 45 0 R
 >> endobj
 78 0 obj
 <<
- /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
+ /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
+ /Parent 59 0 R
  /Prev 77 0 R
  /Next 79 0 R
- /A 43 0 R
+ /A 47 0 R
 >> endobj
 79 0 obj
 <<
- /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
+ /Title (\376\377\0\61\0\56\0\62\0\60\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 59 0 R
  /Prev 78 0 R
- /Next 80 0 R
- /A 45 0 R
->> endobj
-80 0 obj
-<<
- /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 47 0 R
->> endobj
-81 0 obj
-<<
- /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 49 0 R
 >> endobj
-82 0 obj
-<<
- /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
- /A 51 0 R
->> endobj
-83 0 obj
+80 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-84 0 obj
+81 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-85 0 obj
+82 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-86 0 obj
+83 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-87 0 obj
+84 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -539,253 +520,244 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 5
-/Kids [6 0 R 53 0 R 55 0 R 57 0 R 59 0 R ] >>
+/Kids [6 0 R 51 0 R 53 0 R 55 0 R 57 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 60 0 R
+ /Outlines 58 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 83 0 R /F5 84 0 R /F1 85 0 R /F2 86 0 R /F7 87 0 R >> 
+/Font << /F3 80 0 R /F5 81 0 R /F1 82 0 R /F2 83 0 R /F7 84 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 659.0 null]
+/D [51 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 339.066 null]
+/D [51 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 266.613 null]
+/D [51 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 194.16 null]
+/D [51 0 R /XYZ 85.0 194.16 null]
 >>
 endobj
 17 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
 19 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 565.347 null]
+/D [53 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 492.894 null]
+/D [53 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 394.041 null]
+/D [53 0 R /XYZ 85.0 407.241 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 308.388 null]
+/D [53 0 R /XYZ 85.0 321.588 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 222.735 null]
+/D [53 0 R /XYZ 85.0 249.135 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 150.282 null]
+/D [53 0 R /XYZ 85.0 176.682 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 616.6 null]
+/D [55 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 530.947 null]
+/D [55 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 445.294 null]
+/D [55 0 R /XYZ 85.0 458.494 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 372.841 null]
+/D [55 0 R /XYZ 85.0 386.041 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 300.388 null]
+/D [55 0 R /XYZ 85.0 313.588 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 227.935 null]
+/D [55 0 R /XYZ 85.0 241.135 null]
 >>
 endobj
 43 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 155.482 null]
+/D [55 0 R /XYZ 85.0 168.682 null]
 >>
 endobj
 45 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 616.6 null]
+/D [57 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 47 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 544.147 null]
+/D [57 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 49 0 obj
 <<
 /S /GoTo
-/D [59 0 R /XYZ 85.0 471.694 null]
+/D [57 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
-51 0 obj
-<<
-/S /GoTo
-/D [59 0 R /XYZ 85.0 399.241 null]
->>
-endobj
-60 0 obj
+58 0 obj
 <<
- /First 61 0 R
- /Last 61 0 R
+ /First 59 0 R
+ /Last 59 0 R
 >> endobj
 xref
-0 88
+0 85
 0000000000 65535 f 
-0000015010 00000 n 
-0000015096 00000 n 
-0000015188 00000 n 
+0000014401 00000 n 
+0000014487 00000 n 
+0000014579 00000 n 
 0000000015 00000 n 
 0000000071 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 
+0000001165 00000 n 
+0000001285 00000 n 
+0000001450 00000 n 
+0000014702 00000 n 
+0000001585 00000 n 
+0000014765 00000 n 
+0000001722 00000 n 
+0000014831 00000 n 
+0000001859 00000 n 
+0000014897 00000 n 
+0000001996 00000 n 
+0000014962 00000 n 
+0000002131 00000 n 
+0000015026 00000 n 
+0000002268 00000 n 
+0000015092 00000 n 
+0000002405 00000 n 
+0000015158 00000 n 
+0000002542 00000 n 
+0000015224 00000 n 
+0000002679 00000 n 
+0000015290 00000 n 
+0000002816 00000 n 
+0000015356 00000 n 
+0000002953 00000 n 
+0000015422 00000 n 
+0000003089 00000 n 
+0000015486 00000 n 
+0000003226 00000 n 
+0000015552 00000 n 
+0000003363 00000 n 
+0000015618 00000 n 
+0000003500 00000 n 
+0000015684 00000 n 
+0000003637 00000 n 
+0000015750 00000 n 
+0000003773 00000 n 
+0000015816 00000 n 
+0000003910 00000 n 
+0000015882 00000 n 
+0000004047 00000 n 
+0000015946 00000 n 
+0000004184 00000 n 
+0000016012 00000 n 
+0000004321 00000 n 
+0000006269 00000 n 
+0000006377 00000 n 
+0000007805 00000 n 
+0000007913 00000 n 
+0000009309 00000 n 
+0000009417 00000 n 
+0000010279 00000 n 
+0000016078 00000 n 
+0000010387 00000 n 
+0000010588 00000 n 
+0000010744 00000 n 
+0000010878 00000 n 
+0000011048 00000 n 
+0000011176 00000 n 
+0000011358 00000 n 
+0000011492 00000 n 
+0000011680 00000 n 
+0000011826 00000 n 
+0000011978 00000 n 
+0000012123 00000 n 
+0000012310 00000 n 
+0000012473 00000 n 
+0000012630 00000 n 
+0000012793 00000 n 
+0000012986 00000 n 
+0000013155 00000 n 
+0000013306 00000 n 
+0000013481 00000 n 
+0000013644 00000 n 
+0000013845 00000 n 
+0000013958 00000 n 
+0000014068 00000 n 
+0000014176 00000 n 
+0000014292 00000 n 
 trailer
 <<
-/Size 88
+/Size 85
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-16804
+16129
 %%EOF

Modified: lucene/dev/trunk/lucene/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/queryparsersyntax.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/trunk/lucene/docs/queryparsersyntax.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/scoring.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/scoring.html (original)
+++ lucene/dev/trunk/lucene/docs/scoring.html Fri Mar 26 05:21:13 2010
@@ -153,9 +153,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -180,9 +177,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/systemrequirements.html?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/trunk/lucene/docs/systemrequirements.html Fri Mar 26 05:21:13 2010
@@ -151,9 +151,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -178,9 +175,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-queryparser/index.html">Query Parser Framework</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-regex/index.html">Regex</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-remote/index.html">Remote</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Fri Mar 26 05:21:13 2010
@@ -74,12 +74,6 @@
                 <p>A set of classes for highlighting matching terms in search results.</p>
                 <p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a></p>
             </section>
-            
-            <section id="fast-vector-highlighter"><title>fast-vector-highlighter</title>
-                <p>An alternative set of classes for highlighting matching terms in search results that relies on stored term vectors.
-                This highlighter can be much faster than the standard highlighter, especially on large fields.</p>
-                <p>See <a href="../api/contrib-fast-vector-highlighter/index.html">fast-vector-highlighter javadoc</a></p>
-            </section>
 
             <section id="icu"><title>icu</title>
                 <p>Provides integration with ICU (International Components for Unicode) for
@@ -112,9 +106,9 @@
                 <p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a></p>
             </section>                          
  
-            <section id="regex"><title>regex</title>
-                <p>Queries with additional regex matching capabilities.</p>
-                <p>See <a href="../api/contrib-regex/index.html">regex javadoc</a></p>
+            <section id="queries"><title>queries</title>
+                <p>Additional queries for Lucene.</p>
+                <p>See <a href="../api/contrib-queries/index.html">queries javadoc</a></p>
             </section> 
             
             <section id="remote"><title>remote</title>

Modified: lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/site.xml?rev=927696&r1=927695&r2=927696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/site.xml Fri Mar 26 05:21:13 2010
@@ -58,7 +58,6 @@ See http://forrest.apache.org/docs/linki
 		    <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
 		    <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
 		    <javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
-		    <javadoc-contrib-fast-vector-highlighter label="Fast Vector Highlighter" href="ext:javadocs-contrib-fast-vector-highlighter"/>
 		    <javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
 		    <javadoc-contrib-icu label="ICU" href="ext:javadocs-contrib-icu"/>
 		    <javadoc-contrib-instantiated label="Instantiated" href="ext:javadocs-contrib-instantiated"/>
@@ -67,7 +66,6 @@ See http://forrest.apache.org/docs/linki
 		    <javadoc-contrib-misc label="Miscellaneous" href="ext:javadocs-contrib-misc"/>
 		    <javadoc-contrib-queries label="Queries" href="ext:javadocs-contrib-queries"/>
                     <javadoc-contrib-queryparser label="Query Parser Framework" href="ext:javadocs-contrib-queryparser"/>
-		    <javadoc-contrib-regex label="Regex" href="ext:javadocs-contrib-regex"/>
 <!-- This package has currently no content			
 		    <javadoc-contrib-similarity label="Similarity" href="ext:javadocs-contrib-similarity"/>
 -->			
@@ -112,7 +110,6 @@ See http://forrest.apache.org/docs/linki
 	<javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
 	<javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
 	<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
-	<javadocs-contrib-fast-vector-highlighter href="api/contrib-fast-vector-highlighter/index.html"/>
 	<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
     <javadocs-contrib-icu href="api/contrib-icu/index.html"/>
 	<javadocs-contrib-instantiated href="api/contrib-instantiated/index.html"/>
@@ -121,7 +118,6 @@ See http://forrest.apache.org/docs/linki
 	<javadocs-contrib-misc href="api/contrib-misc/index.html"/>
 	<javadocs-contrib-queries href="api/contrib-queries/index.html"/>
         <javadocs-contrib-queryparser href="api/contrib-queryparser/index.html"/>
-	<javadocs-contrib-regex href="api/contrib-regex/index.html"/>
 	<javadocs-contrib-remote href="api/contrib-remote/index.html"/>
 	<javadocs-contrib-similarity href="api/contrib-similarity/index.html"/>
 	<javadocs-contrib-spatial href="api/contrib-spatial/index.html"/>



Mime
View raw message