Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1240815)
+++ solr/common-build.xml	(working copy)
@@ -162,7 +162,7 @@
     <property name="validated-solr.uptodate" value="true"/>
   </target>
   <path id="tools.runtime.classpath">
-    <pathelement location="${common.dir}/build/classes/tools"/>
+    <pathelement location="${common.dir}/build/tools/classes/java"/>
   </path>
 
   <target name="init-dist" >
Index: solr/core/build.xml
===================================================================
--- solr/core/build.xml	(revision 1240815)
+++ solr/core/build.xml	(working copy)
@@ -22,7 +22,7 @@
 
   <target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,jar-src,contrib-build.dist-maven">
+  <target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
     <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/solr-commons-csv-pom.xml.template"
                                  jar.file="${common-solr.dir}/lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
 
Index: solr/build.xml
===================================================================
--- solr/build.xml	(revision 1240815)
+++ solr/build.xml	(working copy)
@@ -104,7 +104,7 @@
          dest="luke/luke-${luke.version}.jar"/>
   </target>
   <path id="luke.classpath">
-    <pathelement location="${common.dir}/build/classes/java" />
+    <pathelement location="${common.dir}/build/core/classes/java" />
     <pathelement location="${common.dir}/../modules/queryparser/build/classes/java" />
   </path>
   <target name="luke" depends="luke-download">
@@ -319,7 +319,7 @@
     <svn-export-source source.dir=".."/>
 
     <!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
-    <delete dir="${svn.export.dir}/lucene/src/tools/javadoc/java6"/>
+    <delete dir="${svn.export.dir}/lucene/tools/javadoc/java6"/>
 
     <tar destfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset dir="${svn.export.dir}"
Index: solr/contrib/langid/build.xml
===================================================================
--- solr/contrib/langid/build.xml	(revision 1240815)
+++ solr/contrib/langid/build.xml	(working copy)
@@ -32,7 +32,7 @@
   </path>
 
   <dirname file="${ant.file.solr-langid}" property="solr-langid.dir"/>
-  <target name="dist-maven" depends="jar-core,javadocs,jar-src,contrib-build.dist-maven">
+  <target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
     <m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/jsonic-pom.xml.template"
                                  jar.file="${solr-langid.dir}/lib/jsonic-1.2.0.jar" />
 
Index: solr/test-framework/build.xml
===================================================================
--- solr/test-framework/build.xml	(revision 1240815)
+++ solr/test-framework/build.xml	(working copy)
@@ -22,7 +22,7 @@
 
   <path id="javadoc.classpath">
     <path refid="classpath"/>
-    <pathelement location="${common.dir}/build/classes/test-framework"/>
+    <pathelement location="${common.dir}/build/test-framework/classes/java"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 
Index: modules/join/build.xml
===================================================================
--- modules/join/build.xml	(revision 1240815)
+++ modules/join/build.xml	(working copy)
@@ -22,5 +22,5 @@
 
   <target name="init" depends="contrib-build.init,jar-grouping"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven" />
+  <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven" />
 </project>
Index: modules/suggest/build.xml
===================================================================
--- modules/suggest/build.xml	(revision 1240815)
+++ modules/suggest/build.xml	(working copy)
@@ -29,5 +29,5 @@
 
   <import file="../../lucene/contrib/contrib-build.xml"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven" />
+  <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven" />
 </project>
Index: modules/queryparser/build.xml
===================================================================
--- modules/queryparser/build.xml	(revision 1240815)
+++ modules/queryparser/build.xml	(working copy)
@@ -34,7 +34,7 @@
 
   <target name="compile-core" depends="jar-queries,jar-sandbox,common.compile-core"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
+  <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven"/>
 
   <target name="javacc" depends="init,javacc-check,javacc-QueryParser,javacc-surround,javacc-flexible"/>
 
Index: modules/benchmark/build.xml
===================================================================
--- modules/benchmark/build.xml	(revision 1240815)
+++ modules/benchmark/build.xml	(working copy)
@@ -257,7 +257,7 @@
 		     />
     </target>
     
-    <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven">
+    <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven">
       <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
                                    jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar" />
     </target>
Index: modules/grouping/build.xml
===================================================================
--- modules/grouping/build.xml	(revision 1240815)
+++ modules/grouping/build.xml	(working copy)
@@ -40,7 +40,7 @@
       <path refid="base.classpath"/>
     </path>
 
-    <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven" />
+    <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven" />
     <target name="compile" depends="jar-queries,common.compile-core" description="Compiles facet classes" />
     <target name="jar-core" depends="common.jar-core" />
 
Index: modules/queries/build.xml
===================================================================
--- modules/queries/build.xml	(revision 1240815)
+++ modules/queries/build.xml	(working copy)
@@ -26,5 +26,5 @@
 
   <import file="../../lucene/contrib/contrib-build.xml"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
+  <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven"/>
 </project>
\ No newline at end of file
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1240815)
+++ lucene/common-build.xml	(working copy)
@@ -25,7 +25,7 @@
 
   <dirname file="${ant.file.common}" property="common.dir"/>
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
-  <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
+  <property name="prettify.dir" value="${common.dir}/tools/prettify"/>
   <property name="maven.build.dir" value="${build.dir}/maven"/>
 
   <!-- Give user a chance to override without editing this file
@@ -63,7 +63,7 @@
   </path>
 
   <path id="tools.runtime.classpath">
-    <pathelement location="${common.dir}/build/classes/tools"/>
+    <pathelement location="${common.dir}/build/tools/classes/java"/>
   </path>
 
   <path id="maven-ant-tasks.classpath">
@@ -115,7 +115,7 @@
 
   <property name="javadoc.link" value="http://download.oracle.com/javase/6/docs/api/"/>
   <property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
-  <property name="javadoc.packagelist.dir" value="${common.dir}/src/tools/javadoc"/>
+  <property name="javadoc.packagelist.dir" value="${common.dir}/tools/javadoc"/>
   <available file="${javadoc.packagelist.dir}/java6/package-list" property="javadoc.java6.packagelist.exists"/>
   <property name="javadoc.access" value="protected"/>
   <property name="javadoc.charset" value="utf-8"/>
@@ -131,7 +131,7 @@
     </fileset>
   </path>
 	
-  <property name="changes.src.dir" value="${common.dir}/src/site/changes"/>
+  <property name="changes.src.dir" value="${common.dir}/site/changes"/>
   <property name="changes.target.dir" value="${common.dir}/build/docs/changes"/>
 
   <property name="project.name" value="site"/> <!-- todo: is this used by anakia or something else? -->
@@ -139,13 +139,13 @@
 
   <property name="src.dir" location="src/java"/>
   <property name="tests.src.dir" location="src/test"/>
-  <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework/java"/>
+  <property name="tests-framework.src.dir" location="${common.dir}/test-framework/src/java"/>
   <property name="build.dir" location="build"/>
   <!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib -->
   <property name="common.build.dir" location="${common.dir}/build"/>
   <property name="tests.lockdir" location="${common.build.dir}"/>
-  <property name="dist.dir" location="dist"/>
-  <property name="maven.dist.dir" location="dist/maven"/>
+  <property name="dist.dir" location="${common.dir}/dist"/>
+  <property name="maven.dist.dir" location="${dist.dir}/maven"/>
   <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
   <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/>
 
@@ -222,7 +222,7 @@
 
   <patternset id="lucene.local.src.package.patterns"
               includes="src/,index.html,*build*.xml,docs/,*.txt,contrib/,lib/,backwards/"
-              excludes="**/pom.xml,**/*.iml,src/site/build/"
+              excludes="**/pom.xml,**/*.iml,site/build/"
   />
 
   <target name="clean"
@@ -456,48 +456,36 @@
     </sequential>
   </macrodef>
 
-  <property name="lucene-core.jar" value="${common.dir}/build/lucene-core-${version}.jar"/>
+  <property name="lucene-core.jar" value="${common.dir}/build/core/lucene-core-${version}.jar"/>
   <target name="check-lucene-core-uptodate" unless="lucene-core.uptodate">
     <uptodate property="lucene-core.uptodate" targetfile="${lucene-core.jar}">
-     	<srcfiles dir="${common.dir}/src/java" includes="**/*.java"/>
+     	<srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
     </uptodate>
   </target>
   <target name="jar-lucene-core" unless="lucene-core.uptodate" depends="check-lucene-core-uptodate">
-    <ant dir="${common.dir}" target="jar-core" inheritAll="false">
+    <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
     <property name="lucene-core.uptodate" value="true"/>
   </target>
   <target name="compile-lucene-core" unless="core.compiled">
-    <ant dir="${common.dir}" target="compile-core" inheritAll="false">
+    <ant dir="${common.dir}/core" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
     <property name="core.compiled" value="true"/>
   </target>
   
-  <path id="test-framework.classpath">
-    <path refid="ant-path"/>
-    <path refid="test.classpath"/>
-  </path>
-  
-  <target name="compile-test-framework" depends="compile-core">
-  	<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
-  						test.classpath="test-framework.classpath"/>
-       <!-- Copy the resources folder (if existent) -->
-       <copy todir="${common.dir}/build/classes/test-framework">
-          <fileset dir="${tests-framework.src.dir}/../resources" erroronmissingdir="no"/>
-       </copy>
+  <target name="compile-test-framework">
+    <ant dir="${common.dir}/test-framework" target="compile-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
   <target name="compile-tools">
-    <compile
-      srcdir="${common.dir}/src/tools/java"
-      destdir="${common.build.dir}/classes/tools">
-      <classpath refid="classpath"/>
-    </compile>
+    <ant dir="${common.dir}/tools" target="compile-core" inheritAll="false"/>
   </target>
 
-  <target name="compile-test" depends="compile-test-framework">
+  <target name="compile-test" depends="compile-core,compile-test-framework">
   	<compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test"
   						test.classpath="test.classpath"/>
   </target>
@@ -778,6 +766,24 @@
 
   <target name="default" depends="jar-core"/>
 
+  <available type="file" file="pom.xml" property="pom.xml.present"/>
+  
+  <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
+    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
+             uri="antlib:org.apache.maven.artifact.ant" 
+             classpathref="maven-ant-tasks.classpath"/>
+    <sequential>
+      <m2-deploy>
+        <artifact-attachments>
+          <attach file="${build.dir}/${final.name}-src.jar"
+                  classifier="sources"/>
+          <attach file="${build.dir}/${final.name}-javadoc.jar"
+                  classifier="javadoc"/>
+        </artifact-attachments>
+      </m2-deploy>
+    </sequential>
+  </target>
+
   <target name="rat-sources-typedef">
     <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
       <classpath>
@@ -948,7 +954,7 @@
        -->
       <!-- Lucene  -->
       <arg value="-c" />
-      <arg value="${basedir}/lib" />
+      <arg value="${common.dir}/lib" />
     </java>
   </target>
 
Index: lucene/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/lucene40/TestBitVector.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/lucene40/TestDocValues.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/intblock/TestIntBlockCodec.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/TestExternalCodecs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/TestToken.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/analysis/TestMockCharFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/TestDemo.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/TestSearch.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestNot.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestDateSort.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSort.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/payloads/TestPayloadExplanations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTermVectors.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/fuzzyTestData.txt (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTermScorer.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestShardSearching.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFieldValueFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestWildcard.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestNRTManager.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestBoolean2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestCachingCollector.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestExplanations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFieldCache.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestDateFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSimilarity.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSearchAfter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/MockFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestDocBoost.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestSearcherManager.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.20.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.24.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDoc.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIsCurrent.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.31.optimized.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexInput.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestCustomNorms.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/Test2BPostings.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestFlex.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexableField.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestCheckIndex.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTransactions.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.19.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.30.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.34.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.21.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestOmitTf.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.20.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.21.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.22.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.23.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestStressNRT.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.24.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.29.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/wordliststopwords_nocomment.txt (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.29.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestMultiReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestOmitPositions.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestCompoundFile.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.31.optimized.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestOmitNorms.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/wordliststopwords.txt (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.36.surrogates.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestPayloads.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTermsEnum.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.31.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.30.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.31.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.32.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestLongPostings.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.34.cfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestRandomStoredFields.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNorms.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.22.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestStressAdvance.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDocCount.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTypePromotion.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestRollback.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestForceMergeForever.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestMultiFields.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/index.32.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNewestSegment.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestCrash.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestCodecs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/BinaryTokenStream.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestNeverDelete.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.23.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestByteSlices.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestUniqueTermCount.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestFieldInfos.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTerm.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/unsupported.19.nocfs.zip (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/Test2BTerms.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestParallelReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/index/TestReaderClosed.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/TestAssertions.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestLockFactory.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestCopyBytes.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestDirectory.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestMultiMMap.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestHugeRamFile.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestLock.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/store/TestByteArrayDataInput.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestSetOnce.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestTwoPhaseCommitTool.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestByteBlockPool.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestDoubleBarrelLRUCache.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestFixedBitSet.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestBitUtil.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestVersionComparator.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestVersion.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestVirtualMethod.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestPagedBytes.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestNamedSPILoader.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestBytesRefHash.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestDeterminism.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestMinimize.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestSpecialOperations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestBasicOperations.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestCharsRef.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestWeakIdentityMap.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/makeEuroparlLineFile.py (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/packed/TestPackedInts.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestIndexableBinaryStringTools.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestSentinelIntSet.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestArrayUtil.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestOpenBitSet.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestBytesRef.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestNumericUtils.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestUnicodeUtil.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestPriorityQueue.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestIOUtils.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestRamUsageEstimator.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestSortedVIntList.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/util/TestSmallFloat.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/document/TestDateTools.java (deleted)
===================================================================
Index: lucene/src/test/org/apache/lucene/document/TestDocument.java (deleted)
===================================================================
Index: lucene/src/tools/java/org/apache/lucene/validation/DependencyChecker.java (deleted)
===================================================================
Index: lucene/src/tools/java/org/apache/lucene/validation/LicenseType.java (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-apollo.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-lisp.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-vb.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/prettify.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-css.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-ml.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/stylesheet+prettify.css (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-hs.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-sql.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-lua.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-proto.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/lang-wiki.js (deleted)
===================================================================
Index: lucene/src/tools/prettify/prettify.css (deleted)
===================================================================
Index: lucene/src/tools/javadoc/java6/package-list (deleted)
===================================================================
Index: lucene/src/tools/javadoc/junit/package-list (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/BitVector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsBaseFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/BytesRefUtils.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/Writer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/Ints.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/DocValuesArray.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/VarDerefBytesImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/VarStraightBytesImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/Floats.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/DirectSource.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/FixedDerefBytesImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/values/FixedStraightBytesImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesProducer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/StoredFieldsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/DocValuesConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/pulsing/Pulsing40PostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/pulsing/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/BlockTermsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/DocValuesReaderBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/MappingMultiDocsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FieldInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/SegmentInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PostingsBaseFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FieldsProducer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/StoredFieldsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/DocValuesWriterBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsProducer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FieldInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/LiveDocsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FieldsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PostingsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/BlockTermState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PostingsReaderBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/SegmentInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/intblock/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/AppendingSegmentInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/AppendingCodec.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/AppendingTermsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/AppendingSegmentInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/AppendingPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/AppendingTermsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/appending/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermVectorsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermStats.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/memory/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PostingsWriterBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/SegmentInfosWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermVectorsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xCodec.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/NormsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/SepDocValuesProducer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/SepSkipListWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/SepPostingsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/SepSkipListReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/IntStreamFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/sep/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/TermsIndexWriterBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/perfield/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/Codec.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PerDocProducer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/PerDocConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/BlockTermsReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/FieldInfosFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/codecs/DocValuesFormat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/CharReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/Token.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/CachingTokenFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/Analyzer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/TokenFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/CharStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/TokenStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/analysis/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/CachingCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ScoringRewrite.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldCache.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MultiTermQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BoostAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FuzzyQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BooleanScorer2.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/RegexpQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Filter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/NumericRangeFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldValueHitQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadFunction.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/MinPayloadFunction.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/MaxPayloadFunction.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/payloads/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PrefixTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanPayloadCheckQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/TermSpans.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/Spans.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanPositionRangeQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/DocIdSetIterator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TopFieldDocs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermStatistics.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PrefixQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermRangeTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FilteredQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Collector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/SearcherManager.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermRangeFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PhrasePositions.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BitsFilteredDocIdSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ConjunctionTermScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/NRTManagerReopenThread.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PhraseScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PrefixFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Query.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BooleanQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/NumericRangeQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/CollectionStatistics.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PhraseQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldDoc.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermRangeQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TopDocs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldComparator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ReqOptSumScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Explanation.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Sort.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/SortField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/DisjunctionSumScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/NGramPhraseQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BooleanScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Scorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/DocIdSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MultiCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ScoreDoc.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ComplexExplanation.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BooleanClause.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FilteredDocIdSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TopFieldCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModel.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicSimilarityProvider.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/DefaultSimilarityProvider.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelG.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/AfterEffect.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/NormalizationH1.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/LMSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/Distribution.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/Lambda.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelIF.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/NormalizationH3.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/Similarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/LambdaDF.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/DistributionSPL.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/LambdaTTF.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicStats.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/SimilarityProvider.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/IBSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelD.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/DistributionLL.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/LMDirichletSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelBE.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/LMJelinekMercerSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/NormalizationZ.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/AfterEffectB.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/NormalizationH2.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelP.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/DFRSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/Normalization.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelIn.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/AfterEffectL.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/DefaultSimilarity.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/similarities/BasicModelIne.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/WildcardQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ReqExclScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TopDocsCollector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/IndexSearcher.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/SearcherFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/TermScorer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldValueFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/PhraseQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/Weight.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/HitQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/BoostAttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/FieldComparatorSource.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/AutomatonQuery.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/search/NRTManager.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/LucenePackage.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocInverterPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiDocValues.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FlushPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexableFieldType.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/StoredFieldsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexNotFoundException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/LogDocMergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/StandardDirectoryReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexCommit.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/NoDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FieldInfos.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/StoredFieldVisitor.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocTermOrds.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/CompositeReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DirectoryReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/CoalescedDeletes.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/BufferedDeletes.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/Payload.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FieldsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexFileNames.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermsHash.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FilteredTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MergeState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexUpgrader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentMerger.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiTerms.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/CorruptIndexException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiFieldsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/ByteSliceReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/Term.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TypePromoter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermsHashPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TieredMergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentInfo.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/ParallelReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/ByteSliceWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/InvertedDocConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocFieldProcessorPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocFieldConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/CompositeReaderContext.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/InvertedDocConsumerPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FieldInfo.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocFieldConsumerPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/PayloadProcessorProvider.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/AtomicReaderContext.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/InvertedDocEndConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermsHashConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/FieldInvertState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/NoMergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/LogMergePolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/InvertedDocEndConsumerPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocValues.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiDocsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexFormatTooNewException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/NoMergeScheduler.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SerialMergeScheduler.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IntBlockPool.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexableField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentReadState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexReaderContext.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/AtomicReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentInfos.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/CheckIndex.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/Fields.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/BaseMultiReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/NormsConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/Norm.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/OrdTermState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentWriteState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocConsumer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MultiFields.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SingleTermsEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/DocInverter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/NormsConsumerPerField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/KeepOnlyLastCommitDeletionPolicy.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/PerDocWriteState.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/Terms.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/index/MergeScheduler.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/NIOFSDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/VerifyingLockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/LockVerifyServer.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/FSLockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/ChecksumIndexOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/LockReleaseFailedException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/ByteArrayDataOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/MMapDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/RAMFile.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/RateLimiter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/InputStreamDataInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/IndexInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/OutputStreamDataOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/IndexOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/Lock.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/LockStressTest.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/FlushInfo.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/NoSuchDirectoryException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/RAMDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/Directory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/NRTCachingDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/SimpleFSDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/LockObtainFailedException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/ChecksumIndexInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/RAMInputStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/MergeInfo.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/IOContext.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/ByteArrayDataInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/RAMOutputStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/NoLockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/NativeFSLockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/LockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/SimpleFSLockFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/DataInput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/AlreadyClosedException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/DataOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/BufferedIndexOutput.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/store/FSDirectory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/PrintStreamInfoStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/Attribute.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/ByteBlockPool.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/SorterTemplate.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/BitUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/TermContext.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/MapBackedSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/CommandLineUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/Version.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/BytesRefHash.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/VirtualMethod.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/CollectionUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/MemoryModel.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/ToStringUtils.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/InfoStream.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/IndexableBinaryStringTools.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/mutable/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/MutableBits.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/PairOutputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/ByteSequenceOutputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/Util.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/FSTEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/Outputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/UpToTwoPositiveIntOutputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/TODO (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/Builder.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/IntSequenceOutputs.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/NodeHash.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/fst/FST.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/MultiBits.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/ArrayUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/RecyclingByteBlockAllocator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/BitsSlice.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/NumericUtils.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/AttributeSource.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/OpenBitSetIterator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/ScorerDocQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/IOUtils.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/DocIdBitSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/SetOnce.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/TwoPhaseCommitTool.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/TwoPhaseCommit.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/StringHelper.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/DoubleBarrelLRUCache.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/AttributeReflector.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/FixedBitSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/CodecUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/Constants.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/OpenBitSetDISI.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/NamedSPILoader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/PagedBytes.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/Automaton.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/Lev1TParametricDescription.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/Lev2TParametricDescription.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/CharacterRunAutomaton.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/MinimizationOperations.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/createLevAutomata.py (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/BasicAutomata.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/State.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/ByteRunAutomaton.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/AutomatonProvider.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/SpecialOperations.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.py (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/BasicOperations.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/SortedIntSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/RegExp.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/Transition.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/RunAutomaton.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/automaton/StatePair.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/CloseableThreadLocal.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/CharsRef.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/WeakIdentityMap.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/ReaderUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/MapOfSets.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/Bits.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/NamedThreadFactory.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/Direct32.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/GrowableWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/Direct16.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/Packed64.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/Direct8.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/Direct64.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/PackedWriter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/PackedInts.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/Packed32.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/DirectReader.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/packed/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/DummyConcurrentLock.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/SentinelIntSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/IntsRef.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/OpenBitSet.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/ThreadInterruptedException.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/Counter.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/BytesRef.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/UnicodeUtil.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/AttributeImpl.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/PriorityQueue.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/RamUsageEstimator.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/SortedVIntList.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/util/SmallFloat.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/CompressionTools.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/Field.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/StoredField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/FieldType.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/NumericField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/TextField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/DocValuesField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/StringField.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/DateTools.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/Document.java (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/document/package.html (deleted)
===================================================================
Index: lucene/src/java/org/apache/lucene/package.html (deleted)
===================================================================
Index: lucene/src/java/overview.html (deleted)
===================================================================
Index: lucene/src/site/build/site/demo.html (deleted)
===================================================================
Index: lucene/src/site/build/site/gettingstarted.html (deleted)
===================================================================
Index: lucene/src/site/build/site/systemrequirements.html (deleted)
===================================================================
Index: lucene/src/site/build/site/queryparsersyntax.html (deleted)
===================================================================
Index: lucene/src/site/build/site/broken-links.xml (deleted)
===================================================================
Index: lucene/src/site/build/site/linkmap.html (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/skinconf.xsl (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/getMenu.js (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/menu.js (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/prototype.js (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/note.txt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/print.css (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/profile.css (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/CommonMessages_de.xml (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/getBlank.js (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/breadcrumbs.js (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/page.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/apache-thanks.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/chapter.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/poddoc.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/update.jpg (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/vcss.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/pdfdoc.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/fix.jpg (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/built-with-forrest-button.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/add.jpg (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-b-l-15-1body-2menu-3menu.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/valid-html401.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/corner-imports.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/remove.jpg (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/dc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-b-r-15-1body-2menu-3menu.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/spacer.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/external-link.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/hack.jpg (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/current.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/printer.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/txtdoc.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/xmldoc.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rss.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/txtdoc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-t-r-15-1body-2menu-3menu.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/poddoc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/built-with-cocoon.gif (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/README.txt (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/images/forrest-credit-logo.png (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/breadcrumbs-optimized.js (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/CommonMessages_fr.xml (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/CommonMessages_es.xml (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/screen.css (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/basic.css (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/CommonMessages_en_US.xml (deleted)
===================================================================
Index: lucene/src/site/build/site/skin/fontsize.js (deleted)
===================================================================
Index: lucene/src/site/build/site/contributions.html (deleted)
===================================================================
Index: lucene/src/site/build/site/images/built-with-forrest-button.png (deleted)
===================================================================
Index: lucene/src/site/build/site/images/favicon.ico (deleted)
===================================================================
Index: lucene/src/site/build/site/images/instruction_arrow.png (deleted)
===================================================================
Index: lucene/src/site/build/site/scoring.html (deleted)
===================================================================
Index: lucene/src/site/build/site/demo2.html (deleted)
===================================================================
Index: lucene/src/site/build/site/lucene-contrib/index.html (deleted)
===================================================================
Index: lucene/src/site/build/site/index.html (deleted)
===================================================================
Index: lucene/src/site/build/site/.htaccess (deleted)
===================================================================
Index: lucene/src/site/build/site/fileformats.html (deleted)
===================================================================
Index: lucene/src/site/forrest.properties (deleted)
===================================================================
Index: lucene/src/site/src/documentation/conf/cli.xconf (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/skinconf.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/translations/CommonMessages_es.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/translations/CommonMessages_fr.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/translations/CommonMessages_de.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/translations/CommonMessages_en_US.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/poddoc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/page.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/current.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/chapter.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/corner-imports.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/README.txt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/rc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/txtdoc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/images/dc.svg.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/getMenu.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/menu.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/prototype.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/getBlank.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/breadcrumbs.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/breadcrumbs-optimized.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/scripts/fontsize.js (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/css/forrest.css.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/svg/document-to-svg.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/fo/document-to-fo.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/fo/pdfoutline.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/split.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/book-to-menu.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/pathutils.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/document-to-html.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/dotdots.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/renderlogo.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/strip_namespaces.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/tabutils.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/common/xslt/html/tab-to-menu.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/skinconf.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/note.txt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/css/profile.css.xslt (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/css/print.css (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/css/screen.css (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/css/basic.css (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/xslt/fo/document-to-fo.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/xslt/html/book-to-menu.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/xslt/html/document-to-html.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skins/lucene/xslt/html/tab-to-menu.xsl (deleted)
===================================================================
Index: lucene/src/site/src/documentation/skinconf.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/contributions.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/demo.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/scoring.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/site.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/demo2.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_green_100.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/page.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_green_200.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_green_300.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_green_150.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_green_250.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/current.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/chapter.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/favicon.ico (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_outline_100.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_outline_200.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_outline_300.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_outline_150.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lucene_outline_250.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/lia_3d.jpg (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/asf-logo.gif (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/larm_crawling-process.jpg (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/larm_architecture.jpg (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/images/instruction_arrow.png (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/index.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/gettingstarted.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/queryparsersyntax.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/tabs.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/xdocs/fileformats.xml (deleted)
===================================================================
Index: lucene/src/site/src/documentation/content/.htaccess (deleted)
===================================================================
Index: lucene/src/site/src/documentation/classes/CatalogManager.properties (deleted)
===================================================================
Index: lucene/src/site/changes/ChangesFixedWidthStyle.css (deleted)
===================================================================
Index: lucene/src/site/changes/ChangesFancyStyle.css (deleted)
===================================================================
Index: lucene/src/site/changes/changes2html.pl (deleted)
===================================================================
Index: lucene/src/site/changes/ChangesSimpleStyle.css (deleted)
===================================================================
Index: lucene/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (deleted)
===================================================================
Index: lucene/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexOutput.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mocksep/MockSepDocValuesFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mocksep/MockSingleIntFactory.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/nestedpulsing/NestedPulsingPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosReader.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/lucene40ords/Lucene40WithOrds.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockAnalyzer.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenFilter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/VocabularyAssert.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/MockCharFilter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/analysis/CannedAnalyzer.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/search/ShardSearchingTestBase.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/search/RandomSimilarityProvider.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/MockIndexInput.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/DocHelper.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/RandomDocumentsWriterPerThreadPool.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/MockRandomMergePolicy.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/index/RandomCodec.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/store/MockIndexInputWrapper.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/store/MockIndexOutputWrapper.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/store/MockLockFactoryWrapper.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/store/_TestHelper.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/LineFileDocs.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCaseRunner.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/NullInfoStream.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/ThrottledIndexOutput.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitDividingSelector.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/_TestIgnoredException.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/SmartRandom.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitResultFormatter.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/English.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/ThreeLongs.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/org/apache/lucene/util/_TestUtil.java (deleted)
===================================================================
Index: lucene/src/test-framework/java/overview.html (deleted)
===================================================================
Index: lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec (deleted)
===================================================================
Index: lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (deleted)
===================================================================
Index: lucene/src/test-framework/resources/org/apache/lucene/util/europarl.lines.txt.gz (deleted)
===================================================================
Index: lucene/core/build.xml
===================================================================
--- lucene/core/build.xml	(revision 0)
+++ lucene/core/build.xml	(revision 0)
@@ -0,0 +1,94 @@
+<?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="core" default="default">
+  <description>Lucene Core</description>
+
+  <property name="build.dir" location="../build/core"/>
+
+  <import file="../common-build.xml"/>
+
+  <path id="classpath"/>
+  
+  <path id="test.classpath">
+    <pathelement location="${common.dir}/build/test-framework/classes/java"/>
+    <path refid="junit-path"/>
+    <pathelement location="${build.dir}/classes/java"/>
+    <pathelement location="${build.dir}/classes/test"/>
+  </path>
+
+  <path id="junit.classpath">
+    <path refid="test.classpath"/>
+    <pathelement path="${java.class.path}"/>
+  </path>
+
+  <target name="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
+
+  <target name="javadocs" description="Generate javadoc for core classes">
+  	<sequential>
+      <mkdir dir="${javadoc.dir}/core"/>
+      <invoke-javadoc destdir="${javadoc.dir}/core" title="${Name} ${version} core API">
+        <sources>
+          <packageset dir="${src.dir}"/>
+          <link href=""/>
+        </sources>
+      </invoke-javadoc>
+     <jarify basedir="${javadoc.dir}/core" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+    </sequential>
+  </target>
+
+  <macrodef name="createLevAutomaton">
+  	<attribute name="n"/>
+  	<sequential>
+      <exec dir="src/java/org/apache/lucene/util/automaton"
+            executable="${python.exe}" failonerror="true">
+        <arg line="createLevAutomata.py @{n} True"/>
+      </exec>
+      <exec dir="src/java/org/apache/lucene/util/automaton"
+            executable="${python.exe}" failonerror="true">
+        <arg line="createLevAutomata.py @{n} False"/>
+      </exec>
+    </sequential>
+  </macrodef>
+
+  <target name="createLevAutomata" depends="check-moman,clone-moman,pull-moman">
+  	<createLevAutomaton n="1"/>
+  	<createLevAutomaton n="2"/>
+  </target>
+  
+  <target name="check-moman">
+    <condition property="moman.cloned">
+      <available file="src/java/org/apache/lucene/util/automaton/moman"/>
+  	</condition>
+  </target>
+	
+  <target name="clone-moman" unless="moman.cloned">
+  	<exec dir="src/java/org/apache/lucene/util/automaton" 
+          executable="${hg.exe}" failonerror="true">
+      <arg line="clone -r ${moman.rev} ${moman.url} moman"/>
+    </exec>
+  </target>
+
+  <target name="pull-moman" if="moman.cloned">
+    <exec dir="src/java/org/apache/lucene/util/automaton/moman" 
+          executable="${hg.exe}" failonerror="true">
+      <arg line="pull -f -r ${moman.rev}"/>
+    </exec>
+  </target>
+</project>

Property changes on: lucene/core/build.xml
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision HeadURL
Added: svn:eol-style
   + native

Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1240815)
+++ lucene/build.xml	(working copy)
@@ -17,35 +17,17 @@
     limitations under the License.
  -->
 
-<project name="core" default="default" basedir="."
+<project name="lucene" default="default" basedir="."
          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-  <property name="junit.includes" value="**/Test*.java"/>
-
   <import file="common-build.xml"/>
 
-  <!-- Build classpath -->
   <path id="classpath">
-    <pathelement location="${build.dir}/classes/java"/>
+    <pathelement location="${common.dir}/build/core/classes/java"/>
   </path>
 
-  <path id="test.classpath">
-    <pathelement location="${build.dir}/classes/test-framework"/>
-    <path refid="classpath"/>
-    <path refid="junit-path"/>
-    <pathelement location="${build.dir}/classes/test"/>
-  </path>
-
-  <path id="junit.classpath">
-    <pathelement location="${build.dir}/classes/test-framework"/>
-    <path refid="junit-path"/>
-    <pathelement location="${build.dir}/classes/test"/>
-    <pathelement location="${build.dir}/classes/java"/>
-    <pathelement path="${java.class.path}"/>
-  </path>
-
   <patternset id="binary.build.dist.patterns"
-              includes="${final.name}*.jar,lucene-test-framework*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+              includes="docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
               excludes="*-src.jar"
   />
   <patternset id="binary.root.dist.patterns"
@@ -57,9 +39,11 @@
   <!-- Prepares the build directory                                       -->
   <!-- ================================================================== -->
 
-  <target name="test-core" depends="common.test"
-          description="Runs unit tests for the core Lucene code"
-  />
+  <target name="test-core" description="Runs unit tests for the core Lucene code">
+    <ant dir="${common.dir}/core" target="test" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+  </target>
   <target name="test" depends="test-core, test-contrib, test-backwards"
           description="Runs all unit tests (core, contrib and back-compat)"
   />
@@ -90,13 +74,13 @@
       <!-- TODO: separate test-framework from core tests (because META-INF duplicates in trunk) -->
       
       <!-- compile branch tests against previous version JAR file -->	
-      <compile-test-macro srcdir="${backwards.dir}/src/test-framework/java" destdir="${build.dir.backwards}/classes/test"
+      <compile-test-macro srcdir="${backwards.dir}/test-framework/src/java" destdir="${build.dir.backwards}/classes/test"
                   test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>
       <!-- Copy the resources folder (if existent) -->
       <copy todir="${build.dir.backwards}/classes/test">
-        <fileset dir="${backwards.dir}/src/test-framework/resources" erroronmissingdir="no"/>
+        <fileset dir="${backwards.dir}/test-framework/src/resources" erroronmissingdir="no"/>
       </copy>
-      <compile-test-macro srcdir="${backwards.dir}/src/test" destdir="${build.dir.backwards}/classes/test"
+      <compile-test-macro srcdir="${backwards.dir}/core/src/test" destdir="${build.dir.backwards}/classes/test"
                   test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>
       
 
@@ -133,7 +117,7 @@
           Note: we disable multiplier/nightly because the purpose is to find API breaks
           -->
       <test-macro 
-    	dataDir="${backwards.dir}/src/test" 
+    	dataDir="${backwards.dir}/core/src/test" 
     	tempDir="${build.dir.backwards}/test" 
     	junit.classpath="backwards.junit.classpath" 
     	junit.output.dir="${junit.output.dir.backwards}" 
@@ -157,14 +141,12 @@
     </parallel>
   </target>
 
-  <!-- ================================================================== -->
-  <!-- J A R                                                              -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
+  <target name="compile-core">
+    <ant dir="${common.dir}/core" target="compile-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+  </target>
 
-  <target name="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
-
   <!-- ================================================================== -->
   <!-- D O C U M E N T A T I O N                                          -->
   <!-- ================================================================== -->
@@ -173,7 +155,7 @@
   <target name="docs">
   <!-- copies the docs over to the docs folder -->
     <copy todir="build/docs">
-      <fileset dir="src/site/build/site"/> 
+      <fileset dir="site/build/site"/> 
     </copy>
   </target>
 
@@ -198,18 +180,9 @@
   </target>
 	
   <target name="javadocs-core" description="Generate javadoc for core classes">
-  	<sequential>
-      <mkdir dir="${javadoc.dir}/core"/>
-      <invoke-javadoc
-        destdir="${javadoc.dir}/core"
-      	title="${Name} ${version} core API">
-        <sources>
-          <packageset dir="src/java"/>
-          <link href=""/>
-        </sources>
-      </invoke-javadoc>
-     <jarify basedir="${javadoc.dir}/core" destfile="${build.dir}/${final.name}-javadoc.jar"/>
-    </sequential>
+    <ant dir="${common.dir}/core" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
   <target name="javadocs-contrib" description="Generate javadoc for contrib classes">
@@ -240,12 +213,12 @@
         <pathelement location="${common.dir}/../modules/queries/build/lucene-queries-${version}.jar"/>
       </path>
 
-      <invoke-javadoc
-        destdir="${javadoc.dir}/all">
+      <invoke-javadoc overview="${common.dir}/core/src/java/overview.html"
+                      destdir="${javadoc.dir}/all">
         <sources>
           <!-- TODO: find a dynamic way to do include multiple source roots -->
-          <packageset dir="src/java"/>
-          <packageset dir="src/test-framework/java"/>
+          <packageset dir="core/src/java"/>
+          <packageset dir="test-framework/src/java"/>
 
           <!-- please keep this list up to date, and in alpha order...   -->
         
@@ -307,6 +280,12 @@
         <patternset refid="binary.root.dist.patterns"/>
       </zipfileset>
       <zipfileset dir="${build.dir}" includes="build-demo.xml" fullpath="lucene-${version}/build.xml"/>
+      <zipfileset prefix="lucene-${version}" dir="${build.dir}/core">
+        <patternset includes="lucene-core*.jar" excludes="*-src.jar"/>
+      </zipfileset>
+      <zipfileset prefix="lucene-${version}" dir="${build.dir}/test-framework">
+        <patternset includes="lucene-test-framework*.jar" excludes="*-src.jar"/>
+      </zipfileset>
       <zipfileset prefix="lucene-${version}" dir="${build.dir}">
         <patternset refid="binary.build.dist.patterns"/>
       </zipfileset>
@@ -325,6 +304,12 @@
     <delete file="${build.dir}/lucene-${version}.tar"/>
     <delete file="${dist.dir}/lucene-${version}.tgz"/>
     <tar tarfile="${build.dir}/lucene-${version}.tar" longfile="gnu">
+      <tarfileset prefix="lucene-${version}" dir="${build.dir}/core">
+        <patternset includes="lucene-core*.jar" excludes="*-src.jar"/>
+      </tarfileset>
+      <tarfileset prefix="lucene-${version}" dir="${build.dir}/test-framework">
+        <patternset includes="lucene-test-framework*.jar" excludes="*-src.jar"/>
+      </tarfileset>
       <tarfileset prefix="lucene-${version}" dir=".">
         <patternset refid="binary.root.dist.patterns"/>
       </tarfileset>
@@ -376,9 +361,9 @@
     <svn-export-source source.dir="."/>
 
     <!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
-    <delete dir="${svn.export.dir}/src/tools/javadoc/java6"/>
+    <delete dir="${svn.export.dir}/tools/javadoc/java6"/>
 
-    <build-changes changes.src.dir="${svn.export.dir}/src/site/changes"
+    <build-changes changes.src.dir="${svn.export.dir}/site/changes"
                    changes.target.dir="${svn.export.dir}/docs/changes"/>
     <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
@@ -419,8 +404,7 @@
   </target>
 
 
-  <target name="generate-maven-artifacts"
-          depends="package, jar-src, jar-test-framework-src, javadocs">
+  <target name="generate-maven-artifacts" depends="package, javadocs">
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
              uri="antlib:org.apache.maven.artifact.ant" 
              classpathref="maven-ant-tasks.classpath"/>
@@ -429,24 +413,13 @@
  
       <m2-deploy pom.xml="../pom.xml"/> <!-- Lucene/Solr grandparent POM -->
       <m2-deploy pom.xml="pom.xml"/>    <!-- Lucene parent POM -->
-      <m2-deploy pom.xml="src/pom.xml"> <!-- Lucene core POM -->
-        <artifact-attachments>
-          <attach file="${build.dir}/${final.name}-src.jar"
-                  classifier="sources"/>
-          <attach file="${build.dir}/${final.name}-javadoc.jar"
-                  classifier="javadoc"/>
-        </artifact-attachments>
-      </m2-deploy>
-      <m2-deploy pom.xml="src/test-framework/pom.xml"
-                 jar.file="${build.dir}/lucene-test-framework-${version}.jar">
-        <artifact-attachments>
-          <attach file="${build.dir}/lucene-test-framework-${version}-src.jar"
-                  classifier="sources"/>
-          <attach file="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
-                  classifier="javadoc"/>
-        </artifact-attachments>
-      </m2-deploy>
-
+      
+      <subant target="dist-maven" failonerror="true" inheritall="false">
+        <propertyset refid="uptodate.and.compiled.properties"/>
+        <fileset dir="${common.dir}/core" includes="build.xml"/>
+        <fileset dir="${common.dir}/test-framework" includes="build.xml"/>
+      </subant>
+      
       <contrib-crawl target="dist-maven"/>
     </sequential>
   </target>
@@ -470,46 +443,6 @@
 	  antfile="build.xml" 
 	/>
   </target>
-
-  <macrodef name="createLevAutomaton">
-  	<attribute name="n"/>
-  	<sequential>
- 	<exec dir="src/java/org/apache/lucene/util/automaton"
-  			executable="${python.exe}" failonerror="true">
-  	  	<arg line="createLevAutomata.py @{n} True"/>
-  	</exec>
- 	<exec dir="src/java/org/apache/lucene/util/automaton"
-  			executable="${python.exe}" failonerror="true">
-  	  	<arg line="createLevAutomata.py @{n} False"/>
-        </exec>
-  	</sequential>
-  </macrodef>
-
-  <target name="createLevAutomata" depends="check-moman,clone-moman,pull-moman">
-  	<createLevAutomaton n="1"/>
-  	<createLevAutomaton n="2"/>
-  </target>
-  
-  <target name="check-moman">
-  	<condition property="moman.cloned">
-      <available file="src/java/org/apache/lucene/util/automaton/moman"/>
-  	</condition>
-  </target>
-	
-  <target name="clone-moman" unless="moman.cloned">
-  	<exec dir="src/java/org/apache/lucene/util/automaton" 
-  		executable="${hg.exe}" failonerror="true">
-      <arg line="clone -r ${moman.rev} ${moman.url} moman"/>
-    </exec>
-  </target>
-
-  <target name="pull-moman" if="moman.cloned">
-	<exec dir="src/java/org/apache/lucene/util/automaton/moman" 
-		executable="${hg.exe}" failonerror="true">
-	  <arg line="pull -f -r ${moman.rev}"/>
-	</exec>
-  </target>
-
   <target name="build-contrib" depends="compile-test"
           description="Builds all contrib modules and their tests">
     <contrib-crawl target="build-artifacts-and-tests"/>
@@ -559,38 +492,27 @@
   </target>
 
   <target name="jar-test-framework" depends="compile-test-framework">
-    <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/lucene-test-framework-${version}.jar"
-            title="Lucene Search Engine: Test Framework" />
+    <ant dir="${common.dir}/test-framework" target="jar-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
   <target name="javadocs-test-framework">
-	<sequential>
-      <mkdir dir="${javadoc.dir}/test-framework"/>
-      <invoke-javadoc
-          overview="src/test-framework/java/overview.html"
-          destdir="${javadoc.dir}/test-framework"
-          title="${Name} ${version} Test Framework API">
-        <sources>
-          <packageset dir="src/test-framework/java"/>
-          <link offline="true" href="${javadoc.link.junit}"
-                packagelistLoc="${javadoc.packagelist.dir}/junit"/>
-          <link href=""/>
-        </sources>
-      </invoke-javadoc>
-      <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
-	          title="Lucene Search Engine: Test Framework" />
-    </sequential>
+    <ant dir="${common.dir}/test-framework" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
-  <target name="jar-test-framework-src" depends="init">
-    <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/lucene-test-framework-${version}-src.jar"
-            title="Lucene Search Engine: Test Framework">
-      <fileset dir="${tests-framework.src.dir}/../resources" erroronmissingdir="no"/>
-    </jarify>
+  <target name="jar-test-framework-src">
+    <ant dir="${common.dir}/test-framework" target="jar-src" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
   <!-- Override common-build.xml definition to check for the jar already being up-to-date -->
   <target name="jar-core" depends="check-lucene-core-uptodate,compile-core" unless="lucene-core.uptodate">
-    <jarify/>
+    <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 </project>
Index: lucene/contrib/CHANGES.txt
===================================================================
--- lucene/contrib/CHANGES.txt	(revision 1240815)
+++ lucene/contrib/CHANGES.txt	(working copy)
@@ -215,6 +215,18 @@
  * LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly
    stating the expected order of the arguments (David Smiley via hossman)
 
+Build
+
+* LUCENE-3753: Restructure the Lucene build system:
+  - Created a new Lucene-internal module named "core" by moving the java/
+    and test/ directories from lucene/src/ to lucene/core/src/.
+  - Eliminated lucene/src/ by moving all its directories up one level.
+  - Each internal module (core/, test-framework/, and tools/) now has its own
+    build.xml, from which it is possible to run module-specific targets.
+    lucene/build.xml delegates all build tasks (via
+    <ant dir="internal-module-dir"> calls) to these modules' build.xml files.
+  (Steve Rowe)
+
 ======================= Lucene 3.5.0 ================
 
 Changes in backwards compatibility policy
Index: lucene/contrib/contrib-build.xml
===================================================================
--- lucene/contrib/contrib-build.xml	(revision 1240815)
+++ lucene/contrib/contrib-build.xml	(working copy)
@@ -31,7 +31,7 @@
   
   <!-- if you extend the classpath refid in one contrib's build.xml (add JARs), use this as basis: -->
   <path id="base.classpath">
-   <pathelement location="${common.dir}/build/classes/java"/>
+   <pathelement location="${common.dir}/build/core/classes/java"/>
    <pathelement path="${project.classpath}"/>
   </path>
   
@@ -39,7 +39,7 @@
   <path id="classpath" refid="base.classpath"/>
   
   <path id="test.base.classpath">
-    <pathelement location="${common.dir}/build/classes/test-framework"/>
+    <pathelement location="${common.dir}/build/test-framework/classes/java"/>
     <path refid="classpath"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
@@ -62,28 +62,6 @@
   </target>
   <target name="build-artifacts-and-tests" depends="jar, compile-test" />
 	
-  <available 
-    type="file" 
-    file="pom.xml" 
-    property="pom.xml.present">
-  </available>
-
-  <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
-    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
-             uri="antlib:org.apache.maven.artifact.ant" 
-             classpathref="maven-ant-tasks.classpath"/>
-    <sequential>
-      <m2-deploy>
-        <artifact-attachments>
-          <attach file="${build.dir}/${final.name}-src.jar"
-                  classifier="sources"/>
-          <attach file="${build.dir}/${final.name}-javadoc.jar"
-                  classifier="javadoc"/>
-        </artifact-attachments>
-      </m2-deploy>
-    </sequential>
-  </target>
-
   <target name="javadocs" depends="compile-core">
    	<sequential>
        <mkdir dir="${javadoc.dir}/contrib-${name}"/>
Index: lucene/tools/build.xml
===================================================================
--- lucene/tools/build.xml	(revision 0)
+++ lucene/tools/build.xml	(revision 0)
@@ -0,0 +1,30 @@
+<?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="tools" default="default">
+  <description>Lucene Tools</description>
+
+  <property name="build.dir" location="../build/tools"/>
+
+  <import file="../common-build.xml"/>
+
+  <target name="javadocs"/> <!-- to make common-build.xml happy -->
+  
+  <path id="classpath"/>
+</project>

Property changes on: lucene/tools/build.xml
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision HeadURL
Added: svn:eol-style
   + native

Index: lucene/backwards/backwards-readme.txt
===================================================================
--- lucene/backwards/backwards-readme.txt	(revision 1240815)
+++ lucene/backwards/backwards-readme.txt	(working copy)
@@ -10,12 +10,12 @@
 compatible to the last base version, bugfixes should not taken into account):
 
 * cd lucene/backwards
-* svn rm src/test src/test-framework lib/lucene-core*.jar
+* svn rm core/src/test test-framework lib/lucene-core*.jar
 * svn commit (1st commit; you must do this, else you will corrupt your checkout)
-* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/src/test-framework src
-* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/src/test src
+* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/test-framework ./
+* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/core/src/test core/src/
 * Copy the lucene-core.jar from the last release tarball to lib.
-* Check that everything is correct: The backwards folder should contain a src/ folder
-  that now contains "test" and "test-framework". The files should be the ones from the last version.
+* Check that everything is correct: The backwards folder should contain folders "core/src/test/"
+  and "test-framework". The files should be the ones from the last version.
 * Run "ant test-backwards"
 * Commit the stuff again (2nd commit)
Index: lucene/test-framework/build.xml
===================================================================
--- lucene/test-framework/build.xml	(revision 0)
+++ lucene/test-framework/build.xml	(revision 0)
@@ -0,0 +1,53 @@
+<?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="test-framework" default="default">
+  <description>Lucene Test Framework</description>
+
+  <property name="build.dir" location="../build/test-framework"/>
+
+  <import file="../common-build.xml"/>
+
+  <path id="classpath">
+    <pathelement location="${common.dir}/build/core/classes/java"/>
+    <path refid="junit-path"/>
+    <path refid="ant-path"/>
+  </path>
+
+  <target name="compile-core" depends="compile-lucene-core,common.compile-core" />
+
+  <target name="javadocs">
+    <sequential>
+      <mkdir dir="${javadoc.dir}/test-framework"/>
+      <invoke-javadoc overview="${src.dir}/overview.html"
+                      destdir="${javadoc.dir}/test-framework"
+                      title="${Name} ${version} Test Framework API">
+        <sources>
+          <packageset dir="${src.dir}"/>
+          <link offline="true" href="${javadoc.link.junit}"
+                packagelistLoc="${javadoc.packagelist.dir}/junit"/>
+          <link href=""/>
+        </sources>
+      </invoke-javadoc>
+      <jarify basedir="${javadoc.dir}/test-framework" 
+              destfile="${build.dir}/${final.name}-javadoc.jar"
+              title="Lucene Search Engine: Test Framework" />
+    </sequential>
+  </target>
+</project>

Property changes on: lucene/test-framework/build.xml
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision HeadURL
Added: svn:eol-style
   + native

Index: dev-tools/idea/lucene/lucene.iml
===================================================================
--- dev-tools/idea/lucene/lucene.iml	(revision 1240815)
+++ dev-tools/idea/lucene/lucene.iml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/build/lucene-idea/classes/java" />
+    <output-test url="file://$MODULE_DIR$/build/lucene-idea/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/test-framework/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test-framework/src/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tools/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
     </content>
Index: dev-tools/eclipse/dot.classpath
===================================================================
--- dev-tools/eclipse/dot.classpath	(revision 1240815)
+++ dev-tools/eclipse/dot.classpath	(working copy)
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="lucene/src/test-framework/java"/>
-        <classpathentry kind="src" output="bin.tests-framework" path="lucene/src/test-framework/resources"/>
-	<classpathentry kind="src" path="lucene/src/java"/>
-	<classpathentry kind="src" path="lucene/src/resources"/>
-	<classpathentry kind="src" path="lucene/src/test"/>
+	<classpathentry kind="src" path="lucene/core/src/java"/>
+	<classpathentry kind="src" path="lucene/core/src/resources"/>
+	<classpathentry kind="src" path="lucene/core/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/demo/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/demo/src/resources"/>
 	<classpathentry kind="src" path="lucene/contrib/demo/src/test"/>
@@ -18,6 +16,8 @@
 	<classpathentry kind="src" path="lucene/contrib/sandbox/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/spatial/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
+	<classpathentry kind="src" path="lucene/test-framework/src/java"/>
+        <classpathentry kind="src" output="bin.tests-framework" path="lucene/test-framework/src/resources"/>
 	<classpathentry kind="src" path="modules/analysis/common/src/java"/>
 	<classpathentry kind="src" path="modules/analysis/common/src/resources"/>
 	<classpathentry kind="src" path="modules/analysis/common/src/test"/>
Index: dev-tools/maven/lucene/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/pom.xml.template	(revision 1240815)
+++ dev-tools/maven/lucene/pom.xml.template	(working copy)
@@ -32,8 +32,8 @@
   <name>Lucene parent POM</name>
   <description>Lucene parent POM</description>
   <modules>
-    <module>src</module>
-    <module>src/test-framework</module>
+    <module>core</module>
+    <module>test-framework</module>
     <module>contrib</module>
   </modules>
   <build>
Index: dev-tools/maven/lucene/src/pom.xml.template (deleted)
===================================================================
Index: dev-tools/maven/lucene/src/test-framework/pom.xml.template (deleted)
===================================================================
Index: dev-tools/maven/lucene/core/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/core/pom.xml.template	(revision 0)
+++ dev-tools/maven/lucene/core/pom.xml.template	(working copy)
@@ -32,8 +32,8 @@
   <name>Lucene Core</name>
   <description>Apache Lucene Java Core</description>
   <properties>
-    <module-directory>lucene</module-directory>
-    <build-directory>../build</build-directory>
+    <module-directory>lucene/core</module-directory>
+    <build-directory>../build/lucene-maven</build-directory>
   </properties>
   <dependencies>
     <dependency>
@@ -56,19 +56,19 @@
     <directory>${build-directory}</directory>
     <outputDirectory>${build-directory}/classes/java</outputDirectory>
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
-    <sourceDirectory>java</sourceDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>
-        <directory>resources</directory>
+        <directory>src/resources</directory>
       </resource>
     </resources>
-    <testSourceDirectory>test</testSourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
     <testResources>
       <testResource>
-        <directory>test-framework/resources</directory>
+        <directory>../test-framework/src/resources</directory>
       </testResource>
       <testResource>
-        <directory>test-framework/java</directory>
+        <directory>../test-framework/src/java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
@@ -136,7 +136,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>test-framework</source>
+                <source>../test-framework/src/java</source>
               </sources>
             </configuration>
           </execution>
Index: dev-tools/maven/lucene/test-framework/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/test-framework/pom.xml.template	(revision 0)
+++ dev-tools/maven/lucene/test-framework/pom.xml.template	(working copy)
@@ -24,7 +24,7 @@
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
     <version>@version@</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
   <artifactId>lucene-test-framework</artifactId>
@@ -32,8 +32,8 @@
   <name>Lucene Test Framework</name>
   <description>Apache Lucene Java Test Framework</description>
   <properties>
-    <module-directory>lucene/src/test-framework</module-directory>
-    <build-directory>../../build</build-directory>
+    <module-directory>lucene/test-framework</module-directory>
+    <build-directory>../build/test-framework</build-directory>
   </properties>
   <dependencies>
     <dependency>
@@ -52,11 +52,11 @@
   </dependencies>
   <build>
     <directory>${build-directory}</directory>
-    <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
-    <sourceDirectory>java</sourceDirectory>
+    <outputDirectory>${build-directory}/classes/java</outputDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>
-        <directory>resources</directory>
+        <directory>src/resources</directory>
       </resource>
       <resource>
         <directory>${project.build.sourceDirectory}</directory>
Index: dev-tools/scripts/LUCENE-3753.patch.hack.pl
===================================================================
--- dev-tools/scripts/LUCENE-3753.patch.hack.pl	(revision 0)
+++ dev-tools/scripts/LUCENE-3753.patch.hack.pl	(revision 0)
@@ -0,0 +1,111 @@
+#!/usr/bin/perl
+#
+# This script can be used to fix up paths that were moved as a result
+# of the structural changes committed as part of LUCENE-3753.
+#
+# Input is on STDIN, output is to STDOUT
+#
+# Example use:
+#
+#    perl LUCENE-3753.patch.hack.pl <my.pre-LUCENE-3753.patch >my.post-LUCENE-3753.patch
+#
+#
+# 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.
+#
+
+use strict;
+use warnings;
+
+my @moves = (
+
+    'lucene/src/java'
+ => 'lucene/core/src/java',
+
+    'lucene/src/test'
+ => 'lucene/core/src/test',
+
+    'lucene/src/resources'
+ => 'lucene/core/src/resources',
+
+    'lucene/src/site'
+ => 'lucene/site',
+
+    'lucene/src/test-framework/java'
+ => 'lucene/test-framework/src/java',
+
+    'lucene/src/test-framework/resources'
+ => 'lucene/test-framework/src/resources',
+
+    'lucene/src/tools/java'
+ => 'lucene/tools/src/java',
+
+    'lucene/src/tools/javadoc'
+ => 'lucene/tools/javadoc',
+
+    'lucene/src/tools/prettify'
+ => 'lucene/tools/prettify',
+
+    'dev-tools/maven/lucene/src/pom.xml.template'
+ => 'dev-tools/maven/lucene/core/pom.xml.template',
+ 
+    'dev-tools/maven/lucene/src/test-framework/pom.xml.template'
+ => 'dev-tools/maven/lucene/test-framework/pom.xml.template',
+);
+
+my @copies = ();
+
+my $diff;
+
+while (<>) {
+  if (/^Index/) {
+    my $next_diff = $_;
+    &fixup_paths if ($diff);
+    $diff = $next_diff;
+  } else {
+    $diff .= $_;
+  }
+}
+
+&fixup_paths; # Handle the final diff
+
+sub fixup_paths {
+  for (my $move_pos = 0 ; $move_pos < $#moves ; $move_pos += 2) {
+    my $source = $moves[$move_pos];
+    my $target = $moves[$move_pos + 1];
+    if ($diff =~ /^Index: \Q$source\E/) {
+      $diff =~ s/^Index: \Q$source\E/Index: $target/;
+      $diff =~ s/\n--- \Q$source\E/\n--- $target/;
+      $diff =~ s/\n\+\+\+ \Q$source\E/\n+++ $target/;
+      $diff =~ s/\nProperty changes on: \Q$source\E/\nProperty changes on: $target/;
+      last;
+    }
+  }
+  print $diff;
+
+  for (my $copy_pos = 0 ; $copy_pos < $#copies ; $copy_pos += 2) {
+    my $source = $copies[$copy_pos];
+    my $target = $copies[$copy_pos + 1];
+    if ($diff =~ /^Index: \Q$source\E/) {
+      my $new_diff = $diff;
+      $new_diff =~ s/^Index: \Q$source\E/Index: $target/;
+      $new_diff =~ s/\n--- \Q$source\E/\n--- $target/;
+      $new_diff =~ s/\n\+\+\+ \Q$source\E/\n+++ $target/;
+      $new_diff =~ s/\nProperty changes on: \Q$source\E/\nProperty changes on: $target/;
+      print $new_diff;
+      last;
+    }
+  }
+}