Index: solr/NOTICE.txt
===================================================================
--- solr/NOTICE.txt	(revision 1085820)
+++ solr/NOTICE.txt	(working copy)
@@ -38,9 +38,6 @@
 This product includes the HSQL Database (HSQLDB) 1.8.0.10 jar: http://hsqldb.org/
 License: http://hsqldb.org/web/hsqlLicense.html
 
-This product includes code (JaspellTernarySearchTrie) from Java Spelling Checking Package (jaspell): http://jaspell.sourceforge.net/
-License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
-
 =========================================================================
 ==  Apache Lucene Notice                                               ==
 =========================================================================
Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1085820)
+++ solr/common-build.xml	(working copy)
@@ -187,12 +187,12 @@
     <pathelement location="${common-solr.dir}/../lucene/build/classes/java" />
     <pathelement location="${common-solr.dir}/../modules/analysis/build/common/classes/java" />
     <pathelement location="${common-solr.dir}/../modules/analysis/build/phonetic/classes/java" />
+    <pathelement location="${common-solr.dir}/../modules/spellchecker/build/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/highlighter/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/memory/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/misc/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/queries/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/spatial/classes/java" />
-    <pathelement location="${common-solr.dir}/../lucene/build/contrib/spellchecker/classes/java" />
   </path>   
 
   <target name="prep-lucene-jars">
@@ -203,12 +203,12 @@
       <subant target="jar" inheritall="false" failonerror="true">
         <fileset dir="../modules/analysis/common" includes="build.xml" />
         <fileset dir="../modules/analysis/phonetic" includes="build.xml" />
+        <fileset dir="../modules/spellchecker" includes="build.xml" />
         <fileset dir="../lucene/contrib/highlighter" includes="build.xml" />
         <fileset dir="../lucene/contrib/memory" includes="build.xml" />
         <fileset dir="../lucene/contrib/misc" includes="build.xml" />
         <fileset dir="../lucene/contrib/queries" includes="build.xml" />
         <fileset dir="../lucene/contrib/spatial" includes="build.xml" />
-        <fileset dir="../lucene/contrib/spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -225,6 +225,9 @@
       <fileset dir="../modules/analysis/build/phonetic">
         <include name="lucene-analyzers-phonetic-${version}.jar" />
       </fileset>
+      <fileset dir="../modules/spellchecker/build">
+        <include name="lucene-spellchecker-${version}.jar" />
+      </fileset>
       <fileset dir="../lucene/build/contrib/highlighter">
         <include name="lucene-highlighter-${version}.jar" />
       </fileset>
@@ -240,9 +243,6 @@
       <fileset dir="../lucene/build/contrib/spatial">
         <include name="lucene-spatial-${version}.jar" />
       </fileset>
-      <fileset dir="../lucene/build/contrib/spellchecker">
-        <include name="lucene-spellchecker-${version}.jar" />
-      </fileset>
       </copy>
   </target>  
   
Index: solr/src/test/org/apache/solr/spelling/suggest/PersistenceTest.java
===================================================================
--- solr/src/test/org/apache/solr/spelling/suggest/PersistenceTest.java	(revision 1085820)
+++ solr/src/test/org/apache/solr/spelling/suggest/PersistenceTest.java	(working copy)
@@ -19,8 +19,8 @@
 import java.io.File;
 
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.spelling.suggest.jaspell.JaspellLookup;
-import org.apache.solr.spelling.suggest.tst.TSTLookup;
+import org.apache.lucene.search.spell.suggest.jaspell.JaspellLookup;
+import org.apache.lucene.search.spell.suggest.tst.TSTLookup;
 import org.junit.Test;
 
 public class PersistenceTest extends SolrTestCaseJ4 {
Index: solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
===================================================================
--- solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java	(revision 1085820)
+++ solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java	(working copy)
@@ -20,10 +20,11 @@
 import org.apache.lucene.util.RamUsageEstimator;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.SpellingParams;
-import org.apache.solr.spelling.suggest.Lookup.LookupResult;
-import org.apache.solr.spelling.suggest.jaspell.JaspellLookup;
-import org.apache.solr.spelling.suggest.tst.TSTLookup;
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.suggest.Lookup;
+import org.apache.lucene.search.spell.suggest.Lookup.LookupResult;
+import org.apache.lucene.search.spell.suggest.jaspell.JaspellLookup;
+import org.apache.lucene.search.spell.suggest.tst.TSTLookup;
+import org.apache.lucene.search.spell.TermFreqIterator;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
Index: solr/src/test-files/solr/conf/solrconfig-spellchecker.xml
===================================================================
--- solr/src/test-files/solr/conf/solrconfig-spellchecker.xml	(revision 1085820)
+++ solr/src/test-files/solr/conf/solrconfig-spellchecker.xml	(working copy)
@@ -34,8 +34,8 @@
   <searchComponent class="solr.SpellCheckComponent" name="suggest">
     <lst name="spellchecker">
       <str name="name">suggest</str>
-      <str name="classname">org.apache.solr.spelling.suggest.Suggester</str>
-      <str name="lookupImpl">org.apache.solr.spelling.suggest.jaspell.JaspellLookup</str>
+      <str name="classname">org.apache.solr.spelling.Suggester</str>
+      <str name="lookupImpl">org.apache.lucene.search.spell.suggest.jaspell.JaspellLookup</str>
       <str name="field">suggest</str>
       <str name="storeDir">suggest</str>
       <str name="buildOnCommit">true</str>
Index: solr/src/java/org/apache/solr/spelling/suggest/SortedTermFreqIteratorWrapper.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/UnsortedTermFreqIteratorWrapper.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/FileDictionary.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/Suggester.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/Lookup.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookup.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/tst/TSTLookup.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/tst/TernaryTreeNode.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
===================================================================
--- solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java	(revision 1085820)
+++ solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java	(working copy)
@@ -27,11 +27,11 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.search.spell.PlainTextDictionary;
+import org.apache.lucene.search.spell.HighFrequencyDictionary;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.schema.FieldType;
-import org.apache.solr.util.HighFrequencyDictionary;
 import org.apache.solr.search.SolrIndexSearcher;
 
 /**
Index: solr/src/java/org/apache/solr/spelling/Suggester.java
===================================================================
--- solr/src/java/org/apache/solr/spelling/Suggester.java	(revision 1085784)
+++ solr/src/java/org/apache/solr/spelling/Suggester.java	(working copy)
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.spelling.suggest;
+package org.apache.solr.spelling;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,15 +27,17 @@
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.spell.Dictionary;
+import org.apache.lucene.search.spell.HighFrequencyDictionary;
+import org.apache.lucene.search.spell.suggest.FileDictionary;
+import org.apache.lucene.search.spell.suggest.Lookup;
+import org.apache.lucene.search.spell.suggest.Lookup.LookupResult;
+import org.apache.lucene.search.spell.suggest.jaspell.JaspellLookup;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.spelling.SolrSpellChecker;
 import org.apache.solr.spelling.SpellingOptions;
 import org.apache.solr.spelling.SpellingResult;
-import org.apache.solr.spelling.suggest.Lookup.LookupResult;
-import org.apache.solr.spelling.suggest.jaspell.JaspellLookup;
-import org.apache.solr.util.HighFrequencyDictionary;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +86,6 @@
       lookupImpl = JaspellLookup.class.getName();
     }
     lookup = (Lookup) core.getResourceLoader().newInstance(lookupImpl);
-    lookup.init(config, core);
     String store = (String)config.get(STORE_DIR);
     if (store != null) {
       storeDir = new File(store);
Index: solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
===================================================================
--- solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java	(revision 1085820)
+++ solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java	(working copy)
@@ -21,7 +21,7 @@
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.util.HighFrequencyDictionary;
+import org.apache.lucene.search.spell.HighFrequencyDictionary;
 
 import java.io.File;
 import java.io.IOException;
Index: solr/src/java/org/apache/solr/util/TermFreqIterator.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/util/SortedIterator.java (deleted)
===================================================================
Index: solr/src/java/org/apache/solr/util/HighFrequencyDictionary.java (deleted)
===================================================================

Property changes on: modules\spellchecker
___________________________________________________________________
Modified: svn:ignore
   - *.iml
pom.xml

   + *.iml
pom.xml
build
dist


Index: modules/spellchecker/NOTICE.txt
===================================================================
--- modules/spellchecker/NOTICE.txt	(revision 0)
+++ modules/spellchecker/NOTICE.txt	(revision 0)
@@ -0,0 +1,8 @@
+Apache Lucene Spellchecking Module
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes code (JaspellTernarySearchTrie) from Java Spelling Checking Package (jaspell): http://jaspell.sourceforge.net/
+License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)

Property changes on: modules\spellchecker\NOTICE.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Index: modules/spellchecker/LICENSE.txt
===================================================================
--- modules/spellchecker/LICENSE.txt	(revision 0)
+++ modules/spellchecker/LICENSE.txt	(revision 0)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Property changes on: modules\spellchecker\LICENSE.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/TermFreqIterator.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/TermFreqIterator.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/TermFreqIterator.java	(working copy)
@@ -1,5 +1,22 @@
-package org.apache.solr.util;
+package org.apache.lucene.search.spell;
 
+/**
+ * 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.util.Iterator;
 
 public interface TermFreqIterator extends Iterator<String> {
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/SortedTermFreqIteratorWrapper.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/SortedTermFreqIteratorWrapper.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/SortedTermFreqIteratorWrapper.java	(working copy)
@@ -1,9 +1,26 @@
-package org.apache.solr.spelling.suggest;
+package org.apache.lucene.search.spell.suggest;
 
+/**
+ * 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.util.Collections;
 
-import org.apache.solr.util.SortedIterator;
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.SortedIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 /**
  * This wrapper buffers incoming elements and makes sure they are sorted in
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/UnsortedTermFreqIteratorWrapper.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/UnsortedTermFreqIteratorWrapper.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/UnsortedTermFreqIteratorWrapper.java	(working copy)
@@ -1,8 +1,25 @@
-package org.apache.solr.spelling.suggest;
+package org.apache.lucene.search.spell.suggest;
 
+/**
+ * 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.util.Collections;
 
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 /**
  * This wrapper buffers the incoming elements and makes sure they are in
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/FileDictionary.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/FileDictionary.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/FileDictionary.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.solr.spelling.suggest;
+package org.apache.lucene.search.spell.suggest;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,7 +21,7 @@
 import java.io.*;
 
 import org.apache.lucene.search.spell.Dictionary;
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 
 /**
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/BufferingTermFreqIteratorWrapper.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/BufferingTermFreqIteratorWrapper.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/BufferingTermFreqIteratorWrapper.java	(working copy)
@@ -1,10 +1,26 @@
-package org.apache.solr.spelling.suggest;
+package org.apache.lucene.search.spell.suggest;
 
+/**
+ * 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.util.ArrayList;
 import java.util.List;
 
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 /**
  * This wrapper buffers incoming elements.
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/Lookup.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/Lookup.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/Lookup.java	(working copy)
@@ -1,5 +1,22 @@
-package org.apache.solr.spelling.suggest;
+package org.apache.lucene.search.spell.suggest;
 
+/**
+ * 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.File;
 import java.io.IOException;
 import java.util.Iterator;
@@ -7,9 +24,7 @@
 
 import org.apache.lucene.search.spell.Dictionary;
 import org.apache.lucene.util.PriorityQueue;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 public abstract class Lookup {
   
@@ -17,8 +32,8 @@
    * Result of a lookup.
    */
   public static final class LookupResult implements Comparable<LookupResult> {
-    String key;
-    float value;
+    public String key;
+    public float value;
     
     public LookupResult(String key, float value) {
       this.key = key;
@@ -57,9 +72,6 @@
     }
   }
   
-  /** Initialize the lookup. */
-  public abstract void init(NamedList config, SolrCore core);
-  
   /** Build lookup from a dictionary. Some implementations may require sorted
    * or unsorted keys from the dictionary's iterator - use
    * {@link SortedTermFreqIteratorWrapper} or
@@ -76,7 +88,7 @@
     build(tfit);
   }
   
-  protected abstract void build(TermFreqIterator tfit) throws IOException;
+  public abstract void build(TermFreqIterator tfit) throws IOException;
   
   /**
    * Persist the constructed lookup data to a directory. Optional operation.
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/jaspell/JaspellLookup.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/jaspell/JaspellLookup.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/jaspell/JaspellLookup.java	(working copy)
@@ -1,5 +1,22 @@
-package org.apache.solr.spelling.suggest.jaspell;
+package org.apache.lucene.search.spell.suggest.jaspell;
 
+/**
+ * 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.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -9,28 +26,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.spelling.suggest.Lookup;
-import org.apache.solr.spelling.suggest.UnsortedTermFreqIteratorWrapper;
-import org.apache.solr.spelling.suggest.jaspell.JaspellTernarySearchTrie.TSTNode;
-import org.apache.solr.util.SortedIterator;
-import org.apache.solr.util.TermFreqIterator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.lucene.search.spell.suggest.Lookup;
+import org.apache.lucene.search.spell.suggest.UnsortedTermFreqIteratorWrapper;
+import org.apache.lucene.search.spell.suggest.jaspell.JaspellTernarySearchTrie.TSTNode;
+import org.apache.lucene.search.spell.SortedIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 public class JaspellLookup extends Lookup {
-  private static final Logger LOG = LoggerFactory.getLogger(JaspellLookup.class);
   JaspellTernarySearchTrie trie = new JaspellTernarySearchTrie();
   private boolean usePrefix = true;
   private int editDistance = 2;
 
   @Override
-  public void init(NamedList config, SolrCore core) {
-    LOG.info("init: " + config);
-  }
-
-  @Override
   public void build(TermFreqIterator tfit) throws IOException {
     if (tfit instanceof SortedIterator) {
       // make sure it's unsorted
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/jaspell/JaspellTernarySearchTrie.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/jaspell/JaspellTernarySearchTrie.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/jaspell/JaspellTernarySearchTrie.java	(working copy)
@@ -1,5 +1,34 @@
-package org.apache.solr.spelling.suggest.jaspell;
+package org.apache.lucene.search.spell.suggest.jaspell;
 
+/** 
+ * Copyright (c) 2005 Bruno Martins
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the organization nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TSTLookup.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TSTLookup.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TSTLookup.java	(working copy)
@@ -1,5 +1,22 @@
-package org.apache.solr.spelling.suggest.tst;
+package org.apache.lucene.search.spell.suggest.tst;
 
+/**
+ * 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.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -9,22 +26,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.spelling.suggest.Lookup;
-import org.apache.solr.spelling.suggest.SortedTermFreqIteratorWrapper;
-import org.apache.solr.util.SortedIterator;
-import org.apache.solr.util.TermFreqIterator;
+import org.apache.lucene.search.spell.suggest.Lookup;
+import org.apache.lucene.search.spell.suggest.SortedTermFreqIteratorWrapper;
+import org.apache.lucene.search.spell.SortedIterator;
+import org.apache.lucene.search.spell.TermFreqIterator;
 
 public class TSTLookup extends Lookup {
   TernaryTreeNode root = new TernaryTreeNode();
   TSTAutocomplete autocomplete = new TSTAutocomplete();
 
   @Override
-  public void init(NamedList config, SolrCore core) {
-  }
-
-  @Override
   public void build(TermFreqIterator tfit) throws IOException {
     root = new TernaryTreeNode();
     // buffer first
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TernaryTreeNode.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TernaryTreeNode.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TernaryTreeNode.java	(working copy)
@@ -1,6 +1,23 @@
-package org.apache.solr.spelling.suggest.tst;
+package org.apache.lucene.search.spell.suggest.tst;
 
 /**
+ * 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.
+ */
+
+/**
  * The class creates a TST node.
  */
 
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TSTAutocomplete.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TSTAutocomplete.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/suggest/tst/TSTAutocomplete.java	(working copy)
@@ -1,5 +1,22 @@
-package org.apache.solr.spelling.suggest.tst;
+package org.apache.lucene.search.spell.suggest.tst;
 
+/**
+ * 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.util.*;
 
 public class TSTAutocomplete {
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/SortedIterator.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/SortedIterator.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/SortedIterator.java	(working copy)
@@ -1,5 +1,22 @@
-package org.apache.solr.util;
+package org.apache.lucene.search.spell;
 
+/**
+ * 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.util.Iterator;
 
 /**
Index: modules/spellchecker/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java
===================================================================
--- modules/spellchecker/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java	(revision 1085784)
+++ modules/spellchecker/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java	(working copy)
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.util;
+package org.apache.lucene.search.spell;
 
 import java.io.IOException;
 import java.util.Iterator;
Index: modules/spellchecker/build.xml
===================================================================
--- modules/spellchecker/build.xml	(revision 1085784)
+++ modules/spellchecker/build.xml	(working copy)
@@ -23,9 +23,11 @@
     Spell Checker
   </description>
 
-  <import file="../contrib-build.xml"/>
+  <property name="build.dir" location="build/" />
+  <property name="dist.dir" location="dist/" />
+  <import file="../../lucene/contrib/contrib-build.xml"/>
 
-  <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+  <module-uptodate name="analysis/common" jarfile="../analysis/build/common/lucene-analyzers-common-${version}.jar"
       property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
 
   <path id="classpath">
@@ -37,7 +39,7 @@
 
   <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
     <subant target="default">
-      <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+      <fileset dir="../analysis/common" includes="build.xml"/>
     </subant>
   </target>
 </project>
Index: modules/build.xml
===================================================================
--- modules/build.xml	(revision 1085820)
+++ modules/build.xml	(working copy)
@@ -24,6 +24,7 @@
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -33,6 +34,7 @@
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -42,6 +44,7 @@
       <subant target="compile-test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -51,6 +54,7 @@
       <subant target="javadocs" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -61,6 +65,7 @@
       <subant target="dist-maven" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -90,6 +95,7 @@
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />
+        <fileset dir="spellchecker" includes="build.xml" />
       </subant>
     </sequential>
   </target>
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1085820)
+++ lucene/build.xml	(working copy)
@@ -219,7 +219,6 @@
           <packageset dir="contrib/misc/src/java"/>
           <packageset dir="contrib/queries/src/java"/>
           <packageset dir="contrib/spatial/src/java"/>
-          <packageset dir="contrib/spellchecker/src/java"/>
           <packageset dir="contrib/swing/src/java"/>
           <packageset dir="contrib/wordnet/src/java"/>
           <packageset dir="contrib/xml-query-parser/src/java"/>
@@ -244,7 +243,6 @@
           <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: Spatial" packages="org.apache.lucene.spatial*"/>
-          <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
           <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
           <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
           <group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestNGramDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/NGramDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/LuceneDictionary.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/StringDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWordScoreComparator.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/JaroWinklerDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWordQueue.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/Dictionary.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/LevensteinDistance.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWordFrequencyComparator.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWord.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/package.html (deleted)
===================================================================
Index: lucene/contrib/spellchecker/src/java/overview.html (deleted)
===================================================================
Index: lucene/contrib/spellchecker/build.xml (deleted)
===================================================================