Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/search/TestTermScorer.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/search/TestTermScorer.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/search/TestTermScorer.java	(working copy)
@@ -72,10 +72,9 @@
         TermQuery termQuery = new TermQuery(allTerm);
 
         Weight weight = termQuery.weight(indexSearcher);
+        Scorer ts = weight.scorer(indexSearcher.getIndexReader(),
+                                  true, true);
 
-        TermScorer ts = new TermScorer(weight,
-                                       indexReader.termDocs(allTerm), indexSearcher.getSimilarity(),
-                                       indexReader.norms(FIELD));
         assertTrue("ts is null and it shouldn't be", ts != null);
         //we have 2 documents with the term all in them, one document for all the other values
         final List docs = new ArrayList();
@@ -125,9 +124,9 @@
 
         Weight weight = termQuery.weight(indexSearcher);
 
-        TermScorer ts = new TermScorer(weight,
-                                       indexReader.termDocs(allTerm), indexSearcher.getSimilarity(),
-                                       indexReader.norms(FIELD));
+        Scorer ts = weight.scorer(indexSearcher.getIndexReader(),
+                                  true, true);
+
         assertTrue("ts is null and it shouldn't be", ts != null);
         assertTrue("next did not return a doc", ts.next() == true);
         assertTrue("score is not correct", ts.score() == 1.6931472f);
@@ -144,9 +143,9 @@
 
         Weight weight = termQuery.weight(indexSearcher);
 
-        TermScorer ts = new TermScorer(weight,
-                                       indexReader.termDocs(allTerm), indexSearcher.getSimilarity(),
-                                       indexReader.norms(FIELD));
+        Scorer ts = weight.scorer(indexSearcher.getIndexReader(),
+                                  true, true);
+
         assertTrue("ts is null and it shouldn't be", ts != null);
         assertTrue("Didn't skip", ts.skipTo(3) == true);
         //The next doc should be doc 5
@@ -160,9 +159,9 @@
 
         Weight weight = termQuery.weight(indexSearcher);
 
-        TermScorer ts = new TermScorer(weight,
-                                       indexReader.termDocs(allTerm), indexSearcher.getSimilarity(),
-                                       indexReader.norms(FIELD));
+        Scorer ts = weight.scorer(indexSearcher.getIndexReader(),
+                                  true, true);
+
         assertTrue("ts is null and it shouldn't be", ts != null);
         Explanation explanation = ts.explain(0);
         assertTrue("explanation is null and it shouldn't be", explanation != null);
@@ -179,8 +178,9 @@
         termQuery = new TermQuery(dogsTerm);
         weight = termQuery.weight(indexSearcher);
 
-        ts = new TermScorer(weight, indexReader.termDocs(dogsTerm), indexSearcher.getSimilarity(),
-                                       indexReader.norms(FIELD));
+        ts = weight.scorer(indexSearcher.getIndexReader(),
+                           true, true);
+
         assertTrue("ts is null and it shouldn't be", ts != null);
         explanation = ts.explain(1);
         assertTrue("explanation is null and it shouldn't be", explanation != null);
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentTermEnum.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentTermEnum.java	(working copy)
@@ -65,23 +65,6 @@
     verifyDocFreq();
   }
 
-  public void testPrevTermAtEnd() throws IOException
-  {
-    Directory dir = new MockRAMDirectory();
-    IndexWriter writer  = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
-    addDoc(writer, "aaa bbb");
-    writer.close();
-    SegmentReader reader = SegmentReader.getOnlySegmentReader(dir);
-    SegmentTermEnum termEnum = (SegmentTermEnum) reader.terms();
-    assertTrue(termEnum.next());
-    assertEquals("aaa", termEnum.term().text());
-    assertTrue(termEnum.next());
-    assertEquals("aaa", termEnum.prev().text());
-    assertEquals("bbb", termEnum.term().text());
-    assertFalse(termEnum.next());
-    assertEquals("bbb", termEnum.prev().text());
-  }
-
   private void verifyDocFreq()
       throws IOException
   {
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexWriterDelete.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexWriterDelete.java	(working copy)
@@ -668,22 +668,9 @@
         }
       }
 
-      String[] startFiles = dir.list();
-      SegmentInfos infos = new SegmentInfos();
-      infos.read(dir);
-      new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
-      String[] endFiles = dir.list();
-
-      if (!Arrays.equals(startFiles, endFiles)) {
-        fail("docswriter abort() failed to delete unreferenced files:\n  before delete:\n    "
-             + arrayToString(startFiles) + "\n  after delete:\n    "
-             + arrayToString(endFiles));
-      }
-
+      TestIndexWriter.assertNoUnreferencedFiles(dir, "docsWriter.abort() failed to delete unreferenced files");
       modifier.close();
-
     }
-
   }
 
   private String arrayToString(String[] l) {
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexReader.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexReader.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexReader.java	(working copy)
@@ -962,30 +962,8 @@
           // new IndexFileDeleter, have it delete
           // unreferenced files, then verify that in fact
           // no files were deleted:
-          String[] startFiles = dir.list();
-          SegmentInfos infos = new SegmentInfos();
-          infos.read(dir);
-          new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
-          String[] endFiles = dir.list();
+          TestIndexWriter.assertNoUnreferencedFiles(dir, "reader.close() failed to delete unreferenced files");
 
-          Arrays.sort(startFiles);
-          Arrays.sort(endFiles);
-
-          //for(int i=0;i<startFiles.length;i++) {
-          //  System.out.println("  startFiles: " + i + ": " + startFiles[i]);
-          //}
-
-          if (!Arrays.equals(startFiles, endFiles)) {
-            String successStr;
-            if (success) {
-              successStr = "success";
-            } else {
-              successStr = "IOException";
-              err.printStackTrace();
-            }
-            fail("reader.close() failed to delete unreferenced files after " + successStr + " (" + diskFree + " bytes): before delete:\n    " + arrayToString(startFiles) + "\n  after delete:\n    " + arrayToString(endFiles));
-          }
-
           // Finally, verify index is not corrupt, and, if
           // we succeeded, we see all docs changed, and if
           // we failed, we see either all docs or no docs
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentTermDocs.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentTermDocs.java	(working copy)
@@ -55,14 +55,13 @@
     //After adding the document, we should be able to read it back in
     SegmentReader reader = SegmentReader.get(true, info, indexDivisor);
     assertTrue(reader != null);
-    SegmentTermDocs segTermDocs = new SegmentTermDocs(reader);
-    assertTrue(segTermDocs != null);
-    segTermDocs.seek(new Term(DocHelper.TEXT_FIELD_2_KEY, "field"));
-    if (segTermDocs.next() == true)
-    {
-      int docId = segTermDocs.doc();
+    TermDocs termDocs = reader.termDocs();
+    assertTrue(termDocs != null);
+    termDocs.seek(new Term(DocHelper.TEXT_FIELD_2_KEY, "field"));
+    if (termDocs.next() == true) {
+      int docId = termDocs.doc();
       assertTrue(docId == 0);
-      int freq = segTermDocs.freq();
+      int freq = termDocs.freq();
       assertTrue(freq == 3);  
     }
     reader.close();
@@ -77,20 +76,20 @@
       //After adding the document, we should be able to read it back in
       SegmentReader reader = SegmentReader.get(true, info, indexDivisor);
       assertTrue(reader != null);
-      SegmentTermDocs segTermDocs = new SegmentTermDocs(reader);
-      assertTrue(segTermDocs != null);
-      segTermDocs.seek(new Term("textField2", "bad"));
-      assertTrue(segTermDocs.next() == false);
+      TermDocs termDocs = reader.termDocs();
+      assertTrue(termDocs != null);
+      termDocs.seek(new Term("textField2", "bad"));
+      assertTrue(termDocs.next() == false);
       reader.close();
     }
     {
       //After adding the document, we should be able to read it back in
       SegmentReader reader = SegmentReader.get(true, info, indexDivisor);
       assertTrue(reader != null);
-      SegmentTermDocs segTermDocs = new SegmentTermDocs(reader);
-      assertTrue(segTermDocs != null);
-      segTermDocs.seek(new Term("junk", "bad"));
-      assertTrue(segTermDocs.next() == false);
+      TermDocs termDocs = reader.termDocs();
+      assertTrue(termDocs != null);
+      termDocs.seek(new Term("junk", "bad"));
+      assertTrue(termDocs.next() == false);
       reader.close();
     }
   }
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexWriter.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexWriter.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestIndexWriter.java	(working copy)
@@ -57,6 +57,7 @@
 
 import org.apache.lucene.store.MockRAMDirectory;
 import org.apache.lucene.store.LockFactory;
+import org.apache.lucene.store.NoLockFactory;
 import org.apache.lucene.store.Lock;
 import org.apache.lucene.store.SingleInstanceLockFactory;
 
@@ -539,10 +540,15 @@
     }                                               
 
     public static void assertNoUnreferencedFiles(Directory dir, String message) throws IOException {
-      String[] startFiles = dir.list();
-      SegmentInfos infos = new SegmentInfos();
-      infos.read(dir);
-      new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
+      final LockFactory lf = dir.getLockFactory();
+      String[] startFiles;
+      try {
+        dir.setLockFactory(new NoLockFactory());
+        startFiles = dir.list();
+        new IndexWriter(dir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED).close();
+      } finally {
+        dir.setLockFactory(lf);
+      }
       String[] endFiles = dir.list();
 
       Arrays.sort(startFiles);
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java	(working copy)
@@ -32,7 +32,8 @@
 import org.apache.lucene.document.Field.Index;
 import org.apache.lucene.document.Field.Store;
 import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
+import org.apache.lucene.store.Directory;
 
 /**
  * This testcase tests whether multi-level skipping is being used
@@ -43,8 +44,18 @@
  * 
  */
 public class TestMultiLevelSkipList extends LuceneTestCase {
+
+  class CountingRAMDirectory extends MockRAMDirectory {
+    public IndexInput openInput(String fileName) throws IOException {
+      IndexInput in = super.openInput(fileName);
+      if (fileName.endsWith(".frq"))
+        in = new CountingStream(in);
+      return in;
+    }
+  }
+
   public void testSimpleSkip() throws IOException {
-    RAMDirectory dir = new RAMDirectory();
+    Directory dir = new CountingRAMDirectory();
     IndexWriter writer = new IndexWriter(dir, new PayloadAnalyzer(), true,
                                          IndexWriter.MaxFieldLength.LIMITED);
     Term term = new Term("test", "a");
@@ -58,8 +69,7 @@
     writer.close();
 
     IndexReader reader = SegmentReader.getOnlySegmentReader(dir);
-    SegmentTermPositions tp = (SegmentTermPositions) reader.termPositions();
-    tp.freqStream = new CountingStream(tp.freqStream);
+    TermPositions tp = reader.termPositions();
 
     for (int i = 0; i < 2; i++) {
       counter = 0;
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestPayloads.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestPayloads.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestPayloads.java	(working copy)
@@ -253,10 +253,12 @@
         tp.next();
         tp.nextPosition();
         // now we don't read this payload
+        tp.next();
         tp.nextPosition();
         assertEquals("Wrong payload length.", 1, tp.getPayloadLength());
         byte[] payload = tp.getPayload(null, 0);
         assertEquals(payload[0], payloadData[numTerms]);
+        tp.next();
         tp.nextPosition();
         
         // we don't read this payload and skip to a different document
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentReader.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentReader.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestSegmentReader.java	(working copy)
@@ -139,6 +139,7 @@
     TermPositions positions = reader.termPositions();
     positions.seek(new Term(DocHelper.TEXT_FIELD_1_KEY, "field"));
     assertTrue(positions != null);
+    assertTrue(positions.next());
     assertTrue(positions.doc() == 0);
     assertTrue(positions.nextPosition() >= 0);
   }    
Index: tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
===================================================================
--- tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestLazyProxSkipping.java	(revision 818135)
+++ tags/lucene_2_4_back_compat_tests_20090911/src/test/org/apache/lucene/index/TestLazyProxSkipping.java	(working copy)
@@ -47,7 +47,7 @@
     private class SeekCountingDirectory extends RAMDirectory {
       public IndexInput openInput(String name) throws IOException {
         IndexInput ii = super.openInput(name);
-        if (name.endsWith(".prx")) {
+        if (name.endsWith(".prx") || name.endsWith(".pos")) {
           // we decorate the proxStream with a wrapper class that allows to count the number of calls of seek()
           ii = new SeeksCountingStream(ii);
         }