lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sim...@apache.org
Subject svn commit: r1129631 [2/7] - in /lucene/dev/branches/docvalues: ./ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/spellchecker/ dev-tools/idea/modules/suggest/ dev-tools/maven/lucene/contrib/ dev-tools/maven/lucene/contrib/spell...
Date Tue, 31 May 2011 11:25:50 GMT
Modified: lucene/dev/branches/docvalues/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/build.xml?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/build.xml Tue May 31 11:25:37 2011
@@ -50,8 +50,7 @@
               excludes="*-src.jar"
   />
   <patternset id="binary.root.dist.patterns"
-              includes="docs/,*.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
-              excludes="BUILD.txt"
+              includes="docs/,CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd,lib/*.jar,lib/*LICENSE*.txt,lib/*NOTICE*.txt,contrib/*/lib/*.jar,contrib/*/lib/*LICENSE*.txt,contrib/*/lib/*NOTICE*.txt"
   />
 
 
@@ -227,7 +226,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/wordnet/src/java"/>
           <packageset dir="contrib/xml-query-parser/src/java"/>
           <packageset dir="contrib/queryparser/src/java"/>
@@ -248,7 +246,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: WordNet" packages="org.apache.lucene.wordnet*"/>
           <group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
           
@@ -295,10 +292,10 @@
   <!--                                                                    -->
   <!-- ================================================================== -->
   <target name="package-tgz" depends="package"
-    description="--> Generates the lucene distribution as .tar.gz">
+    description="--> Generates the lucene distribution as .tgz">
 
     <delete file="${build.dir}/lucene-${version}.tar"/>
-    <delete file="${dist.dir}/lucene-${version}.tar.gz"/>
+    <delete file="${dist.dir}/lucene-${version}.tgz"/>
     <tar tarfile="${build.dir}/lucene-${version}.tar" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir=".">
         <patternset refid="binary.root.dist.patterns"/>
@@ -308,10 +305,10 @@
       </tarfileset>
     </tar>
 
-    <gzip zipfile="${dist.dir}/lucene-${version}.tar.gz"
+    <gzip zipfile="${dist.dir}/lucene-${version}.tgz"
       src="${build.dir}/lucene-${version}.tar"
       />
-	<lucene-checksum file="${dist.dir}/lucene-${version}.tar.gz"/>
+	<lucene-checksum file="${dist.dir}/lucene-${version}.tgz"/>
   </target>
 
   <!-- ================================================================== -->
@@ -320,7 +317,7 @@
   <!--                                                                    -->
   <!-- ================================================================== -->
   <target name="package-all-binary" depends="package-zip, package-tgz"
-    description="--> Generates the .tar.gz and .zip distributions"/>
+    description="--> Generates the .tgz and .zip distributions"/>
 
   <!-- ================================================================== -->
   <!-- same as package-all. it is just here for compatibility.            -->
@@ -347,9 +344,9 @@
   <!-- Packages the sources from "svn export" with tar-gzip               -->
   <!-- ================================================================== -->
   <target name="package-tgz-src" depends="init, init-dist, svn-export-source"
-    description="--> Generates the Lucene distribution as .tar.gz">
+    description="--> Generates the Lucene distribution as .tgz">
     <property name="source.package.file"
-              value="${dist.dir}/lucene-${version}-src.tar.gz"/>
+              value="${dist.dir}/lucene-${version}-src.tgz"/>
     <delete file="${source.package.file}"/>
     <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
@@ -496,7 +493,7 @@
       <fileset dir="${dist.dir}">
         <include name="**/*.jar"/>
         <include name="**/*.zip"/>
-        <include name="**/*.tar.gz"/>
+        <include name="**/*.tgz"/>
         <include name="**/*.pom"/>
       </fileset>
       <globmapper from="*" to="*.asc"/>

Modified: lucene/dev/branches/docvalues/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/common-build.xml?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/common-build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/common-build.xml Tue May 31 11:25:37 2011
@@ -24,7 +24,6 @@
   </description>
 
   <dirname file="${ant.file.common}" property="common.dir"/>
-  <import file="${common.dir}/../common-build.xml"/>
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
   <property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -61,6 +60,11 @@
     <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
   </path>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common.dir}/build/classes/tools"/>
+  </path>
+
+
   <!-- default arguments to pass to JVM executing tests -->
   <property name="testmethod" value=""/>
   <property name="args" value=""/>

Modified: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt Tue May 31 11:25:37 2011
@@ -6,6 +6,8 @@ Build
 
  * LUCENE-2845: Moved contrib/benchmark to modules.
 
+ * LUCENE-2995: Moved contrib/spellchecker into modules/suggest.
+
 New Features
 
  * LUCENE-2604: Added RegexpQuery support to contrib/queryparser.
@@ -48,7 +50,14 @@ Bug Fixes
  * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
    not lowercasing the key before checking for the tag (Adriano Crestani)
 
-======================= Lucene 3.x (not yet released) =======================
+======================= Lucene 3.x (not yet released) ================
+
+API Changes
+
+ * LUCENE-3141: add getter method to access fragInfos in FieldFragList.
+   (Sujit Pal via Koji Sekiguchi)
+
+======================= Lucene 3.2.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -433,7 +442,7 @@ Other
  * LUCENE-2415: Use reflection instead of a shim class to access Jakarta
    Regex prefix.  (Uwe Schindler)
 
-================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
+================== Release 2.9.4 / 3.0.3 ====================
 
 Bug Fixes
 
@@ -468,11 +477,11 @@ Documentation
    as expected on all JRE's. For example, on an IBM JRE, it does nothing.
    (Robert Muir)
 
-================== Release 2.9.3 / 3.0.2 2010-06-18 ====================
+================== Release 2.9.3 / 3.0.2 ====================
 
 No changes.
 
-================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
+================== Release 2.9.2 / 3.0.1 ====================
 
 New features
 
@@ -511,7 +520,7 @@ API Changes
  * LUCENE-2165: Add a constructor to SnowballAnalyzer that takes a Set of 
    stopwords, and deprecate the String[] one.  (Nick Burch via Robert Muir)
    
-======================= Release 3.0.0 2009-11-25 =======================
+======================= Release 3.0.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -588,7 +597,7 @@ Build
  * LUCENE-2031: Moved PatternAnalyzer from contrib/memory into
    contrib/analyzers/common, under miscellaneous.  (Robert Muir)
    
-======================= Release 2.9.1 2009-11-06 =======================
+======================= Release 2.9.1 =======================
 
 Changes in backwards compatibility policy
 
@@ -631,7 +640,7 @@ Bug fixes
  * LUCENE-2013: SpanRegexQuery does not work with QueryScorer.
    (Benjamin Keil via Mark Miller)
 
-======================= Release 2.9.0 2009-09-23 =======================
+======================= Release 2.9.0 =======================
 
 Changes in runtime behavior
 
@@ -820,7 +829,7 @@ Build
 Test Cases
 
 
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
 
 Changes in runtime behavior
 

Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Tue May 31 11:25:37 2011
@@ -93,7 +93,7 @@ public abstract class BaseFragmentsBuild
     if( maxNumFragments < 0 )
       throw new IllegalArgumentException( "maxNumFragments(" + maxNumFragments + ") must be positive number." );
 
-    List<WeightedFragInfo> fragInfos = getWeightedFragInfoList( fieldFragList.fragInfos );
+    List<WeightedFragInfo> fragInfos = getWeightedFragInfoList( fieldFragList.getFragInfos() );
     
     List<String> fragments = new ArrayList<String>( maxNumFragments );
     Field[] values = getFields( reader, docId, fieldName );

Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java Tue May 31 11:25:37 2011
@@ -29,7 +29,7 @@ import org.apache.lucene.search.vectorhi
  */
 public class FieldFragList {
 
-  List<WeightedFragInfo> fragInfos = new ArrayList<WeightedFragInfo>();
+  private List<WeightedFragInfo> fragInfos = new ArrayList<WeightedFragInfo>();
 
   /**
    * a constructor.
@@ -50,6 +50,15 @@ public class FieldFragList {
     fragInfos.add( new WeightedFragInfo( startOffset, endOffset, phraseInfoList ) );
   }
   
+  /**
+   * return the list of WeightedFragInfos.
+   * 
+   * @return fragInfos.
+   */ 
+  public List<WeightedFragInfo> getFragInfos() {
+    return fragInfos;
+  }
+
   public static class WeightedFragInfo {
 
     List<SubInfo> subInfos;

Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Tue May 31 11:25:37 2011
@@ -26,6 +26,7 @@ import org.apache.lucene.index.TermFreqV
 import org.apache.lucene.index.TermPositionVector;
 import org.apache.lucene.index.TermVectorOffsetInfo;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.CharsRef;
 
 /**
  * <code>FieldTermStack</code> is a stack that keeps query terms in the specified field
@@ -80,16 +81,16 @@ public class FieldTermStack {
     Set<String> termSet = fieldQuery.getTermSet( fieldName );
     // just return to make null snippet if un-matched fieldName specified when fieldMatch == true
     if( termSet == null ) return;
-    
+    final CharsRef spare = new CharsRef();
     for( BytesRef term : tpv.getTerms() ){
-      if( !termSet.contains( term.utf8ToString() ) ) continue;
+      if( !termSet.contains( term.utf8ToChars(spare).toString() ) ) continue;
       int index = tpv.indexOf( term );
       TermVectorOffsetInfo[] tvois = tpv.getOffsets( index );
       if( tvois == null ) return; // just return to make null snippets
       int[] poss = tpv.getTermPositions( index );
       if( poss == null ) return; // just return to make null snippets
       for( int i = 0; i < tvois.length; i++ )
-        termList.add( new TermInfo( term.utf8ToString(), tvois[i].getStartOffset(), tvois[i].getEndOffset(), poss[i] ) );
+        termList.add( new TermInfo( term.utf8ToChars(spare).toString(), tvois[i].getStartOffset(), tvois[i].getEndOffset(), poss[i] ) );
     }
     
     // sort by position

Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java Tue May 31 11:25:37 2011
@@ -24,7 +24,7 @@ public class SimpleFragListBuilderTest e
   public void testNullFieldFragList() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "b c d" ), 100 );
-    assertEquals( 0, ffl.fragInfos.size() );
+    assertEquals( 0, ffl.getFragInfos().size() );
   }
   
   public void testTooSmallFragSize() throws Exception {
@@ -40,90 +40,90 @@ public class SimpleFragListBuilderTest e
   public void testSmallerFragSizeThanTermQuery() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "abcdefghijklmnopqrs", "abcdefghijklmnopqrs" ), SimpleFragListBuilder.MIN_FRAG_CHAR_SIZE );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(abcdefghijklmnopqrs((0,19)))/1.0(0,19)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(abcdefghijklmnopqrs((0,19)))/1.0(0,19)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void testSmallerFragSizeThanPhraseQuery() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "\"abcdefgh jklmnopqrs\"", "abcdefgh   jklmnopqrs" ), SimpleFragListBuilder.MIN_FRAG_CHAR_SIZE );
-    assertEquals( 1, ffl.fragInfos.size() );
-    if (VERBOSE) System.out.println( ffl.fragInfos.get( 0 ).toString() );
-    assertEquals( "subInfos=(abcdefghjklmnopqrs((0,21)))/1.0(0,21)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    if (VERBOSE) System.out.println( ffl.getFragInfos().get( 0 ).toString() );
+    assertEquals( "subInfos=(abcdefghjklmnopqrs((0,21)))/1.0(0,21)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void test1TermIndex() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a" ), 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1)))/1.0(0,100)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1)))/1.0(0,100)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void test2TermsIndex1Frag() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a a" ), 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1))a((2,3)))/2.0(0,100)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1))a((2,3)))/2.0(0,100)", ffl.getFragInfos().get( 0 ).toString() );
   
     ffl = sflb.createFieldFragList( fpl( "a", "a b b b b b b b b a" ), 20 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1))a((18,19)))/2.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1))a((18,19)))/2.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
 
     ffl = sflb.createFieldFragList( fpl( "a", "b b b b a b b b b a" ), 20 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((8,9))a((18,19)))/2.0(2,22)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((8,9))a((18,19)))/2.0(2,22)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void test2TermsIndex2Frags() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a b b b b b b b b b b b b b a" ), 20 );
-    assertEquals( 2, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1)))/1.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
-    assertEquals( "subInfos=(a((28,29)))/1.0(22,42)", ffl.fragInfos.get( 1 ).toString() );
+    assertEquals( 2, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1)))/1.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
+    assertEquals( "subInfos=(a((28,29)))/1.0(22,42)", ffl.getFragInfos().get( 1 ).toString() );
 
     ffl = sflb.createFieldFragList( fpl( "a", "a b b b b b b b b b b b b a" ), 20 );
-    assertEquals( 2, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1)))/1.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
-    assertEquals( "subInfos=(a((26,27)))/1.0(20,40)", ffl.fragInfos.get( 1 ).toString() );
+    assertEquals( 2, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1)))/1.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
+    assertEquals( "subInfos=(a((26,27)))/1.0(20,40)", ffl.getFragInfos().get( 1 ).toString() );
 
     ffl = sflb.createFieldFragList( fpl( "a", "a b b b b b b b b b a" ), 20 );
-    assertEquals( 2, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1)))/1.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
-    assertEquals( "subInfos=(a((20,21)))/1.0(20,40)", ffl.fragInfos.get( 1 ).toString() );
+    assertEquals( 2, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1)))/1.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
+    assertEquals( "subInfos=(a((20,21)))/1.0(20,40)", ffl.getFragInfos().get( 1 ).toString() );
   }
   
   public void test2TermsQuery() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a b", "c d e" ), 20 );
-    assertEquals( 0, ffl.fragInfos.size() );
+    assertEquals( 0, ffl.getFragInfos().size() );
 
     ffl = sflb.createFieldFragList( fpl( "a b", "d b c" ), 20 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(b((2,3)))/1.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(b((2,3)))/1.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
 
     ffl = sflb.createFieldFragList( fpl( "a b", "a b c" ), 20 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1))b((2,3)))/2.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1))b((2,3)))/2.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void testPhraseQuery() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "\"a b\"", "c d e" ), 20 );
-    assertEquals( 0, ffl.fragInfos.size() );
+    assertEquals( 0, ffl.getFragInfos().size() );
 
     ffl = sflb.createFieldFragList( fpl( "\"a b\"", "a c b" ), 20 );
-    assertEquals( 0, ffl.fragInfos.size() );
+    assertEquals( 0, ffl.getFragInfos().size() );
 
     ffl = sflb.createFieldFragList( fpl( "\"a b\"", "a b c" ), 20 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(ab((0,3)))/1.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(ab((0,3)))/1.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void testPhraseQuerySlop() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "\"a b\"~1", "a c b" ), 20 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(ab((0,1)(4,5)))/1.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(ab((0,1)(4,5)))/1.0(0,20)", ffl.getFragInfos().get( 0 ).toString() );
   }
 
   private FieldPhraseList fpl( String queryValue, String indexValue ) throws Exception {
@@ -142,8 +142,8 @@ public class SimpleFragListBuilderTest e
     FieldPhraseList fpl = new FieldPhraseList( stack, fq );
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl, 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(d((9,10)))/1.0(3,103)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(d((9,10)))/1.0(3,103)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void test1PhraseLongMV() throws Exception {
@@ -154,8 +154,8 @@ public class SimpleFragListBuilderTest e
     FieldPhraseList fpl = new FieldPhraseList( stack, fq );
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl, 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(searchengines((102,116))searchengines((157,171)))/2.0(96,196)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(searchengines((102,116))searchengines((157,171)))/2.0(96,196)", ffl.getFragInfos().get( 0 ).toString() );
   }
 
   public void test1PhraseLongMVB() throws Exception {
@@ -166,7 +166,7 @@ public class SimpleFragListBuilderTest e
     FieldPhraseList fpl = new FieldPhraseList( stack, fq );
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl, 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(sppeeeed((88,93)))/1.0(82,182)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(sppeeeed((88,93)))/1.0(82,182)", ffl.getFragInfos().get( 0 ).toString() );
   }
 }

Modified: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java Tue May 31 11:25:37 2011
@@ -24,21 +24,21 @@ public class SingleFragListBuilderTest e
   public void testNullFieldFragList() throws Exception {
     SingleFragListBuilder sflb = new SingleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "b c d" ), 100 );
-    assertEquals( 0, ffl.fragInfos.size() );
+    assertEquals( 0, ffl.getFragInfos().size() );
   }
   
   public void testShortFieldFragList() throws Exception {
     SingleFragListBuilder sflb = new SingleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a b c d" ), 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1)))/1.0(0,2147483647)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1)))/1.0(0,2147483647)", ffl.getFragInfos().get( 0 ).toString() );
   }
   
   public void testLongFieldFragList() throws Exception {
     SingleFragListBuilder sflb = new SingleFragListBuilder();
     FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a b c d", "a b c d e f g h i", "j k l m n o p q r s t u v w x y z a b c", "d e f g" ), 100 );
-    assertEquals( 1, ffl.fragInfos.size() );
-    assertEquals( "subInfos=(a((0,1))a((8,9))a((60,61)))/3.0(0,2147483647)", ffl.fragInfos.get( 0 ).toString() );
+    assertEquals( 1, ffl.getFragInfos().size() );
+    assertEquals( "subInfos=(a((0,1))a((8,9))a((60,61)))/3.0(0,2147483647)", ffl.getFragInfos().get( 0 ).toString() );
   }
 
   private FieldPhraseList fpl( String queryValue, String... indexValues ) throws Exception {

Modified: lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java Tue May 31 11:25:37 2011
@@ -41,6 +41,7 @@ import org.apache.lucene.index.DocsAndPo
 import org.apache.lucene.util.BitVector;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.CharsRef;
 
 /**
  * Represented as a coupled graph of class instances, this
@@ -228,12 +229,13 @@ public class InstantiatedIndex
     if (fieldsC != null) {
       FieldsEnum fieldsEnum = fieldsC.iterator();
       String field;
+      final CharsRef spare = new CharsRef();
       while((field = fieldsEnum.next()) != null) {
         if (fields == null || fields.contains(field)) {
           TermsEnum termsEnum = fieldsEnum.terms();
           BytesRef text;
           while((text = termsEnum.next()) != null) {
-            String termText = text.utf8ToString();
+            String termText = text.utf8ToChars(spare).toString();
             InstantiatedTerm instantiatedTerm = new InstantiatedTerm(field, termText);
             final long totalTermFreq = termsEnum.totalTermFreq();
             if (totalTermFreq != -1) {

Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/build.xml?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/build.xml Tue May 31 11:25:37 2011
@@ -42,4 +42,26 @@
       <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
     </subant>
   </target>
+
+  <target name="build-native-unix" >
+    <mkdir dir="${common.build.dir}/native"/>
+
+    <taskdef resource="cpptasks.tasks">
+      <classpath>
+        <pathelement location="ant_lib/cpptasks-1.0b5.jar"/>
+      </classpath>
+    </taskdef>
+
+    <cc outtype="shared" subsystem="console" outfile="${common.build.dir}/native/NativePosixUtil" >
+      <fileset file="${src.dir}/org/apache/lucene/store/NativePosixUtil.cpp" />  
+      <includepath>
+        <pathelement location="${java.home}/../include"/>
+        <pathelement location="${java.home}/../include/linux"/>
+        <pathelement location="${java.home}/../include/solaris"/>
+      </includepath>
+
+      <compilerarg value="-fPIC" />
+    </cc>
+  </target>
+
 </project>

Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java Tue May 31 11:25:37 2011
@@ -26,6 +26,7 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.lucene.index.IndexWriter;  // Required for javadocs
 import org.apache.lucene.index.codecs.CodecProvider;
 import org.apache.lucene.store.FSDirectory;
 
@@ -45,6 +46,11 @@ import org.apache.lucene.store.FSDirecto
  * @lucene.experimental You can easily
  * accidentally remove segments from your index so be
  * careful!
+ *
+ * <p><b>NOTE</b>: this tool is unaware of documents added
+ * atomically via {@link IndexWriter#addDocuments} or {@link
+ * IndexWriter#updateDocuments}, which means it can easily
+ * break up such document groups.
  */
 public class IndexSplitter {
   public SegmentInfos infos;

Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Tue May 31 11:25:37 2011
@@ -40,6 +40,11 @@ import org.apache.lucene.util.Version;
  * <p>Note 2: the disadvantage of this tool is that source index needs to be
  * read as many times as there are parts to be created, hence the name of this
  * tool.
+ *
+ * <p><b>NOTE</b>: this tool is unaware of documents added
+ * atomically via {@link IndexWriter#addDocuments} or {@link
+ * IndexWriter#updateDocuments}, which means it can easily
+ * break up such document groups.
  */
 public class MultiPassIndexSplitter {
   

Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java Tue May 31 11:25:37 2011
@@ -269,7 +269,7 @@ public class NRTCachingDirectory extends
         in = cache.openInput(fileName);
         in.copyBytes(out, in.length());
       } finally {
-        IOUtils.closeSafely(in, out);
+        IOUtils.closeSafely(false, in, out);
       }
       synchronized(this) {
         cache.deleteFile(fileName);

Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/overview.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/overview.html (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/overview.html Tue May 31 11:25:37 2011
@@ -51,9 +51,11 @@ for details.
 
 Steps to build:
 <ul>
-  <li> <tt>cd lucene/contrib/misc/src/java/org/apache/lucene/store</tt>
+  <li> <tt>cd lucene/contrib/misc/</tt>
 
-  <li> Compile NativePosixUtil.cpp -> libNativePosixUtil.so.  On linux, something like <tt>gcc -fPIC -o libNativePosixUtil.so -shared -Wl,-soname,libNativePosixUtil.so  -I$JAVA_HOME/include -I$JAVA_HOME/include/linux NativePosixUtil.cpp -lc -lstdc++</tt>.  Add <tt>-m64</tt> if you want to compile 64bit (and java must be run with -d64 so it knows to load a 64bit dynamic lib).
+  <li> To compile NativePosixUtil.cpp -> libNativePosixUtil.so on Linux run<tt> ant build-native-unix</tt>.
+  
+  <li><tt>libNativePosixUtil.so</tt> will be located in the <tt>lucene/build/native/</tt> folder
 
   <li> Make sure libNativePosixUtil.so is on your LD_LIBRARY_PATH so java can find it (something like <tt>export LD_LIBRARY_PATH=/path/to/dir:$LD_LIBRARY_PATH</tt>, where /path/to/dir contains libNativePosixUtil.so)
 

Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java Tue May 31 11:25:37 2011
@@ -18,6 +18,7 @@ package org.apache.lucene.search.regex;
  */
 
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.UnicodeUtil;
 import org.apache.regexp.CharacterIterator;
 import org.apache.regexp.RE;
@@ -104,11 +105,11 @@ public class JakartaRegexpCapabilities i
 
   class JakartaRegexMatcher implements RegexCapabilities.RegexMatcher {
     private RE regexp;
-    private final UnicodeUtil.UTF16Result utf16 = new UnicodeUtil.UTF16Result();
+    private final CharsRef utf16 = new CharsRef(10);
     private final CharacterIterator utf16wrapper = new CharacterIterator() {
 
       public char charAt(int pos) {
-        return utf16.result[pos];
+        return utf16.chars[pos];
       }
 
       public boolean isEnd(int pos) {
@@ -120,7 +121,7 @@ public class JakartaRegexpCapabilities i
       }
 
       public String substring(int beginIndex, int endIndex) {
-        return new String(utf16.result, beginIndex, endIndex - beginIndex);
+        return new String(utf16.chars, beginIndex, endIndex - beginIndex);
       }
       
     };

Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java Tue May 31 11:25:37 2011
@@ -21,6 +21,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.UnicodeUtil;
 
 /**
@@ -95,25 +96,11 @@ public class JavaUtilRegexCapabilities i
   class JavaUtilRegexMatcher implements RegexCapabilities.RegexMatcher {
     private final Pattern pattern;
     private final Matcher matcher;
-    private final UnicodeUtil.UTF16Result utf16 = new UnicodeUtil.UTF16Result();
-    private final CharSequence utf16wrapper = new CharSequence() {
-
-      public int length() {
-        return utf16.length;
-      }
-
-      public char charAt(int index) {
-        return utf16.result[index];
-      }
-
-      public CharSequence subSequence(int start, int end) {
-        return new String(utf16.result, start, end - start);
-      }  
-    };
+    private final CharsRef utf16 = new CharsRef(10);
     
     public JavaUtilRegexMatcher(String regex, int flags) {
       this.pattern = Pattern.compile(regex, flags);
-      this.matcher = this.pattern.matcher(utf16wrapper);
+      this.matcher = this.pattern.matcher(utf16);
     }
     
     public boolean match(BytesRef term) {

Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java Tue May 31 11:25:37 2011
@@ -48,6 +48,7 @@ import org.apache.lucene.search.TermQuer
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.PriorityQueue;
 
 
@@ -850,8 +851,9 @@ public final class MoreLikeThis {
 	{
 		BytesRef[] terms = vector.getTerms();
 		int freqs[]=vector.getTermFrequencies();
+		final CharsRef spare = new CharsRef();
 		for (int j = 0; j < terms.length; j++) {
-		    String term = terms[j].utf8ToString();
+		  final String term = terms[j].utf8ToChars(spare).toString();
 		
 			if(isNoiseWord(term)){
 				continue;

Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/dtddocbuild.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/dtddocbuild.xml?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/dtddocbuild.xml (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/dtddocbuild.xml Tue May 31 11:25:37 2011
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
 
+<!--
+    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.
+ -->
+
 <project name="DTDDocAnt" default="main">
 
   <import file="../contrib-build.xml"/>

Modified: lucene/dev/branches/docvalues/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/contributions.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/contributions.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/contributions.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/contributions.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/contributions.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/contributions.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/contributions.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/demo.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/demo.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/demo.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo2.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo2.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/demo2.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo2.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/demo2.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/demo2.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/fileformats.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/fileformats.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/fileformats.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -356,7 +341,7 @@ document.write("Last Published: " + docu
 <div class="section">
 <p>
                 This document defines the index file formats used
-                in Lucene version 4.0. If you are using a different
+                in this version of Lucene. If you are using a different
                 version of Lucene, please consult the copy of
                 <span class="codefrag">docs/fileformats.html</span>
                 that was distributed

Modified: lucene/dev/branches/docvalues/lucene/docs/fileformats.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/fileformats.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/fileformats.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/fileformats.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/index.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/index.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/index.html Tue May 31 11:25:37 2011
@@ -133,15 +133,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -241,7 +226,7 @@ document.write("Last Published: " + docu
 <h1>Lucene Java Documentation</h1>
     
 <p>
-    This is the official documentation for Lucene Java 4.0<BR>
+    This is the official documentation for Lucene Java<BR>
 	Please use the menu on the left to access the Javadocs and different documents.
     </p>
 	

Modified: lucene/dev/branches/docvalues/lucene/docs/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/index.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/index.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/index.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/linkmap.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/linkmap.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/linkmap.html Tue May 31 11:25:37 2011
@@ -133,15 +133,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -313,24 +298,6 @@ document.write("Last Published: " + docu
 		    
 <ul>
 <li>
-<a href="api/contrib-ant/index.html">Ant</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-ant</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
-<a href="api/contrib-bdb/index.html">Bdb</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-bdb</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-bdb-je</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
 <a href="api/contrib-benchmark/index.html">Benchmark</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-benchmark</em>
 </li>
 </ul>
@@ -355,12 +322,6 @@ document.write("Last Published: " + docu
 		    
 <ul>
 <li>
-<a href="api/contrib-lucli/index.html">Lucli</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-lucli</em>
-</li>
-</ul>
-		    
-<ul>
-<li>
 <a href="api/contrib-memory/index.html">Memory</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-memory</em>
 </li>
 </ul>
@@ -400,13 +361,7 @@ document.write("Last Published: " + docu
 <li>
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-spellchecker</em>
 </li>
-</ul>			
-		    
-<ul>
-<li>
-<a href="api/contrib-swing/index.html">Swing</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-swing</em>
-</li>
-</ul>				    
+</ul>						    
 			
 <ul>
 <li>

Modified: lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', '../skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="../api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="../api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="../api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -249,27 +234,18 @@ document.write("Last Published: " + docu
 <a href="#Contrib">Lucene Contrib</a>
 <ul class="minitoc">
 <li>
-<a href="#ant">ant</a>
-</li>
-<li>
 <a href="#benchmark">benchmark</a>
 </li>
 <li>
 <a href="#demo">demo</a>
 </li>
 <li>
-<a href="#db">db</a>
-</li>
-<li>
 <a href="#highlighter">highlighter</a>
 </li>
 <li>
 <a href="#instantiated">instantiated</a>
 </li>
 <li>
-<a href="#lucli">lucli</a>
-</li>
-<li>
 <a href="#memory">memory</a>
 </li>
 <li>
@@ -291,9 +267,6 @@ document.write("Last Published: " + docu
 <a href="#spellchecker">spellchecker</a>
 </li>
 <li>
-<a href="#swing">swing</a>
-</li>
-<li>
 <a href="#wordnet">wordnet</a>
 </li>
 <li>
@@ -350,88 +323,68 @@ document.write("Last Published: " + docu
                 You can access the current trunk Contrib repository at
                 <a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/">http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/</a>.
             </p>
-<a name="N10035"></a><a name="ant"></a>
-<h3 class="boxed">ant</h3>
-<p>Ant task to create Lucene indexes.</p>
-<p>See <a href="../api/contrib-ant/index.html">ant javadoc</a>
-</p>
-<a name="N10044"></a><a name="benchmark"></a>
+<a name="N10035"></a><a name="benchmark"></a>
 <h3 class="boxed">benchmark</h3>
 <p>The benchmark contribution contains tools for benchmarking Lucene using standard, freely available corpora.</p>
 <p>See <a href="../api/contrib-benchmark/index.html">benchmark javadoc</a>
 </p>
-<a name="N10053"></a><a name="demo"></a>
+<a name="N10044"></a><a name="demo"></a>
 <h3 class="boxed">demo</h3>
 <p>The demo contrib contains the Lucene demo: IndexFiles and SearchFiles, described under
                    <a href="../gettingstarted.html">Getting Started</a>.</p>
 <p>See <a href="../api/contrib-demo/index.html">demo javadoc</a>
 </p>
-<a name="N10066"></a><a name="db"></a>
-<h3 class="boxed">db</h3>
-<p>Provides integration with Berkley DB.</p>
-<p>See <a href="../api/contrib-db/index.html">db javadoc</a>
-</p>
-<a name="N10075"></a><a name="highlighter"></a>
+<a name="N10057"></a><a name="highlighter"></a>
 <h3 class="boxed">highlighter</h3>
 <p>A set of classes for highlighting matching terms in search results.</p>
 <p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a>
 </p>
-<a name="N10084"></a><a name="instantiated"></a>
+<a name="N10066"></a><a name="instantiated"></a>
 <h3 class="boxed">instantiated</h3>
 <p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
 <p>See <a href="../api/contrib-instantiated/index.html">instantiated javadoc</a>
 </p>
-<a name="N10093"></a><a name="lucli"></a>
-<h3 class="boxed">lucli</h3>
-<p>An application that allows Lucene index manipulation from the command-line.</p>
-<p>See <a href="../api/contrib-lucli/index.html">lucli javadoc</a>
-</p>
-<a name="N100A2"></a><a name="memory"></a>
+<a name="N10075"></a><a name="memory"></a>
 <h3 class="boxed">memory</h3>
 <p>High-performance single-document main memory index.</p>
 <p>See <a href="../api/contrib-memory/index.html">memory javadoc</a>
 </p>
-<a name="N100B1"></a><a name="misc"></a>
+<a name="N10084"></a><a name="misc"></a>
 <h3 class="boxed">misc</h3>
 <p>A variety of miscellaneous files, including QueryParsers, and other alternate Lucene class implementations and tools.</p>
 <p>See <a href="../api/contrib-misc/index.html">misc javadoc</a>
 </p>
-<a name="N100C0"></a><a name="queryparser"></a>
+<a name="N10093"></a><a name="queryparser"></a>
 <h3 class="boxed">queryparser</h3>
 <p>A new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.</p>
 <p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a>
 </p>
-<a name="N100CF"></a><a name="queries"></a>
+<a name="N100A2"></a><a name="queries"></a>
 <h3 class="boxed">queries</h3>
 <p>Additional queries for Lucene.</p>
 <p>See <a href="../api/contrib-queries/index.html">queries javadoc</a>
 </p>
-<a name="N100DE"></a><a name="remote"></a>
+<a name="N100B1"></a><a name="remote"></a>
 <h3 class="boxed">remote</h3>
 <p>Classes to help use Lucene with RMI.</p>
 <p>See <a href="../api/contrib-remote/index.html">remote javadoc</a>
 </p>
-<a name="N100ED"></a><a name="spatial"></a>
+<a name="N100C0"></a><a name="spatial"></a>
 <h3 class="boxed">spatial</h3>
 <p>Classes to help with efficient distance based sorting.</p>
 <p>See <a href="../api/contrib-spatial/index.html">spatial javadoc</a>
 </p>
-<a name="N100FC"></a><a name="spellchecker"></a>
+<a name="N100CF"></a><a name="spellchecker"></a>
 <h3 class="boxed">spellchecker</h3>
 <p>Provides tools for spellchecking and suggestions with Lucene.</p>
 <p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
 </p>
-<a name="N1010B"></a><a name="swing"></a>
-<h3 class="boxed">swing</h3>
-<p>Swing components designed to integrate with Lucene.</p>
-<p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
-</p>
-<a name="N1011A"></a><a name="wordnet"></a>
+<a name="N100DE"></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="N10129"></a><a name="xml-query-parser"></a>
+<a name="N100ED"></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/branches/docvalues/lucene/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/scoring.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/scoring.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/scoring.html Tue May 31 11:25:37 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">

Modified: lucene/dev/branches/docvalues/lucene/docs/scoring.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/scoring.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Files lucene/dev/branches/docvalues/lucene/docs/scoring.pdf (original) and lucene/dev/branches/docvalues/lucene/docs/scoring.pdf Tue May 31 11:25:37 2011 differ

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/basic.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/basic.css?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/skin/basic.css (original)
+++ lucene/dev/branches/docvalues/lucene/docs/skin/basic.css Tue May 31 11:25:37 2011
@@ -163,4 +163,4 @@ p {
 .codefrag {
   font-family: "Courier New", Courier, monospace;
   font-size: 110%;
-}
+}
\ No newline at end of file

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/print.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/print.css?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/skin/print.css (original)
+++ lucene/dev/branches/docvalues/lucene/docs/skin/print.css Tue May 31 11:25:37 2011
@@ -51,4 +51,4 @@ a:link, a:visited {
 
 acronym {
   border: 0;
-}
+}
\ No newline at end of file

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/profile.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/profile.css?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/skin/profile.css (original)
+++ lucene/dev/branches/docvalues/lucene/docs/skin/profile.css Tue May 31 11:25:37 2011
@@ -172,4 +172,4 @@ a:hover { color:#6587ff} 
     }
       
     
-  
+  
\ No newline at end of file

Modified: lucene/dev/branches/docvalues/lucene/docs/skin/screen.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/skin/screen.css?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/skin/screen.css (original)
+++ lucene/dev/branches/docvalues/lucene/docs/skin/screen.css Tue May 31 11:25:37 2011
@@ -584,4 +584,4 @@ p.instruction {
   list-style-image: url('../images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
-} 
+} 
\ No newline at end of file

Modified: lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html Tue May 31 11:25:37 2011
@@ -133,15 +133,6 @@ document.write("Last Published: " + docu
 <div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
 <div id="menu_1.1.3.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-benchmark/index.html">Benchmark</a>
 </div>
 <div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-instantiated/index.html">Instantiated</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-memory/index.html">Memory</a>
 </div>
 <div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + docu
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -252,7 +237,7 @@ document.write("Last Published: " + docu
 <h2 class="boxed">System Requirements</h2>
 <div class="section">
 <p>
-    Lucene Java 4.0 has the following minimum requirements:
+    Lucene Java has the following minimum requirements:
     <ul>
         
 <li>Java 1.5.x or greater.</li>

Modified: lucene/dev/branches/docvalues/lucene/docs/systemrequirements.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/systemrequirements.pdf?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/CompressionTools.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/CompressionTools.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/CompressionTools.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/CompressionTools.java Tue May 31 11:25:37 2011
@@ -23,6 +23,7 @@ import java.util.zip.DataFormatException
 import java.io.ByteArrayOutputStream;
 
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.UnicodeUtil;
 
 /** Simple utility class providing static methods to
@@ -118,9 +119,9 @@ public class CompressionTools {
   /** Decompress the byte array previously returned by
    *  compressString back into a String */
   public static String decompressString(byte[] value) throws DataFormatException {
-    UnicodeUtil.UTF16Result result = new UnicodeUtil.UTF16Result();
     final byte[] bytes = decompress(value);
+    CharsRef result = new CharsRef(bytes.length);
     UnicodeUtil.UTF8toUTF16(bytes, 0, bytes.length, result);
-    return new String(result.result, 0, result.length);
+    return new String(result.chars, 0, result.length);
   }
 }

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java Tue May 31 11:25:37 2011
@@ -51,19 +51,18 @@ import org.apache.lucene.util.IOUtils;
  */
 public final class CompoundFileWriter {
 
-    static final class FileEntry {
-	
-	FileEntry(String file) {
-	    this.file = file;
-	}
+    private static final class FileEntry {
         /** source file */
-        final String file;
+        String file;
 
         /** temporary holder for the start of directory entry for this file */
         long directoryOffset;
 
         /** temporary holder for the start of this file's data section */
         long dataOffset;
+        
+        /** the directory which contains the file. */
+        Directory dir;
     }
 
     // Before versioning started.
@@ -123,6 +122,14 @@ public final class CompoundFileWriter {
      *   has been added already
      */
     public void addFile(String file) {
+      addFile(file, directory);
+    }
+
+    /**
+     * Same as {@link #addFile(String)}, only for files that are found in an
+     * external {@link Directory}.
+     */
+    public void addFile(String file, Directory dir) {
         if (merged)
             throw new IllegalStateException(
                 "Can't add extensions after merge has been called");
@@ -134,7 +141,11 @@ public final class CompoundFileWriter {
         if (! ids.add(file))
             throw new IllegalArgumentException(
                 "File " + file + " already added");
-        entries.add(new FileEntry(file));
+
+        FileEntry entry = new FileEntry();
+        entry.file = file;
+        entry.dir = dir;
+        entries.add(entry);
     }
 
     /** Merge files with the extensions added up to now.
@@ -171,7 +182,7 @@ public final class CompoundFileWriter {
                 fe.directoryOffset = os.getFilePointer();
                 os.writeLong(0);    // for now
                 os.writeString(IndexFileNames.stripSegmentName(fe.file));
-                totalSize += directory.fileLength(fe.file);
+                totalSize += fe.dir.fileLength(fe.file);
             }
 
             // Pre-allocate size of file as optimization --
@@ -217,7 +228,7 @@ public final class CompoundFileWriter {
    * output stream.
    */
   private void copyFile(FileEntry source, IndexOutput os) throws IOException {
-    IndexInput is = directory.openInput(source.file);
+    IndexInput is = source.dir.openInput(source.file);
     try {
       long startPtr = os.getFilePointer();
       long length = is.length();

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java Tue May 31 11:25:37 2011
@@ -91,11 +91,18 @@ final class DocFieldProcessor extends Do
 
   @Override
   public void abort() {
-    for(int i=0;i<fieldHash.length;i++) {
-      DocFieldProcessorPerField field = fieldHash[i];
-      while(field != null) {
+    Throwable th = null;
+    
+    for (DocFieldProcessorPerField field : fieldHash) {
+      while (field != null) {
         final DocFieldProcessorPerField next = field.next;
-        field.abort();
+        try {
+          field.abort();
+        } catch (Throwable t) {
+          if (th == null) {
+            th = t;
+          }
+        }
         field = next;
       }
     }
@@ -107,11 +114,29 @@ final class DocFieldProcessor extends Do
         // ignore on abort!
       }
     }
-
+    
     try {
       fieldsWriter.abort();
-    } finally {
+    } catch (Throwable t) {
+      if (th == null) {
+        th = t;
+      }
+    }
+    
+    try {
       consumer.abort();
+    } catch (Throwable t) {
+      if (th == null) {
+        th = t;
+      }
+    }
+    
+    // If any errors occured, throw it.
+    if (th != null) {
+      if (th instanceof RuntimeException) throw (RuntimeException) th;
+      if (th instanceof Error) throw (Error) th;
+      // defensive code - we should not hit unchecked exceptions
+      throw new RuntimeException(th);
     }
   }
 

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverter.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverter.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverter.java Tue May 31 11:25:37 2011
@@ -87,6 +87,7 @@ final class DocInverter extends DocField
     endConsumer.startDocument();
   }
 
+  @Override
   public void finishDocument() throws IOException {
     // TODO: allow endConsumer.finishDocument to also return
     // a DocWriter

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverterPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverterPerField.java?rev=1129631&r1=1129630&r2=1129631&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverterPerField.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocInverterPerField.java Tue May 31 11:25:37 2011
@@ -53,8 +53,11 @@ final class DocInverterPerField extends 
 
   @Override
   void abort() {
-    consumer.abort();
-    endConsumer.abort();
+    try {
+      consumer.abort();
+    } finally {
+      endConsumer.abort();
+    }
   }
 
   @Override



Mime
View raw message