lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r932541 - in /lucene/dev/trunk: lucene/ lucene/contrib/ lucene/contrib/analyzers/common/ lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/ lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wiki...
Date Fri, 09 Apr 2010 18:40:56 GMT
Author: rmuir
Date: Fri Apr  9 18:40:55 2010
New Revision: 932541

URL: http://svn.apache.org/viewvc?rev=932541&view=rev
Log:
LUCENE-2323: move WikipediaTokenizer to contrib/analyzers

Added:
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
      - copied, changed from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
      - copied, changed from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
      - copied, changed from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.jflex
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/package.html
      - copied unchanged from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/package.html
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/
    lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
      - copied, changed from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java   (with props)
    lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java   (with props)
Removed:
    lucene/dev/trunk/lucene/contrib/wikipedia/
Modified:
    lucene/dev/trunk/lucene/build.xml
    lucene/dev/trunk/lucene/contrib/CHANGES.txt
    lucene/dev/trunk/lucene/contrib/analyzers/common/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
    lucene/dev/trunk/solr/CHANGES.txt

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Apr  9 18:40:55 2010
@@ -348,7 +348,6 @@ The source distribution does not contain
           <packageset dir="contrib/spellchecker/src/java"/>
           <packageset dir="contrib/surround/src/java"/>
           <packageset dir="contrib/swing/src/java"/>
-          <packageset dir="contrib/wikipedia/src/java"/>
           <packageset dir="contrib/wordnet/src/java"/>
           <packageset dir="contrib/xml-query-parser/src/java"/>
           <packageset dir="contrib/queryparser/src/java"/>
@@ -378,7 +377,6 @@ The source distribution does not contain
           <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
           <group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
           <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
-          <group title="contrib: Wikipedia" packages="org.apache.lucene.wikipedia*"/>
           <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
           <group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
           

Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Fri Apr  9 18:40:55 2010
@@ -19,6 +19,10 @@ Changes in backwards compatibility polic
  * LUCENE-2226: Moved contrib/snowball functionality into contrib/analyzers.
    Be sure to remove any old obselete lucene-snowball jar files from your
    classpath!  (Robert Muir)
+   
+ * LUCENE-2323: Moved contrib/wikipedia functionality into contrib/analyzers.
+   Additionally the package was changed from org.apache.lucene.wikipedia.analysis
+   to org.apache.lucene.analysis.wikipedia.  (Robert Muir)
     
 Changes in runtime behavior
 

Modified: lucene/dev/trunk/lucene/contrib/analyzers/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/build.xml?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/analyzers/common/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/build.xml Fri Apr  9 18:40:55 2010
@@ -35,4 +35,23 @@
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>	
+
+  <target name="jflex" depends="clean-jflex,jflex-wiki-tokenizer"/>
+
+  <target name="jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present">
+    <taskdef classname="JFlex.anttask.JFlexTask" name="jflex">
+      <classpath location="${jflex.home}/lib/JFlex.jar"/>
+    </taskdef>
+    <jflex file="src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex"
+           outdir="src/java/org/apache/lucene/analysis/wikipedia"
+           nobak="on"/>
+  </target>
+
+  <target name="clean-jflex">
+    <delete>
+      <fileset dir="src/java/org/apache/lucene/analysis/wikipedia" includes="*.java">
+        <containsregexp expression="generated.*by.*JFlex"/>
+      </fileset>
+    </delete>
+  </target>
 </project>

Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java (from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java&p1=lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java&r1=932467&r2=932541&rev=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java Fri Apr  9 18:40:55 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.wikipedia.analysis;
+package org.apache.lucene.analysis.wikipedia;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;
@@ -133,7 +133,7 @@ public final class WikipediaTokenizer ex
   }
 
   /**
-   * Creates a new instance of the {@link org.apache.lucene.wikipedia.analysis.WikipediaTokenizer}.  Attaches the
+   * Creates a new instance of the {@link org.apache.lucene.analysis.wikipedia.WikipediaTokenizer}.  Attaches the
    * <code>input</code> to a the newly created JFlex scanner.
    *
    * @param input The input
@@ -147,7 +147,7 @@ public final class WikipediaTokenizer ex
   }
 
   /**
-   * Creates a new instance of the {@link org.apache.lucene.wikipedia.analysis.WikipediaTokenizer}.  Attaches the
+   * Creates a new instance of the {@link org.apache.lucene.analysis.wikipedia.WikipediaTokenizer}.  Attaches the
    * <code>input</code> to a the newly created JFlex scanner. Uses the given {@link org.apache.lucene.util.AttributeSource.AttributeFactory}.
    *
    * @param input The input
@@ -161,7 +161,7 @@ public final class WikipediaTokenizer ex
   }
 
   /**
-   * Creates a new instance of the {@link org.apache.lucene.wikipedia.analysis.WikipediaTokenizer}.  Attaches the
+   * Creates a new instance of the {@link org.apache.lucene.analysis.wikipedia.WikipediaTokenizer}.  Attaches the
    * <code>input</code> to a the newly created JFlex scanner. Uses the given {@link AttributeSource}.
    *
    * @param input The input

Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java (from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java&p1=lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java&r1=932467&r2=932541&rev=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java Fri Apr  9 18:40:55 2010
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.4.1 on 4/15/08 4:31 AM */
 
-package org.apache.lucene.wikipedia.analysis;
+package org.apache.lucene.analysis.wikipedia;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex (from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.jflex)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex&p1=lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.jflex&r1=932467&r2=932541&rev=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.jflex (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex Fri Apr  9 18:40:55 2010
@@ -1,4 +1,4 @@
-package org.apache.lucene.wikipedia.analysis;
+package org.apache.lucene.analysis.wikipedia;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java (from r932467, lucene/dev/trunk/lucene/contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java&p1=lucene/dev/trunk/lucene/contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java&r1=932467&r2=932541&rev=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/wikipedia/src/test/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java Fri Apr  9 18:40:55 2010
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.lucene.wikipedia.analysis;
+package org.apache.lucene.analysis.wikipedia;
 
 import java.io.StringReader;
 import java.io.IOException;

Modified: lucene/dev/trunk/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/contributions.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/contributions.html (original)
+++ lucene/dev/trunk/lucene/docs/contributions.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo.html (original)
+++ lucene/dev/trunk/lucene/docs/demo.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo2.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo2.html (original)
+++ lucene/dev/trunk/lucene/docs/demo2.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo3.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo3.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo3.html (original)
+++ lucene/dev/trunk/lucene/docs/demo3.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/demo4.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo4.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo4.html (original)
+++ lucene/dev/trunk/lucene/docs/demo4.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/fileformats.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/fileformats.html (original)
+++ lucene/dev/trunk/lucene/docs/fileformats.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/gettingstarted.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/trunk/lucene/docs/gettingstarted.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/index.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/index.html (original)
+++ lucene/dev/trunk/lucene/docs/index.html Fri Apr  9 18:40:55 2010
@@ -190,9 +190,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/linkmap.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/linkmap.html (original)
+++ lucene/dev/trunk/lucene/docs/linkmap.html Fri Apr  9 18:40:55 2010
@@ -190,9 +190,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -436,13 +433,7 @@ document.write("Last Published: " + docu
 <li>
 <a href="api/contrib-swing/index.html">Swing</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-swing</em>
 </li>
-</ul>
-			
-<ul>
-<li>
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-wikipedia</em>
-</li>
-</ul>					    
+</ul>				    
 			
 <ul>
 <li>

Modified: lucene/dev/trunk/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/linkmap.pdf?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/linkmap.pdf (original)
+++ lucene/dev/trunk/lucene/docs/linkmap.pdf Fri Apr  9 18:40:55 2010
@@ -20,10 +20,10 @@ endobj
 >>
 endobj
 7 0 obj
-<< /Length 1052 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1025 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUs>Ar4L'Z],,'R<q*n9e%&fN)M1e4OLBlD/QkggFeb0%:3(I/>o_&r2oH!M5;pkPmX;\MuO+ak%DO&-gKaX<u:s:QP\O(HIjZ]uV&r*)^D]428NmA'D*G.7+I.T>'*9=WjJ1,Vn1eHC_lmq=!S2b5('KIV:0ZP\O_WFTK>.'`'36`A.n"6(6jaI$quXl0*bjpo%&H$`F7%@4,&'a$V&J+\dYSj'*`_KS_gAcX7g$N@XUu:mk:ja.jGO\E/eQfQ`f5&^,U&2P]:WUl;MCoX"<&gFeUO7clG`=^lcCELP(/:-t]o$@PlR9+4[<HZ%0=+qI+!*YW6]DG'OUZUSG\PM-[s^=<r8]ZOV\*6[!`pOVe$18h3ZSKVBW:\"6UWH=IX8&JdE32`Xn$11T#L_T]&`qN(!@Bpr6#sH(0C^Q\?<XJqfeFTf]oFu2[X^$Tir-#ZepTZ0qkM3Nr6`_oIQIJj5QANi+QW0*DSgeYGg1Un711Vu9?h\b]$a)S^-QSS;:'*>EH>Kms<G:Ge:4L2ZeUscP9c3C5&=pr16^Gp*%J*H2m6]VeAWgCS,Z.o+.qOt(I"7[\p2%LG[UPSYBegTj\9\0a;^a=_%l&D(/>$34N$]dRmsHG<L2".\QY0_PgJa]?.Mh%TQuH+KX_/!D[)-q83$(D_fK'k`b<2sHDG<4=L!&N@5s\aOG;a>Rk.<`Uk@\[,MM\`cmWO.T3nmi9j_.J=i'm;XP#84+'`Tj>,hB![>q5#m,SqPh<)7L>2[$1iPgtd!:pEOX\#qugcM4)+-n-g)L.'Vf*9,u%>"6Ju]r\4Cn,(O=r<.:+5l3J[%hluP"<d&4O3GN4cAZ$l.9qmU&r+LT(0b9c+^QAa?g5]eMbNM[iGXXr>PZS-(PkUX+d_H@=;VTWjs]Jq-4c<0i[#300q$$+*cZQ74P+Mki7c]$SM1YW?SZbG/nLST9uIn<3HOht+cImP\*<UZ_Y%\NqX]SmJ&Vo)(5@p
 [f&B]<`q<@8?$i0Go"@kjQ!&)g'LfJ9S]@J'2+m8;@nSt+hrPKXHhSW7S\DB~>
+GatUs>Aoub'Z],&.<o)>iq\084LWcqBkjKP7-^RjRU"jJ/6l'T:%RabD?5q^80iIA:,r:2Z-UDE/8&<+e3Y!;CUp$&CGS<n<*s0E@]Mpe).:h"QEg,[b;701b*jPCU&+#sI@(0^MKg>n,#deA<m,tg5?HDXC\^=hZ(k8KA(qJ9f[bcUnTV]>K6`P*\I;j-Yu3XZTI2oA<8mo4JGN(J)2d[?Lakr$@EA5p8rR1&(Z7*:#A)rLr5iLsAE34DKpHToU]@i0(6Z^IT??Q^p^!kYlT>%r^;I*LA<)e`'Y&l7+%;^^ihDW5W1(R7<AkJ"Pg#ZPrf6.bO/?D2KunFn+_K;?N,dS6`:eDT!eXPdCs-=VHMS]P>[?KV[BD@jN6Ng>(K.,!ZC22[0jr5V2,7hG,%IFqlS<o[\dt"LA5)1gk$VKQ"LD,G@C0=d=A2Mi>U:SdSu1Vk]=PqBEo1VjEB;HK:;?5c]!g13\PKf*9m\>AG/(!]i7+IJ1KjYg7s/1.O#Ao7.R8#$ZO^1ki\&GFnQ(=C'o=3N@.9h_C0&GIc1r2612$E"]bNsWVTE@Bii!$6FeM(p4MjWOF-\J^+"!0`3-;msDrW[W3L:Oj,e?o\Ub_)]&"#%@m?jp^Y*HkOh)ZTEA]QhO^5G+WRoi&Dk?R.YEq:T;$TsL7RX($no)'JC88W/oT"?0X8T.h&[%%Q)[^3&a9er_*g>X3p`Pbk9K8Z1J894]L8bJ<L?qmkC93L;"$l'Cbnb@YrS`tccfVH)tBbFS7F+aq5[]td__JOO#<GUIcQ+Q/bCq7>&hATWm/-cc;YZF'KLXeO%4).YQ%'(W^PASNfg=h_)7/F[H[:Y_mg?ZW5QF"'c4j#8eOd\TH<C<]A+McKi_HP8,AiJh0(E-a\Kh#BWGrBU^Y8r67>p&gX7'LrV;pdT`mCg4W8qG$]V=k1'<4f_9G6]"'?Lu=3>OMAEVPpgTKWMMGYG*hUG<G*DI_*i!>kV26jc,1
 bh&c20Mk\Lq['Q>UeBE=W/(!\>Im*jr!<~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000003146 00000 n 
-0000003210 00000 n 
-0000003260 00000 n 
+0000003119 00000 n 
+0000003183 00000 n 
+0000003233 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000001233 00000 n 
 0000001339 00000 n 
-0000002483 00000 n 
-0000002589 00000 n 
-0000002701 00000 n 
-0000002811 00000 n 
-0000002922 00000 n 
-0000003030 00000 n 
+0000002456 00000 n 
+0000002562 00000 n 
+0000002674 00000 n 
+0000002784 00000 n 
+0000002895 00000 n 
+0000003003 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3382
+3355
 %%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=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/trunk/lucene/docs/lucene-contrib/index.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -312,9 +309,6 @@ document.write("Last Published: " + docu
 <a href="#swing">swing</a>
 </li>
 <li>
-<a href="#wikipedia">wikipedia</a>
-</li>
-<li>
 <a href="#wordnet">wordnet</a>
 </li>
 <li>
@@ -457,17 +451,12 @@ document.write("Last Published: " + docu
 <p>Swing components designed to integrate with Lucene.</p>
 <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
 </p>
-<a name="N10134"></a><a name="wikipedia"></a>
-<h3 class="boxed">wikipedia</h3>
-<p>Tools for working with wikipedia content.</p>
-<p>See <a href="../api/contrib-wikipedia/index.html">wikipedia javadoc</a>
-</p>
-<a name="N10143"></a><a name="wordnet"></a>
+<a name="N10134"></a><a name="wordnet"></a>
 <h3 class="boxed">wordnet</h3>
 <p>Tools to help utilize wordnet synonyms with Lucene</p>
 <p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
 </p>
-<a name="N10152"></a><a name="xml-query-parser"></a>
+<a name="N10143"></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=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf (original)
+++ lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf Fri Apr  9 18:40:55 2010
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1002 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 968 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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]~>
+Gb!$G9lldX&;KZO$6>[i<IGuRN_QB2FF*29>MB7rEm+Z=,B-TUf68NM=F6o1/lhCcCmeSN%moa!kV`f4ge/hXb"/rMR/JE77NMY,(q_h"m;GkCW/M@PmE,+Qa$X2"oF4r]3.Z.O0?6E2W4i3)WOo%q9_iWpIZj%RN#WN13qC7/.TVeWW#mY8+"GlrZDUaJG5PZ3GIm4rTg(t*]BkS7@67GYL2l)ma3ilrg83inOe<e:+E/q/rt#!.&h<8\P*MD&\(=kV8];R<:;RB1eO=jlkLJgX2Q]4!1G]hE&&!de/'8'.1!bg<o=FNeHc_h_jkO8_d:D1$ZeRP>6.a(nT:74#o_.EZko5.=<h]USS-MOR)iopPqQLX8`0jiTF%:&r1TKTJ;>dSEgf<k3[./GC/@-=LC]ST*OH;p&bUC1VNpgSc0,O9_DHiV9mWb<B`Kt`%JY89RV`14!Fi\o?Z&"es,\5"Z1Q&Ar79.'cfli'"m(oGCi%g.OTV]!Q3.A(*NB)83#NdF?IX=]n*i4h%8`[f6UP+'K(>aULTqRcAp/iSP&hGAMA^e*3;58g-UGf#;DH`Y>mRgMU*0XA^:COsXPVG@=arE-.Yf*C3D+"27Ne_=T!"FuJUQ4kY8*6IAJq<UMl1_tE!+tah$bHs>k%Rb+R;kQ?aIud;hP&9<]pp"2-'GNI9BN0M6@7'Z"jb];PJ7iLVch#X!!Z)Q'PuKa3FJ)u*fXlo[9$-Z33hSdi$a_@9j9?-N"Xj2Z@;Fq?XHg5"jl0`OG$>T0aE[N?5g/L[I4@c9*J8caP\D-Jk`j2LPujpn#NiHctcDlg3RVh:N/);I`d7T\$+sQfJne'%(=jVBu.)S`+ZFc^';&i5>Vd?L!`<,TgILb>Uc+2MPT/o?]"6?_o^O9b&O'BLJWA7$-&^EQ/TEolb15Tc*hu@%Jo2Cl3%fTVPYcDWlBc4]1$QGQi39-ck640i$0@o~>
 endstream
 endobj
 6 0 obj
@@ -42,7 +42,6 @@ endobj
 42 0 R
 44 0 R
 46 0 R
-48 0 R
 ]
 endobj
 8 0 obj
@@ -228,7 +227,7 @@ endobj
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 232.066 175.828 220.066 ]
+/Rect [ 108.0 232.066 167.824 220.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 45 0 R
@@ -238,7 +237,7 @@ endobj
 46 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 213.866 167.824 201.866 ]
+/Rect [ 108.0 213.866 211.804 201.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 47 0 R
@@ -246,271 +245,253 @@ endobj
 >>
 endobj
 48 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 195.666 211.804 183.666 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 49 0 R
-/H /I
->>
-endobj
-50 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
-51 0 obj
+49 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 50 0 R
+/Contents 48 0 R
 >>
 endobj
-52 0 obj
+50 0 obj
 << /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l<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
-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
+52 0 obj
 << /Length 1303 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gau0CgQ(#H&:O:Sn1asT%'R6)-AucgU'6^]hqC9@1+fht,t4QZh0scBOsQ8t.p3ZG$suI:B85T>)3-q_=$Nih?WRs'nG]pi#pq'X,5;kXs*Z6u`A4<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
-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 770 /Filter [ /ASCII85Decode /FlateDecode ]
+54 0 obj
+<< /Length 678 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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~>
+Gatm8?#Q2d'Rf.Gpp#7'lYC<Q*ntG/1j)^.nh=e4K,Ye<+uj^9Zg?;iHmCUcU2JD4!$C_'3VON29br/uU6c-^iQf%`-((>N8_fU$DEJ"+J0`3NoGg"`2t%MY^bhF,2<P7DH]]m)dMEL>!#c2)`<fs$>G85::Kh,:npZj^c)tdg%tCNZQ(,`=qMqkBK*$X9.S5T13s4^7S>6c@>G1R@5Mr/3F%ii$2T[Z3nO0cM&.be=MCHLGkb&bH8F/e5N6N<tL*ENR3?#`PJWs$Uc58F8,_0A7"(c(<^%%>hn`*O!CQGo@<EHs-$$AarpPin\X'i>@eWq94D\p"4@lG&i>S7GM7?cB\OSo.:GX?B9?2XT`\1=474[tbBdJ[>#Z^7f&qq50+NOEIUj=W<YZ@C,\;qX#dE*mtKa,]b"UcaB8WkcH)C-8_(jW8Q%.ieh-X1$Qpr$iP=l[8MMn%mH)Q"oj2Ukun/62)Yh[uR#>r+\uhF=-tNLi=44*RhN)X$t\p/d+p<6N-<[*mNQ2E,1on<mQuSk/-H[^i^jrQs7$3]%E=(f\iRFP[Q"1M%?VRP4>22+QEtB9.CbhIWN:b:(rX5F5;j`bcP%:D,lgKa?k'AIA7cEU4ad5AYV%E#b:2MP?G=UAV2@OZYaa5<i3]!=^?C$F)M,]?%/t<a54>`n/Yom~>
 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
-59 0 obj
+57 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142)
- /Parent 58 0 R
- /First 60 0 R
- /Last 79 0 R
- /Count -20
+ /Parent 56 0 R
+ /First 58 0 R
+ /Last 76 0 R
+ /Count -19
  /A 9 0 R
 >> endobj
-60 0 obj
+58 0 obj
 <<
  /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163)
- /Parent 59 0 R
- /Next 61 0 R
+ /Parent 57 0 R
+ /Next 59 0 R
  /A 11 0 R
 >> endobj
-61 0 obj
+59 0 obj
 <<
  /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
- /Parent 59 0 R
+ /Parent 57 0 R
+ /Prev 58 0 R
+ /Next 60 0 R
+ /A 13 0 R
+>> endobj
+60 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
+ /Parent 57 0 R
+ /Prev 59 0 R
+ /Next 61 0 R
+ /A 15 0 R
+>> endobj
+61 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
+ /Parent 57 0 R
  /Prev 60 0 R
  /Next 62 0 R
- /A 13 0 R
+ /A 17 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
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 57 0 R
  /Prev 61 0 R
  /Next 63 0 R
- /A 15 0 R
+ /A 19 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
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
+ /Parent 57 0 R
  /Prev 62 0 R
  /Next 64 0 R
- /A 17 0 R
+ /A 21 0 R
 >> endobj
 64 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 59 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 57 0 R
  /Prev 63 0 R
  /Next 65 0 R
- /A 19 0 R
+ /A 23 0 R
 >> endobj
 65 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
- /Parent 59 0 R
+ /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Parent 57 0 R
  /Prev 64 0 R
  /Next 66 0 R
- /A 21 0 R
+ /A 25 0 R
 >> endobj
 66 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
- /Parent 59 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 57 0 R
  /Prev 65 0 R
  /Next 67 0 R
- /A 23 0 R
+ /A 27 0 R
 >> endobj
 67 0 obj
 <<
- /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
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143)
+ /Parent 57 0 R
  /Prev 66 0 R
  /Next 68 0 R
- /A 25 0 R
+ /A 29 0 R
 >> endobj
 68 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
- /Parent 59 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 57 0 R
  /Prev 67 0 R
  /Next 69 0 R
- /A 27 0 R
+ /A 31 0 R
 >> endobj
 69 0 obj
 <<
- /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
+ /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
+ /Parent 57 0 R
  /Prev 68 0 R
  /Next 70 0 R
- /A 29 0 R
+ /A 33 0 R
 >> endobj
 70 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 59 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 57 0 R
  /Prev 69 0 R
  /Next 71 0 R
- /A 31 0 R
+ /A 35 0 R
 >> endobj
 71 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
- /Parent 59 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 57 0 R
  /Prev 70 0 R
  /Next 72 0 R
- /A 33 0 R
+ /A 37 0 R
 >> endobj
 72 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
- /Parent 59 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 57 0 R
  /Prev 71 0 R
  /Next 73 0 R
- /A 35 0 R
+ /A 39 0 R
 >> endobj
 73 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
- /Parent 59 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 57 0 R
  /Prev 72 0 R
  /Next 74 0 R
- /A 37 0 R
+ /A 41 0 R
 >> endobj
 74 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
- /Parent 59 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 57 0 R
  /Prev 73 0 R
  /Next 75 0 R
- /A 39 0 R
+ /A 43 0 R
 >> endobj
 75 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144)
- /Parent 59 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
+ /Parent 57 0 R
  /Prev 74 0 R
  /Next 76 0 R
- /A 41 0 R
+ /A 45 0 R
 >> endobj
 76 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 59 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
+ /Parent 57 0 R
  /Prev 75 0 R
- /Next 77 0 R
- /A 43 0 R
->> endobj
-77 0 obj
-<<
- /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 45 0 R
->> endobj
-78 0 obj
-<<
- /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 47 0 R
 >> endobj
-79 0 obj
-<<
- /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
- /A 49 0 R
->> endobj
-80 0 obj
+77 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-81 0 obj
+78 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-82 0 obj
+79 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-83 0 obj
+80 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-84 0 obj
+81 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -520,244 +501,235 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 5
-/Kids [6 0 R 51 0 R 53 0 R 55 0 R 57 0 R ] >>
+/Kids [6 0 R 49 0 R 51 0 R 53 0 R 55 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 58 0 R
+ /Outlines 56 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 80 0 R /F5 81 0 R /F1 82 0 R /F2 83 0 R /F7 84 0 R >> 
+/Font << /F3 77 0 R /F5 78 0 R /F1 79 0 R /F2 80 0 R /F7 81 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 659.0 null]
+/D [49 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 339.066 null]
+/D [49 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 266.613 null]
+/D [49 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 194.16 null]
+/D [49 0 R /XYZ 85.0 194.16 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 637.8 null]
+/D [51 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 565.347 null]
+/D [51 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 492.894 null]
+/D [51 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 407.241 null]
+/D [51 0 R /XYZ 85.0 407.241 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 321.588 null]
+/D [51 0 R /XYZ 85.0 321.588 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 249.135 null]
+/D [51 0 R /XYZ 85.0 249.135 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 176.682 null]
+/D [51 0 R /XYZ 85.0 176.682 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 616.6 null]
+/D [53 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 530.947 null]
+/D [53 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 458.494 null]
+/D [53 0 R /XYZ 85.0 458.494 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 386.041 null]
+/D [53 0 R /XYZ 85.0 386.041 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 313.588 null]
+/D [53 0 R /XYZ 85.0 313.588 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 241.135 null]
+/D [53 0 R /XYZ 85.0 241.135 null]
 >>
 endobj
 43 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 168.682 null]
+/D [53 0 R /XYZ 85.0 168.682 null]
 >>
 endobj
 45 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
 47 0 obj
 <<
 /S /GoTo
-/D [57 0 R /XYZ 85.0 565.347 null]
->>
-endobj
-49 0 obj
-<<
-/S /GoTo
-/D [57 0 R /XYZ 85.0 492.894 null]
+/D [55 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
-58 0 obj
+56 0 obj
 <<
- /First 59 0 R
- /Last 59 0 R
+ /First 57 0 R
+ /Last 57 0 R
 >> endobj
 xref
-0 85
+0 82
 0000000000 65535 f 
-0000014401 00000 n 
-0000014487 00000 n 
-0000014579 00000 n 
+0000013955 00000 n 
+0000014041 00000 n 
+0000014133 00000 n 
 0000000015 00000 n 
 0000000071 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 
+0000001130 00000 n 
+0000001250 00000 n 
+0000001408 00000 n 
+0000014256 00000 n 
+0000001543 00000 n 
+0000014319 00000 n 
+0000001680 00000 n 
+0000014385 00000 n 
+0000001817 00000 n 
+0000014451 00000 n 
+0000001954 00000 n 
+0000014516 00000 n 
+0000002089 00000 n 
+0000014580 00000 n 
+0000002226 00000 n 
+0000014646 00000 n 
+0000002363 00000 n 
+0000014712 00000 n 
+0000002500 00000 n 
+0000014778 00000 n 
+0000002637 00000 n 
+0000014844 00000 n 
+0000002774 00000 n 
+0000014910 00000 n 
+0000002911 00000 n 
+0000014976 00000 n 
+0000003047 00000 n 
+0000015040 00000 n 
+0000003184 00000 n 
+0000015106 00000 n 
+0000003321 00000 n 
+0000015172 00000 n 
+0000003458 00000 n 
+0000015238 00000 n 
+0000003595 00000 n 
+0000015304 00000 n 
+0000003731 00000 n 
+0000015370 00000 n 
+0000003868 00000 n 
+0000015436 00000 n 
+0000004005 00000 n 
+0000015500 00000 n 
+0000004142 00000 n 
+0000006090 00000 n 
+0000006198 00000 n 
+0000007626 00000 n 
+0000007734 00000 n 
+0000009130 00000 n 
+0000009238 00000 n 
+0000010008 00000 n 
+0000015566 00000 n 
+0000010116 00000 n 
+0000010317 00000 n 
+0000010473 00000 n 
+0000010607 00000 n 
+0000010777 00000 n 
+0000010905 00000 n 
+0000011087 00000 n 
+0000011221 00000 n 
+0000011409 00000 n 
+0000011555 00000 n 
+0000011707 00000 n 
+0000011852 00000 n 
+0000012039 00000 n 
+0000012202 00000 n 
+0000012359 00000 n 
+0000012522 00000 n 
+0000012715 00000 n 
+0000012884 00000 n 
+0000013035 00000 n 
+0000013198 00000 n 
+0000013399 00000 n 
+0000013512 00000 n 
+0000013622 00000 n 
+0000013730 00000 n 
+0000013846 00000 n 
 trailer
 <<
-/Size 85
+/Size 82
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-16129
+15617
 %%EOF

Modified: lucene/dev/trunk/lucene/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/queryparsersyntax.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/trunk/lucene/docs/queryparsersyntax.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/scoring.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/scoring.html (original)
+++ lucene/dev/trunk/lucene/docs/scoring.html Fri Apr  9 18:40:55 2010
@@ -192,9 +192,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/trunk/lucene/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/systemrequirements.html?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/trunk/lucene/docs/systemrequirements.html Fri Apr  9 18:40:55 2010
@@ -190,9 +190,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/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=932541&r1=932540&r2=932541&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 Apr  9 18:40:55 2010
@@ -135,11 +135,6 @@
                 <p>Swing components designed to integrate with Lucene.</p>
                 <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a></p>
             </section>    
-           
-            <section id="wikipedia"><title>wikipedia</title>
-                <p>Tools for working with wikipedia content.</p>
-                <p>See <a href="../api/contrib-wikipedia/index.html">wikipedia javadoc</a></p>
-            </section>   
             
             <section id="wordnet"><title>wordnet</title>
                 <p>Tools to help utilize wordnet synonyms with Lucene</p>

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=932541&r1=932540&r2=932541&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 Apr  9 18:40:55 2010
@@ -73,8 +73,7 @@ See http://forrest.apache.org/docs/linki
 		    <javadoc-contrib-spatial label="Spatial" href="ext:javadocs-contrib-spatial"/>
 		    <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
 		    <javadoc-contrib-surround label="Surround" href="ext:javadocs-contrib-surround"/>			
-		    <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>
-			<javadoc-contrib-wikipedia label="Wikipedia" href="ext:javadocs-contrib-wikipedia"/>					    
+		    <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>				    
 			<javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>			
 		    <javadoc-contrib-xml-query-parser label="XML Query Parser" href="ext:javadocs-contrib-xml-query-parser"/>			
 		 </javadoc-contrib>
@@ -124,7 +123,6 @@ See http://forrest.apache.org/docs/linki
 	<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
 	<javadocs-contrib-surround href="api/contrib-surround/index.html"/>
 	<javadocs-contrib-swing href="api/contrib-swing/index.html"/>
-	<javadocs-contrib-wikipedia href="api/contrib-wikipedia/index.html"/>
 	<javadocs-contrib-wordnet href="api/contrib-wordnet/index.html"/>
 	<javadocs-contrib-xml-query-parser href="api/contrib-xml-query-parser/index.html"/>
 	

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=932541&r1=932540&r2=932541&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Apr  9 18:40:55 2010
@@ -128,7 +128,7 @@ New Features
 
 * SOLR-1857: Synced Solr analysis with Lucene 3.1. Added KeywordMarkerFilterFactory 
   and StemmerOverrideFilterFactory, which can be used to tune stemming algorithms. 
-  Added factories for Bulgarian, Czech, Hindi, and Turkish analysis. Improved the
+  Added factories for Bulgarian, Czech, Hindi, Turkish, and Wikipedia analysis. Improved the
   performance of SnowballPorterFilterFactory.  (rmuir)
 
 * SOLR-1657: Converted remaining TokenStreams to the Attributes-based API. All Solr 

Added: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java?rev=932541&view=auto
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java (added)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java Fri Apr  9 18:40:55 2010
@@ -0,0 +1,31 @@
+package org.apache.solr.analysis;
+
+/**
+ * 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.
+ */
+
+import java.io.Reader;
+
+import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer;
+
+/** Factory for {@link WikipediaTokenizer}*/
+public class WikipediaTokenizerFactory extends BaseTokenizerFactory {
+  // TODO: add support for WikipediaTokenizer's advanced options.
+  public Tokenizer create(Reader input) {
+    return new WikipediaTokenizer(input);
+  }
+}

Propchange: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java?rev=932541&view=auto
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java (added)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java Fri Apr  9 18:40:55 2010
@@ -0,0 +1,42 @@
+package org.apache.solr.analysis;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer;
+
+/**
+ * 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.
+ */
+
+/**
+ * Simple tests to ensure the wikipedia tokenizer is working.
+ */
+public class TestWikipediaTokenizerFactory extends BaseTokenTestCase {
+  public void testTokenizer() throws IOException {
+    Reader reader = new StringReader("This is a [[Category:foo]]");
+    WikipediaTokenizerFactory factory = new WikipediaTokenizerFactory();
+    Tokenizer tokenizer = factory.create(reader);
+    assertTokenStreamContents(tokenizer,
+        new String[] { "This", "is", "a", "foo" },
+        new int[] { 0, 5, 8, 21 },
+        new int[] { 4, 7, 9, 24 },
+        new String[] { "<ALPHANUM>", "<ALPHANUM>", "<ALPHANUM>", WikipediaTokenizer.CATEGORY },
+        new int[] { 1, 1, 1, 1, });
+  }
+}

Propchange: lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message