Index: lucene/demo/src/test/org/apache/lucene/facet/FacetTestUtils.java
===================================================================
--- lucene/demo/src/test/org/apache/lucene/facet/FacetTestUtils.java	(working copy)
+++ lucene/demo/src/test/org/apache/lucene/facet/FacetTestUtils.java	(working copy)
@@ -1,10 +1,12 @@
 package org.apache.lucene.facet;
 
 import java.io.IOException;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.TextField;
@@ -78,12 +80,18 @@
 
   public static IndexTaxonomyWriterPair[] createIndexTaxonomyWriterPair(
       Directory[][] dirs) throws IOException {
+    // no randomness or payloads
+    final Analyzer simple = new Analyzer() {
+      @Override
+      protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
+        return new TokenStreamComponents(new MockTokenizer(reader, MockTokenizer.WHITESPACE, true));
+      }
+    };
     IndexTaxonomyWriterPair[] pairs = new IndexTaxonomyWriterPair[dirs.length];
     for (int i = 0; i < dirs.length; i++) {
       IndexTaxonomyWriterPair pair = new IndexTaxonomyWriterPair();
       pair.indexWriter = new IndexWriter(dirs[i][0], new IndexWriterConfig(
-          LuceneTestCase.TEST_VERSION_CURRENT, new StandardAnalyzer(
-              LuceneTestCase.TEST_VERSION_CURRENT)));
+          LuceneTestCase.TEST_VERSION_CURRENT, simple));
       pair.taxWriter = new DirectoryTaxonomyWriter(dirs[i][1]);
       pair.indexWriter.commit();
       pair.taxWriter.commit();
Index: lucene/demo/src/test/org/apache/lucene/facet/example/TestTotalFacetCountsCache.java
===================================================================
--- lucene/demo/src/test/org/apache/lucene/facet/example/TestTotalFacetCountsCache.java	(working copy)
+++ lucene/demo/src/test/org/apache/lucene/facet/example/TestTotalFacetCountsCache.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search;
+package org.apache.lucene.facet.example;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,7 +29,9 @@
 import org.apache.lucene.facet.index.CategoryDocumentBuilder;
 import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams;
 import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.search.TotalFacetCounts;
 import org.apache.lucene.facet.search.TotalFacetCounts.CreationType;
+import org.apache.lucene.facet.search.TotalFacetCountsCache;
 import org.apache.lucene.facet.search.results.FacetResult;
 import org.apache.lucene.facet.search.results.FacetResultNode;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
Index: lucene/demo/src/test/org/apache/lucene/facet/example/TestTotalFacetCounts.java
===================================================================
--- lucene/demo/src/test/org/apache/lucene/facet/example/TestTotalFacetCounts.java	(working copy)
+++ lucene/demo/src/test/org/apache/lucene/facet/example/TestTotalFacetCounts.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search;
+package org.apache.lucene.facet.example;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,6 +14,8 @@
 import org.apache.lucene.facet.FacetTestUtils.IndexTaxonomyReaderPair;
 import org.apache.lucene.facet.FacetTestUtils.IndexTaxonomyWriterPair;
 import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams;
+import org.apache.lucene.facet.search.TotalFacetCounts;
+import org.apache.lucene.facet.search.TotalFacetCountsCache;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: lucene/demo/src/test/org/apache/lucene/facet/example/FacetsPayloadProcessorProviderTest.java
===================================================================
--- lucene/demo/src/test/org/apache/lucene/facet/example/FacetsPayloadProcessorProviderTest.java	(working copy)
+++ lucene/demo/src/test/org/apache/lucene/facet/example/FacetsPayloadProcessorProviderTest.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.index;
+package org.apache.lucene.facet.example;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -17,6 +17,7 @@
 
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.facet.example.merge.TaxonomyMergeUtils;
+import org.apache.lucene.facet.index.CategoryDocumentBuilder;
 import org.apache.lucene.facet.search.FacetsCollector;
 import org.apache.lucene.facet.search.params.CountFacetRequest;
 import org.apache.lucene.facet.search.params.FacetSearchParams;
Index: lucene/demo/src/test/org/apache/lucene/facet/example/EnhancementsPayloadIteratorTest.java
===================================================================
--- lucene/demo/src/test/org/apache/lucene/facet/example/EnhancementsPayloadIteratorTest.java	(working copy)
+++ lucene/demo/src/test/org/apache/lucene/facet/example/EnhancementsPayloadIteratorTest.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.enhancements;
+package org.apache.lucene.facet.example;
 
 import java.io.IOException;
 
Index: lucene/demo/build.xml
===================================================================
--- lucene/demo/build.xml	(revision 1327509)
+++ lucene/demo/build.xml	(working copy)
@@ -30,13 +30,14 @@
   <target name="init" depends="module-build.init,jar-lucene-core"/>
   
   <path id="classpath">
-	 <pathelement path="${analyzers-common.jar}"/>
+   <pathelement path="${analyzers-common.jar}"/>
    <pathelement path="${queryparser.jar}"/>
+   <pathelement path="${facet.jar}"/>
    <pathelement path="${lucene-core.jar}"/>
    <pathelement location="lib/servlet-api-2.4.jar"/>
   </path>
 
-  <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,common.compile-core" />
+  <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-facet,common.compile-core" />
 
   <target name="default" depends="jar-core,build-web-demo"/>
 
Index: lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
===================================================================
--- lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java	(revision 1327509)
+++ lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java	(working copy)
@@ -1,10 +1,12 @@
 package org.apache.lucene.facet;
 
 import java.io.IOException;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.TextField;
@@ -78,12 +80,18 @@
 
   public static IndexTaxonomyWriterPair[] createIndexTaxonomyWriterPair(
       Directory[][] dirs) throws IOException {
+    // no randomness or payloads
+    final Analyzer simple = new Analyzer() {
+      @Override
+      protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
+        return new TokenStreamComponents(new MockTokenizer(reader, MockTokenizer.WHITESPACE, true));
+      }
+    };
     IndexTaxonomyWriterPair[] pairs = new IndexTaxonomyWriterPair[dirs.length];
     for (int i = 0; i < dirs.length; i++) {
       IndexTaxonomyWriterPair pair = new IndexTaxonomyWriterPair();
       pair.indexWriter = new IndexWriter(dirs[i][0], new IndexWriterConfig(
-          LuceneTestCase.TEST_VERSION_CURRENT, new StandardAnalyzer(
-              LuceneTestCase.TEST_VERSION_CURRENT)));
+          LuceneTestCase.TEST_VERSION_CURRENT, simple));
       pair.taxWriter = new DirectoryTaxonomyWriter(dirs[i][1]);
       pair.indexWriter.commit();
       pair.taxWriter.commit();
Index: lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/index/FacetsPayloadProcessorProviderTest.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/enhancements/EnhancementsPayloadIteratorTest.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/example/TestSimpleExample.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/example/TestAssociationExample.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/facet/example/TestAdaptiveExample.java (deleted)
===================================================================
Index: lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java (deleted)
===================================================================
Index: lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java
===================================================================
--- lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java	(revision 1327509)
+++ lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java	(working copy)
@@ -64,10 +64,14 @@
   private final FacetIndexingParams facetIndexingParams;
 
   private final static AtomicInteger atomicGen4Test = new AtomicInteger(1);
-  /** Creation type for test purposes */
-  enum CreationType { Computed, Loaded } // for testing
-  final int gen4test;
-  final CreationType createType4test;
+  /** Creation type for test purposes 
+   * @lucene.internal 
+   */
+  public enum CreationType { Computed, Loaded } // for testing
+  /** @lucene.internal */
+  public final int gen4test;
+  /** @lucene.internal */
+  public final CreationType createType4test;
   
   /** 
    * Construct by key - from index Directory or by recomputing.
Index: lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
===================================================================
--- lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java	(revision 1327509)
+++ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java	(working copy)
@@ -12,7 +12,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -285,9 +284,9 @@
   protected IndexWriterConfig createIndexWriterConfig(OpenMode openMode) {
     // Make sure we use a MergePolicy which always merges adjacent segments and thus
     // keeps the doc IDs ordered as well (this is crucial for the taxonomy index).
-    return new IndexWriterConfig(Version.LUCENE_40,
-        new KeywordAnalyzer()).setOpenMode(openMode).setMergePolicy(
-        new LogByteSizeMergePolicy());
+    return new IndexWriterConfig(Version.LUCENE_40, null)
+        .setOpenMode(openMode)
+        .setMergePolicy(new LogByteSizeMergePolicy());
   }
 
   // Currently overridden by a unit test that verifies that every index we open is close()ed.
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/merge/TaxonomyMergeUtils.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleSearcher.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleUtils.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/package.html (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLSearcher.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLMain.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleResult.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationMain.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationSearcher.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationUtils.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleUtils.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveMain.java (deleted)
===================================================================
Index: lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveSearcher.java (deleted)
===================================================================
Index: lucene/facet/build.xml
===================================================================
--- lucene/facet/build.xml	(revision 1327509)
+++ lucene/facet/build.xml	(working copy)
@@ -28,50 +28,4 @@
   
   <import file="../module-build.xml"/>
 
-  <property name="examples.dir" location="src/examples"/>
-
-  <path id="classpath">
-    <path refid="base.classpath" />
-    <pathelement location="${build.dir}/classes/java" />
-    <pathelement location="${build.dir}/classes/examples" />
-  </path>
-    
-  <path id="examples.classpath">
-    <path refid="classpath" />
-    <pathelement location="${build.dir}/classes/java" />
-    <pathelement path="${analyzers-common.jar}" />
-  </path>
-
-  <path id="test.classpath">
-    <path refid="test.base.classpath" />
-    <pathelement location="${build.dir}/classes/examples" />
-    <!-- TODO, cut over tests to MockAnalyzer etc and nuke this dependency -->
-    <pathelement path="${analyzers-common.jar}" />
-  </path>
-
-  <path id="classpath">
-    <!-- TODO, cut over tests to MockAnalyzer etc and nuke this dependency -->
-    <pathelement path="${analyzers-common.jar}" />
-    <path refid="base.classpath"/>
-  </path>
-
-  <target name="compile-examples" description="Compiles Facets examples">
-    <compile srcdir="${examples.dir}" destdir="${build.dir}/classes/examples">
-      <classpath refid="examples.classpath" />
-    </compile>
-  </target>
-  
-  <target name="jar-examples" depends="compile-examples">
-    <jarify basedir="${build.dir}/classes/examples" 
-            destfile="${build.dir}/${final.name}-examples.jar" 
-            title="Lucene Search Engine: ${ant.project.name}-examples"
-            manifest.file="${build.dir}/EXAMPLES-MANIFEST.MF">
-      <fileset dir="src/examples" />
-    </jarify>
-  </target>
-
-  <target name="compile-core" depends="jar-analyzers-common,common.compile-core,compile-examples" description="Compiles facet classes" />
-
-  <target name="jar-core" depends="common.jar-core,jar-examples" />
-    
 </project>
Index: dev-tools/eclipse/dot.classpath
===================================================================
--- dev-tools/eclipse/dot.classpath	(revision 1327509)
+++ dev-tools/eclipse/dot.classpath	(working copy)
@@ -41,7 +41,6 @@
 	<classpathentry kind="src" path="lucene/benchmark/src/test"/>
         <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
 	<classpathentry kind="src" path="lucene/facet/src/java"/>
-	<classpathentry kind="src" path="lucene/facet/src/examples"/>
 	<classpathentry kind="src" path="lucene/facet/src/test"/>
 	<classpathentry kind="src" path="lucene/grouping/src/java"/>
 	<classpathentry kind="src" path="lucene/grouping/src/test"/>