SOLR-2452: merged with trunk up to r1130266. Removed duplicate solr-contrib-uptodate definition in solr/contrib/contrib-build.xml. Fixed directory glob in solr-contrib-uptodate target: .../src/main/java/ -> .../src/java/

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1130331 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -18,7 +18,6 @@
  -->
 
 <project name="lucene-solr" default="test" basedir=".">
-  <import file="common-build.xml"/>
   <target name="test" description="Test both Lucene and Solr" depends="validate">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">

common-build.xml

@@ -1,32 +0,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="all-common" basedir="."
-         xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <dirname file="${ant.file.all-common}" property="all.common.dir"/>
-  <path id="tools.runtime.classpath">
-    <pathelement location="${all.common.dir}/lucene/build/classes/tools"/>
-  </path>
-  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
-    <sequential>
-      <subant target="compile-tools" inheritall="false" failonerror="true">
-        <fileset dir="${all.common.dir}/lucene" includes="build.xml" />
-      </subant>
-    </sequential>
-  </target>
-</project>

dev-tools/maven/pom.xml.template

@@ -561,6 +561,31 @@
           </execution>
         </executions>
       </plugin>
+      
+      <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.4</version>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
   </build>
   <profiles>

lucene/CHANGES.txt

@@ -1,5 +1,8 @@
 Lucene Change Log
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 ======================= Trunk (not yet released) =======================
 
 Changes in backwards compatibility policy
@@ -233,6 +236,9 @@ Changes in Runtime Behavior
   
   (Mike McCandless, Michael Busch, Simon Willnauer)
 
+* LUCENE-3146: IndexReader.setNorm throws IllegalStateException if the field
+  does not store norms. (Shai Erera, Mike McCandless)
+  
 API Changes
 
 * LUCENE-2302, LUCENE-1458, LUCENE-2111, LUCENE-2514: Terms are no longer
@@ -1315,7 +1321,7 @@ Documentation
 * LUCENE-2894: Use google-code-prettify for syntax highlighting in javadoc.
   (Shinichiro Abe, Koji Sekiguchi)
   
-================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
+================== Release 2.9.4 / 3.0.3 ====================
 
 Changes in runtime behavior
 
@@ -1468,7 +1474,7 @@ Documentation
   Java NIO behavior when a Thread is interrupted while blocking on IO.
   (Simon Willnauer, Robert Muir)
 
-================== Release 2.9.3 / 3.0.2 2010-06-18 ====================
+================== Release 2.9.3 / 3.0.2 ====================
 
 Changes in backwards compatibility policy
 
@@ -1613,7 +1619,7 @@ Build
   compiling/testing/packaging. This marks the benchmark contrib also
   as Java 1.5, as it depends on fast-vector-highlighter. (Uwe Schindler)
 
-================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
+================== Release 2.9.2 / 3.0.1 ====================
 
 Changes in backwards compatibility policy
 
@@ -1716,7 +1722,7 @@ Documentation
    provided reader is per-segment (Simon Willnauer via Mike
    McCandless)
  
-======================= Release 3.0.0 2009-11-25 =======================
+======================= Release 3.0.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -1917,7 +1923,7 @@ Build
 * LUCENE-2024: Raise build requirements to Java 1.5 and ANT 1.7.0
   (Uwe Schindler, Mike McCandless)
 
-======================= Release 2.9.1 2009-11-06 =======================
+======================= Release 2.9.1 =======================
 
 Changes in backwards compatibility policy
 
@@ -1987,7 +1993,7 @@ Documentation
  * LUCENE-2008: Javadoc improvements for TokenStream/Tokenizer/Token
    (Luke Nezda via Mike McCandless)
 
-======================= Release 2.9.0 2009-09-23 =======================
+======================= Release 2.9.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -2901,7 +2907,7 @@ Test Cases
  * LUCENE-1836: Added a new LocalizedTestCase as base class for localization
     junit tests.  (Robert Muir, Uwe Schindler via Michael Busch)
 
-======================= Release 2.4.1 2009-03-09 =======================
+======================= Release 2.4.1 =======================
 
 API Changes
 
@@ -2969,7 +2975,7 @@ Bug fixes
     rollback IndexWriter's internal state on hitting an
     exception. (Scott Garland via Mike McCandless)
 
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
 
 Changes in backwards compatibility policy
 
@@ -3334,7 +3340,7 @@ Test Cases
  2. LUCENE-1348: relax TestTimeLimitedCollector to not fail due to 
     timeout exceeded (just because test machine is very busy).
 	
-======================= Release 2.3.2 2008-05-05 =======================
+======================= Release 2.3.2 =======================
 
 Bug fixes
 
@@ -3384,7 +3390,7 @@ Build
  1. LUCENE-1230: Include *pom.xml* in source release files. (Michael Busch)
 
  
-======================= Release 2.3.1 2008-02-22 =======================
+======================= Release 2.3.1 =======================
 
 Bug fixes
     
@@ -3413,7 +3419,7 @@ Bug fixes
     preventing Fields with empty-string field name from working.
     (Sergey Kabashnyuk via Mike McCandless)
 
-======================= Release 2.3.0 2008-01-21 =======================
+======================= Release 2.3.0 =======================
 
 Changes in runtime behavior
 
@@ -3805,7 +3811,7 @@ Test Cases
  1. LUCENE-766: Test adding two fields with the same name but different 
     term vector setting.  (Nicolas Lalevée via Doron Cohen)  
     
-======================= Release 2.2.0 2007-06-19 =======================
+======================= Release 2.2.0 =======================
 
 Changes in runtime behavior
 
@@ -4114,7 +4120,7 @@ Build
     of the Lucene core and the contrib modules. 
     (Sami Siren, Karl Wettin, Michael Busch)
 
-======================= Release 2.1.0 2007-02-14 =======================
+======================= Release 2.1.0 =======================
 
 Changes in runtime behavior
 
@@ -4602,7 +4608,7 @@ Build
      distribution of both binary and source distributions.  Called by package 
      and package-*-src
 
-======================= Release 2.0.0 2006-05-26 =======================
+======================= Release 2.0.0 =======================
 
 API Changes
 
@@ -5706,7 +5712,7 @@ Infrastructure
 11. Fixed bugs in GermanAnalyzer (gschwarz)
 
 
-1.2 RC2, 19 October 2001:
+1.2 RC2:
  - added sources to distribution
  - removed broken build scripts and libraries from distribution
  - SegmentsReader: fixed potential race condition
@@ -5721,7 +5727,7 @@ Infrastructure
  - JDK 1.1 compatibility fix: disabled lock files for JDK 1.1,
    since they rely on a feature added in JDK 1.2.
 
-1.2 RC1 (first Apache release), 2 October 2001:
+1.2 RC1 (first Apache release):
   - packages renamed from com.lucene to org.apache.lucene
   - license switched from LGPL to Apache
   - ant-only build -- no more makefiles
@@ -5732,18 +5738,18 @@ Infrastructure
   - Analyzers can choose tokenizer based on field name
   - misc bug fixes.
 
-1.01b (last Sourceforge release), 2 July 2001
+1.01b (last Sourceforge release)
  . a few bug fixes
  . new Query Parser
  . new prefix query (search for "foo*" matches "food")
 
-1.0, 2000-10-04
+1.0
 
 This release fixes a few serious bugs and also includes some
 performance optimizations, a stemmer, and a few other minor
 enhancements.
 
-0.04 2000-04-19
+0.04
 
 Lucene now includes a grammar-based tokenizer, StandardTokenizer.
 
@@ -5768,7 +5774,7 @@ StandardTokenizer serves two purposes:
     the new tokenizer into the application and modifying it
     accordingly.
 
-0.01, 2000-03-30
+0.01
 
 First open source release.
 

lucene/build.xml

@@ -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"
+              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"
-              excludes="BUILD.txt"
   />
 
 
@@ -293,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"/>
@@ -306,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>
 
   <!-- ================================================================== -->
@@ -318,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.            -->
@@ -345,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}"/>
@@ -377,7 +376,7 @@
   <!-- ================================================================== -->
   <!-- Populates properties svn.URL and svn.Revision using "svn info".    -->
   <!-- ================================================================== -->
-  <target name="get-svn-info">
+  <target name="get-svn-info" depends="check-svn">
     <exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
       <arg value="info"/>
     </exec>
@@ -393,6 +392,16 @@
     </loadproperties>
   </target>
 
+   <target name="check-svn">
+    <sequential>
+      <exec dir="." executable="${svnversion.exe}" outputproperty="svn.ver"/>
+      <fail message="A subversion checkout is required for this target">
+        <condition>
+           <equals arg1="${svn.ver}" arg2="exported"/>
+        </condition>
+      </fail>
+    </sequential>
+  </target>
 
   <!-- ================================================================== -->
   <!-- same as package-tgz-src. it is just here for compatibility.        -->
@@ -494,7 +503,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"/>

lucene/common-build.xml

@@ -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=""/>
@@ -537,6 +541,8 @@
               <sysproperty key="testmethod" value="${testmethod}"/>
               <sysproperty key="jetty.testMode" value="1"/>
 
+        <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
+	    	
 	      <formatter type="xml"/>
 	      <formatter classname="${junit.details.formatter}" usefile="false"/>
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="runall">

lucene/contrib/CHANGES.txt

@@ -1,5 +1,8 @@
 Lucene contrib change Log
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 ======================= Trunk (not yet released) =======================
   
 Build
@@ -442,7 +445,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
 
@@ -477,11 +480,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
 
@@ -520,7 +523,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
 
@@ -597,7 +600,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
 
@@ -640,7 +643,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
 
@@ -829,7 +832,7 @@ Build
 Test Cases
 
 
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
 
 Changes in runtime behavior
 

lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java

@@ -86,7 +86,11 @@ public class TestFieldNormModifier extends LuceneTestCase {
   
   public void testMissingField() throws Exception {
     FieldNormModifier fnm = new FieldNormModifier(store, s);
-    fnm.reSetNorms("nobodyherebutuschickens");
+    try {
+      fnm.reSetNorms("nobodyherebutuschickens");
+    } catch (IllegalStateException e) {
+      // expected
+    }
   }
   
   public void testFieldWithNoNorm() throws Exception {
@@ -101,7 +105,11 @@ public class TestFieldNormModifier extends LuceneTestCase {
     r.close();
     
     FieldNormModifier fnm = new FieldNormModifier(store, s);
-    fnm.reSetNorms("nonorm");
+    try {
+      fnm.reSetNorms("nonorm");
+    } catch (IllegalStateException e) {
+      // expected
+    }
     
     // nothing should have changed
     r = IndexReader.open(store, false);

lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java

@@ -92,12 +92,12 @@ public class TestLengthNormModifier extends LuceneTestCase {
       super.tearDown();
     }
     
-    public void testMissingField() {
+    public void testMissingField() throws Exception {
 	FieldNormModifier fnm = new FieldNormModifier(store, s);
 	try {
 	    fnm.reSetNorms("nobodyherebutuschickens");
-	} catch (Exception e) {
+	} catch (IllegalStateException e) {
-	    assertNull("caught something", e);
+	    // expected
 	}
     }
 	
@@ -115,8 +115,8 @@ public class TestLengthNormModifier extends LuceneTestCase {
 	FieldNormModifier fnm = new FieldNormModifier(store, s);
 	try {
 	    fnm.reSetNorms("nonorm");
-	} catch (Exception e) {
+	} catch (IllegalStateException e) {
-	    assertNull("caught something", e);
+	  // expected
 	}
 
 	// nothing should have changed

lucene/docs/contributions.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">

lucene/docs/demo.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">

lucene/docs/demo2.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">

lucene/docs/fileformats.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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

lucene/docs/gettingstarted.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">

lucene/docs/index.html

@@ -133,15 +133,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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>
 	

lucene/docs/linkmap.html

@@ -133,15 +133,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">
@@ -311,24 +296,6 @@ document.write("Last Published: " + document.lastModified);
 </li>
 <ul>
 		    
-<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>
@@ -353,12 +320,6 @@ document.write("Last Published: " + document.lastModified);
 </li>
 </ul>
 		    
-<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>
@@ -402,12 +363,6 @@ document.write("Last Published: " + document.lastModified);
 </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>
 <li>
 <a href="api/contrib-wordnet/index.html">Wordnet</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-wordnet</em>

lucene/docs/lucene-contrib/index.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
                 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>
+<a name="N10035"></a><a name="benchmark"></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>
 <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>
+<a name="N10057"></a><a name="highlighter"></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>
 <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>
+<a name="N10075"></a><a name="memory"></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>
 <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>
+<a name="N100DE"></a><a name="wordnet"></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>
 <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>

lucene/docs/queryparsersyntax.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">

lucene/docs/scoring.html

@@ -135,15 +135,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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">

lucene/docs/systemrequirements.html

@@ -133,15 +133,6 @@ document.write("Last Published: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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: " + document.lastModified);
 <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>

lucene/src/java/org/apache/lucene/document/Field.java

@@ -96,7 +96,7 @@ public final class Field extends AbstractField implements Fieldable {
     },
 
     /** Expert: Index the field's value without an Analyzer,
-     * and also disable the storing of norms.  Note that you
+     * and also disable the indexing of norms.  Note that you
      * can also separately enable/disable norms by calling
      * {@link Field#setOmitNorms}.  No norms means that
      * index-time field and document boosting and field
@@ -104,11 +104,11 @@ public final class Field extends AbstractField implements Fieldable {
      * less memory usage as norms take up one byte of RAM
      * per indexed field for every document in the index,
      * during searching.  Note that once you index a given
-     * field <i>with</i> norms enabled, disabling norms will
+     * field <i>with</i> norms disabled, enabling norms will
      * have no effect.  In other words, for this to have the
-     * above described effect on a field, all instances of
+     * above described effect on a field, one instance of
      * that field must be indexed with NOT_ANALYZED_NO_NORMS
-     * from the beginning. */
+     * at some point. */
     NOT_ANALYZED_NO_NORMS {
       @Override
       public boolean isIndexed()  { return true;  }

lucene/src/java/org/apache/lucene/index/IndexReader.java

@@ -1025,8 +1025,8 @@ public abstract class IndexReader implements Cloneable,Closeable {
    * length normalization}.  Thus, to preserve the length normalization
    * values when resetting this, one should base the new value upon the old.
    *
-   * <b>NOTE:</b> If this field does not store norms, then
+   * <b>NOTE:</b> If this field does not index norms, then
-   * this method call will silently do nothing.
+   * this method throws {@link IllegalStateException}.
    *
    * @see #norms(String)
    * @see Similarity#decodeNormValue(byte)
@@ -1037,6 +1037,7 @@ public abstract class IndexReader implements Cloneable,Closeable {
    *  has this index open (<code>write.lock</code> could not
    *  be obtained)
    * @throws IOException if there is a low-level IO error
+   * @throws IllegalStateException if the field does not index norms
    */
   public synchronized  void setNorm(int doc, String field, byte value)
           throws StaleReaderException, CorruptIndexException, LockObtainFailedException, IOException {

lucene/src/java/org/apache/lucene/index/SegmentReader.java

@@ -566,8 +566,10 @@ public class SegmentReader extends IndexReader implements Cloneable {
   protected void doSetNorm(int doc, String field, byte value)
           throws IOException {
     SegmentNorms norm = norms.get(field);
-    if (norm == null)                             // not an indexed field
+    if (norm == null) {
-      return;
+      // field does not store norms
+      throw new IllegalStateException("Cannot setNorm for field " + field + ": norms were omitted");
+    }
 
     normsDirty = true;
     norm.copyOnWrite()[doc] = value;                    // set the value

lucene/src/java/org/apache/lucene/util/Version.java

@@ -27,6 +27,9 @@ package org.apache.lucene.util;
  * change the version at search-time, but instead also adjust
  * your indexing code to match, and re-index.
  */
+// remove me when java 5 is no longer supported
+// this is a workaround for a JDK bug that wrongly emits a warning.
+@SuppressWarnings("dep-ann")
 public enum Version {
   /**
    * Match settings and bugs in Lucene's 3.0 release.

lucene/src/site/src/documentation/content/xdocs/fileformats.xml

@@ -12,7 +12,7 @@
 
             <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
                 <code>docs/fileformats.html</code>
                 that was distributed

lucene/src/site/src/documentation/content/xdocs/index.xml

@@ -6,7 +6,7 @@
   
   <body>
     <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>
 	<p>

lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml

@@ -11,7 +11,7 @@
    </section> -->
 <section id="System Requirements"><title>System Requirements</title>
 <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>
         <li>ANT 1.7.0 or greater.</li>

lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java

@@ -221,7 +221,7 @@ public abstract class LuceneTestCase extends Assert {
   private static TimeZone timeZone;
   private static TimeZone savedTimeZone;
 
-  private static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
+  protected static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
 
   private static final String[] TEST_CODECS = new String[] {"MockSep", "MockFixedIntBlock", "MockVariableIntBlock", "MockRandom"};
 
@@ -341,6 +341,14 @@ public abstract class LuceneTestCase extends Assert {
     random.setSeed(staticSeed);
     tempDirs.clear();
     stores = Collections.synchronizedMap(new IdentityHashMap<MockDirectoryWrapper,StackTraceElement[]>());
+    
+    // enable this by default, for IDE consistency with ant tests (as its the default from ant)
+    // TODO: really should be in solr base classes, but some extend LTC directly.
+    // we do this in beforeClass, because some tests currently disable it
+    if (System.getProperty("solr.directoryFactory") == null) {
+      System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory");
+    }
+    
     savedCodecProvider = CodecProvider.getDefault();
     if ("random".equals(TEST_CODECPROVIDER)) {
       if ("randomPerField".equals(TEST_CODEC)) {

modules/analysis/CHANGES.txt

@@ -1,5 +1,8 @@
 Analysis Module Change Log
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 ======================= Trunk (not yet released) =======================
    
 API Changes

modules/analysis/LICENSE.txt

@@ -200,3 +200,32 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+The following license applies to the Snowball stemmers:
+
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+    * notice, this list of conditions and the following disclaimer in the
+    * documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holders nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

modules/analysis/build.xml

@@ -57,6 +57,13 @@
     <ant dir="smartcn" target="clean" />
     <ant dir="stempel" target="clean" />
   </target>
+  <target name="validate">
+    <ant dir="common" target="validate" />
+    <ant dir="icu" target="validate" />
+    <ant dir="phonetic" target="validate" />
+    <ant dir="smartcn" target="validate" />
+    <ant dir="stempel" target="validate" />
+  </target>
   <target name="compile-core">
     <ant dir="common" target="compile-core" />
     <ant dir="icu" target="compile-core" />

modules/analysis/common/SNOWBALL-LICENSE.txt

@@ -1,26 +0,0 @@
-Copyright (c) 2001, Dr Martin Porter
-Copyright (c) 2002, Richard Boulton
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-    * this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-    * notice, this list of conditions and the following disclaimer in the
-    * documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holders nor the names of its contributors
-    * may be used to endorse or promote products derived from this software
-    * without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

modules/analysis/common/build.xml

@@ -106,7 +106,7 @@
     </java>
   </target>
 
-  <target name="compile-tools">
+  <target name="compile-tools" depends="common.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">

modules/analysis/icu/build.xml

@@ -125,7 +125,7 @@ are part of the ICU4C package. See http://site.icu-project.org/ </echo>
     </java>
   </target>
 			
-  <target name="compile-tools">
+  <target name="compile-tools" depends="common.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">

modules/benchmark/.rsync-filter

@@ -1,2 +0,0 @@
-- /work
-- /temp

modules/benchmark/CHANGES.txt

@@ -2,6 +2,9 @@ Lucene Benchmark Contrib Change Log
 
 The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
 
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
 05/25/2011
   LUCENE-3137: ExtractReuters supports out-dir param suffixed by a slash. (Doron Cohen)
 

modules/build.xml

@@ -18,7 +18,6 @@
  -->
 
 <project name="modules" default="test" basedir=".">
-  <import file="../common-build.xml"/>
   <target name="test" description="Test all modules">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
@@ -30,7 +29,7 @@
     </sequential>
   </target>
 
-  <target name="compile" description="Compile all modules" depends="validate-modules">
+  <target name="compile" description="Compile all modules" depends="validate">
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
@@ -74,24 +73,15 @@
       </subant>
     </sequential>
   </target>
-  <target name="validate" depends="validate-modules"/>
+  <target name="validate">
-  <target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/>
+     <sequential>
-  <target name="check-legal-modules" depends="compile-tools">
+      <subant target="validate" inheritall="false" failonerror="true">
-    <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
+        <fileset dir="analysis" includes="build.xml" />
-      <classpath>
+        <fileset dir="benchmark" includes="build.xml" />
-        <path refid="tools.runtime.classpath" />
+        <fileset dir="grouping" includes="build.xml" />
-      </classpath>
+        <fileset dir="suggest" includes="build.xml" />
-      <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
+      </subant>
-       long time.  This should be faster, but we could miss a directory
+    </sequential>
-       -->
-      <!-- Modules -->
-      <arg value="-c" />
-      <arg value="${basedir}/analysis/icu/lib" />
-      <arg value="-c" />
-      <arg value="${basedir}/analysis/phonetic/lib" />
-      <arg value="-c" />
-      <arg value="${basedir}/benchmark/lib" />
-    </java>
   </target>
 
   <target name="clean" description="Clean all modules">

solr/CHANGES.txt

@@ -24,7 +24,6 @@ $Id$
 ==================  4.0.0-dev ==================
 Versions of Major Components
 ---------------------
-Apache Lucene trunk
 Apache Tika 0.8
 Carrot2 3.5.0
 Velocity 1.6.4 and Velocity Tools 2.0
@@ -1830,7 +1829,7 @@ Documentation
 
  3. SOLR-1409: Added Solr Powered By Logos    
 
-================== Release 1.3.0 20080915 ==================
+================== Release 1.3.0 ==================
 
 Upgrading from Solr 1.2
 -----------------------
@@ -2491,7 +2490,7 @@ Build
               client and contrib. The target can publish artifacts with source and javadocs.
               (Spencer Crissman, Craig McClanahan, shalin)
 
-================== Release 1.2, 20070602 ==================
+================== Release 1.2 ==================
 
 Upgrading from Solr 1.1
 -------------------------------------
@@ -2840,7 +2839,7 @@ Other Changes
 
  2. Updated to Lucene 2007-05-20_00-04-53
 
-================== Release 1.1.0, 20061222 ==================
+================== Release 1.1.0 ==================
 
 Status
 ------

solr/LICENSE.txt

@@ -1067,3 +1067,32 @@ Definitions.
 10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
 
 NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+The following license applies to the Snowball stemmers:
+
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+    * notice, this list of conditions and the following disclaimer in the
+    * documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holders nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

solr/build.xml

@@ -35,7 +35,7 @@
   <target name="compile" description="Compile the source code." 
   	      depends="compile-core, build-contrib"/>
   <target name="test" description="Validate, then run core and contrib unit tests."
-  	      depends="validate-solr, common.test, test-contrib"/>
+  	      depends="validate-solr, common-solr.test, test-contrib"/>
   <target name="test-core" description="Runs the core unit tests."
           depends="common.test"/>
   <target name="compile-test" description="Compile unit tests." 

solr/common-build.xml

@@ -51,6 +51,7 @@
   <property name="tests.threadspercpu" value="2"/>
 
   <import file="../lucene/contrib/contrib-build.xml"/>
+  <property name="tests.directory" value="random" />
 
   <!-- solr depends on the following modules/contribs -->	
   <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
@@ -114,7 +115,7 @@
       <!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/java'"/>-->
       <property name="@{classpath.property}" location="@{jarfile}"/>
       <uptodate property="@{property}" targetfile="@{jarfile}">
-        <srcfiles dir="${common-solr.dir}/contrib/@{name}/src/main/java" includes="**/*.java"/>
+        <srcfiles dir="${common-solr.dir}/contrib/@{name}/src/java" includes="**/*.java"/>
       </uptodate>
     </sequential>
   </macrodef>
@@ -155,4 +156,17 @@
       <arg value="${basedir}/src/test-files/solr/lib" />
     </java>
   </target>
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common-solr.dir}/../lucene/build/classes/tools"/>
+  </path>
+  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
+    <sequential>
+      <subant target="compile-tools" inheritall="false" failonerror="true">
+        <fileset dir="${common-solr.dir}/../lucene" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+  <target name="test" depends="compile-test,validate-solr,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
+  
 </project>

solr/contrib/analysis-extras/CHANGES.txt

@@ -11,17 +11,21 @@ analyzers for Chinese and Polish.
 
 
 $Id$
-================== Release 4.0-dev ==================
+==================  4.0.0-dev ==============
 
 * SOLR-2396: Add ICUCollationField, which is much more efficient than
   the Solr 3.x ICUCollationKeyFilterFactory, and also supports
   Locale-sensitive range queries.  (rmuir)
 
-================== Release 3.2-dev ==================
+==================  3.3.0-dev ==============
 
 (No Changes)
 
-================== Release 3.1-dev ==================
+==================  3.2.0 ==================
+
+(No Changes)
+
+==================  3.1.0 ==================
 
 * SOLR-2210: Add icu-based tokenizer and filters to contrib/analysis-extras (rmuir)
 

solr/contrib/clustering/CHANGES.txt

@@ -7,7 +7,7 @@ See http://wiki.apache.org/solr/ClusteringComponent
 CHANGES
 
 $Id$
-================== Release 4.0.0-dev ==================
+================== Release 4.0.0-dev ==============
 
 * SOLR-2448: Search results clustering updates: bisecting k-means
   clustering algorithm added, loading of Carrot2 stop words from
@@ -15,7 +15,11 @@ $Id$
   for clustering (SOLR-2450), output of cluster scores (SOLR-2505)
   (Stanislaw Osinski, Dawid Weiss).
 
-================== Release 3.2.0-dev ==================
+================== Release 3.3.0-dev ==============
+
+(No Changes)
+
+================== Release 3.2.0 ==================
 
 * SOLR-2448: Search results clustering updates: bisecting k-means
   clustering algorithm added, loading of Carrot2 stop words from
@@ -23,7 +27,7 @@ $Id$
   for clustering (SOLR-2450), output of cluster scores (SOLR-2505)
   (Stanislaw Osinski, Dawid Weiss).
 
-================== Release 3.1.0-dev ==================
+================== Release 3.1.0 ==================
 
 * SOLR-1684: Switch to use the SolrIndexSearcher.doc(int, Set<String>) method b/c it can use the document cache (gsingers)
 

solr/contrib/clustering/lib/simple-xml-NOTICE.txt

@@ -1,56 +1,2 @@
-
-Mahout Collections
-Copyright 2008-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-==============================================================
- Apache Mahout
- Copyright 2009 The Apache Software Foundation
-==============================================================
-
 This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+the SimpleXML project (http://simple.sourceforge.net).
-
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
-  - Apache Lucene Java
-  - Apache Hadoop
-  - Apache Commons
-
-This product includes software developed by the Indiana University
-  Extreme! Lab (http://www.extreme.indiana.edu/).
-  Copyright (c) 2002 Extreme! Lab, Indiana University.
-
-This product includes examples code from the Watchmaker project   
-  https://watchmaker.dev.java.net/
-  Copyright (c) 2006-2009 Daniel W. Dyer.
-
-This product includes libraries developed by the Kosmos project (http://kosmosfs.sourceforge.net/)
- Copyright 2008 Quantcast Corp.
- Copyright 2007 Kosmix Corp.
-
-This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/) 
-Copyright (c) 2008 James Murty
-
-This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
-Copyright (c) 2008, cglib
-
-This product includes a JUnit jar: http://junit.sourceforge.net/
-License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
-Copyright (c) 2000-2006, www.hamcrest.org
-
-This product includes code from the XStream project (http://xstream.codehaus.org/)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-
-This product includes tests written with EasyMock 
-Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
-
-This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
-UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)]. 
-
-This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
-Copyright (c) 2005, Regents of the University of California

solr/contrib/contrib-build.xml

@@ -32,18 +32,7 @@
   
   <target name="compile-core" depends="build-solr, common.compile-core"/>
 
-  <macrodef name="solr-contrib-uptodate">
+  <!-- redefine common-solr.test, and exclude 'validate-solr' dependency, since it should only run at solr/ level --> 
-    <attribute name="name"/>
+  <target name="test" depends="compile-test,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
-    <attribute name="property" default="solr-@{name}.uptodate"/>
+  
-    <attribute name="classpath.property" default="solr-@{name}.jar"/>
-    <!-- set jarfile only, if the target jar file has no generic name -->
-    <attribute name="jarfile" default="${common-solr.dir}/build/contrib/solr-@{name}/apache-solr-@{name}-${version}.jar"/>
-    <sequential>
-      <!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/main/java'"/>-->
-      <property name="@{classpath.property}" location="@{jarfile}"/>
-      <uptodate property="@{property}" targetfile="@{jarfile}">
-        <srcfiles dir="../@{name}/src/main/java" includes="**/*.java"/>
-      </uptodate>
-    </sequential>
-  </macrodef>
 </project>

solr/contrib/dataimporthandler/CHANGES.txt

@@ -8,15 +8,19 @@ HTTP data sources quick and easy.
 
 
 $Id$
-==================  4.0.0-dev ==================
+==================  4.0.0-dev ==============
 
 (No Changes)
 
-==================  3.2.0-dev ==================
+==================  3.3.0-dev ==============
 
 (No Changes)
 
-==================  3.1.0-dev ==================
+==================  3.2.0 ==================
+
+(No Changes)
+
+==================  3.1.0 ==================
 Upgrading from Solr 1.4
 ----------------------
 
@@ -440,7 +444,7 @@ Other
 11.SOLR-1269: Better error messages from JdbcDataSource when JDBC Driver name or SQL is incorrect.
               (ehatcher, shalin)
 
-================== Release 1.3.0 20080915 ==================
+================== Release 1.3.0 ==================
 
 Status
 ------

solr/contrib/extraction/CHANGES.txt

@@ -24,16 +24,20 @@ Current Version: Tika 0.8 (released 11/07/2010)
 
 $Id$
 
-================== Release 4.0-dev ==================
+================== Release 4.0.0-dev ==============
 
 (No Changes)
 
-================== Release 3.2-dev ==================
+================== Release 3.3.0-dev ==============
+
+(No Changes)
+
+================== Release 3.2.0 ==================
 
 * SOLR-2480: Add ignoreTikaException flag so that users can ignore TikaException but index
   meta data. (Shinichiro Abe, koji)
 
-================== Release 3.1-dev ==================
+================== Release 3.1.0 ==================
 
 * SOLR-1902: Upgraded to Tika 0.8 and changed deprecated parse call
 

solr/contrib/uima/CHANGES.txt

@@ -19,7 +19,15 @@ WhitespaceTokenizer v2.3.1-SNAPSHOT rev. 1076132
 
 $Id$
 
-==================  3.2.0-dev ==================
+==================  4.0.0-dev ==============
+
+(No Changes)
+
+==================  3.3.0-dev ==============
+
+(No Changes)
+
+==================  3.2.0 ==================
 
 Upgrading from Solr 3.1
 ----------------------

solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java

@@ -19,6 +19,7 @@
 package org.apache.solr;
 
 
+import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.noggit.CharArr;
 import org.apache.noggit.JSONUtil;
@@ -73,6 +74,16 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
     endTrackingSearchers();
   }
   
+  // SOLR-2279: hack to shut these directories down
+  // we still keep the ability to track open index files this way
+  public static void closeDirectories() throws Exception {
+    for (MockDirectoryWrapper d : stores.keySet()) {
+      if (d.isOpen()) {
+        d.close();
+      }
+    }
+  }
+
   @Override
   public void setUp() throws Exception {
     super.setUp();
@@ -270,6 +281,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
   public static void deleteCore() throws Exception {
     log.info("###deleteCore" );
     if (h != null) { h.close(); }
+    closeDirectories();
     if (dataDir != null) {
       String skip = System.getProperty("solr.test.leavedatadir");
       if (null != skip && 0 != skip.trim().length()) {

solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java

@@ -0,0 +1,35 @@
+package org.apache.solr.core;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.LuceneTestCase;
+
+/**
+ * Opens a directory with {@link LuceneTestCase#newFSDirectory(File)}
+ */
+public class MockDirectoryFactory extends DirectoryFactory {
+
+  @Override
+  public Directory open(String path) throws IOException {
+    return LuceneTestCase.newFSDirectory(new File(path));
+  }
+}

solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java

@@ -191,6 +191,7 @@ public abstract class AbstractSolrTestCase extends LuceneTestCase {
     }
 
     if (h != null) { h.close(); }
+    SolrTestCaseJ4.closeDirectories();
     String skip = System.getProperty("solr.test.leavedatadir");
     if (null != skip && 0 != skip.trim().length()) {
       System.err.println("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());

solr/src/test/org/apache/solr/TestSolrCoreProperties.java

@@ -59,6 +59,7 @@ public class TestSolrCoreProperties extends LuceneTestCase {
   @Override
   public void tearDown() throws Exception {
     solrJetty.stop();
+    SolrTestCaseJ4.closeDirectories();
     AbstractSolrTestCase.recurseDelete(homeDir);
     super.tearDown();
   }

solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java

@@ -78,6 +78,7 @@ public class JettyWebappTest extends LuceneTestCase
     try {
       server.stop();
     } catch( Exception ex ) {}
+    SolrTestCaseJ4.closeDirectories();
     super.tearDown();
   }
   

solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java

@@ -33,6 +33,8 @@ public class MergeIndexesEmbeddedTest extends MergeIndexesExampleTestBase {
 
   @Override
   public void setUp() throws Exception {
+    // TODO: fix this test to use MockDirectoryFactory
+    System.clearProperty("solr.directoryFactory");
     super.setUp();
 
     File home = new File(getSolrHome());

solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java

@@ -32,6 +32,8 @@ public class MultiCoreEmbeddedTest extends MultiCoreExampleTestBase {
 
   @Override public void setUp() throws Exception 
   {
+    // TODO: fix this test to use MockDirectoryFactory
+    System.clearProperty("solr.directoryFactory");
     super.setUp();
     
     File home = new File( getSolrHome() );

solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java

@@ -38,6 +38,8 @@ public class MultiCoreExampleJettyTest extends MultiCoreExampleTestBase {
   
   @Override public void setUp() throws Exception 
   {    
+    // TODO: fix this test to use MockDirectoryFactory
+    System.clearProperty("solr.directoryFactory");
     super.setUp();
 
     jetty = new JettySolrRunner( context, 0 );