You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/09/21 19:22:27 UTC

svn commit: r1388574 [2/45] - in /lucene/dev/branches/LUCENE-2878: ./ dev-tools/ dev-tools/eclipse/ dev-tools/eclipse/dot.settings/ dev-tools/idea/ dev-tools/idea/.idea/ dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/ dev-tools/idea/lucene/analy...

Modified: lucene/dev/branches/LUCENE-2878/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/build.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/build.xml Fri Sep 21 17:21:34 2012
@@ -24,6 +24,9 @@
     </subant>
   </target>
 
+  <target name="precommit" description="Run basic checks before committing"
+          depends="check-svn-working-copy,validate,documentation-lint"/>
+
   <target name="test" description="Test both Lucene and Solr">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
@@ -33,18 +36,27 @@
     </sequential>
   </target>
 
-  <target name="javadocs" description="Generate Lucene and Solr javadocs">
+  <target name="pitest" description="Test both Lucene and Solr">
+    <sequential>
+      <subant target="pitest" inheritall="false" failonerror="false">
+        <fileset dir="lucene" includes="build.xml" />
+        <fileset dir="solr" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+  <target name="documentation" description="Generate Lucene and Solr Documentation">
     <sequential>
-      <subant target="javadocs" inheritall="false" failonerror="true">
+      <subant target="documentation" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
         <fileset dir="solr" includes="build.xml" />
       </subant>
     </sequential>
   </target>
 
-  <target name="javadocs-lint">
+  <target name="documentation-lint">
     <sequential>
-      <subant target="javadocs-lint" inheritall="false" failonerror="true">
+      <subant target="documentation-lint" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
         <fileset dir="solr" includes="build.xml" />
       </subant>
@@ -68,13 +80,14 @@
         <or>
           <containsregexp expression="@author\b" casesensitive="yes"/>
           <containsregexp expression="\bno(n|)commit\b" casesensitive="no"/>
+          <containsregexp expression="\t" casesensitive="no"/>
         </or>
       </fileset>
       <map from="${validate.currDir}${file.separator}" to="* "/>
     </pathconvert>
-    <fail if="validate.patternsFound">The following files contain @author tags or nocommits:${line.separator}${validate.patternsFound}</fail>
+    <fail if="validate.patternsFound">The following files contain @author tags, tabs or nocommits:${line.separator}${validate.patternsFound}</fail>
   </target>
-
+	
   <target name="rat-sources" description="Runs rat across all sources and tests">
     <sequential><subant target="rat-sources" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
@@ -101,6 +114,8 @@
 
   <property name="version" value="5.0-SNAPSHOT"/>
   <property name="maven-build-dir" value="maven-build"/>
+  <property name="maven-version" value="2.2.1"/>
+  
   <target name="get-maven-poms"
           description="Copy Maven POMs from dev-tools/maven/ to ${maven-build-dir}/">
     <copy todir="${maven-build-dir}" overwrite="true">
@@ -133,6 +148,33 @@
     </sequential>
   </target>
 
+  <target name="validate-maven-dependencies" depends="generate-maven-artifacts" description="Validates maven dependencies, licenses, etc">
+    <subant target="-validate-maven-dependencies" inheritall="false" failonerror="true">
+      <property name="filtered.pom.templates.uptodate" value="true"/>
+      <fileset dir="lucene" includes="build.xml"/>
+      <fileset dir="solr" includes="build.xml"/>
+    </subant>
+  </target>
+  
+  <target name="run-maven-build" depends="get-maven-poms" description="Runs the Maven build using automatically generated POMs">
+    <subant target="run-maven-build" inheritall="false" failonerror="true">
+      <propertyset>
+        <propertyref prefix="maven-"/>
+      </propertyset>
+      <fileset dir="." includes="extra-targets.xml" />
+    </subant>
+  </target>
+  
+  <target name="remove-maven-artifacts" description="Removes all Lucene/Solr Maven artifacts from the local repository">
+    <echo message="Removing all Lucene/Solr Maven artifacts from '${user.home}/.m2/repository'..."/>
+    <delete includeemptydirs="true">
+      <fileset dir="${user.home}/.m2/repository" erroronmissingdir="false">
+        <include name="org/apache/lucene/**"/>
+        <include name="org/apache/solr/**"/>
+      </fileset>
+    </delete>
+  </target>
+
   <target name="eclipse" depends="clean-jars, resolve" description="Setup Eclipse configuration">
     <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
     <copy file="dev-tools/eclipse/dot.classpath" tofile=".classpath" overwrite="true"/>
@@ -164,6 +206,7 @@
       <fileset dir="solr" includes="**/*.iml"/>
       <fileset dir="lucene" includes="**/*.iml"/>
     </delete>
+    <delete dir="idea-build" failonerror="true"/>
   </target>
 
   <target name="clean" description="Clean Lucene and Solr">
@@ -208,7 +251,7 @@
   <property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
   <property name="fakeReleaseVersion" value="5.0"/> <!-- *not* -SNAPSHOT, the real version -->
 
-  <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it." depends="clean">
+  <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean">
    <sequential>
      <fail unless="JAVA6_HOME">JAVA6_HOME property is not defined.</fail>
      <fail unless="JAVA7_HOME">JAVA7_HOME property is not defined.</fail>
@@ -248,64 +291,45 @@
    </sequential>
   </target>
   
+  <target name="check-svn-working-copy">
+    <subant target="check-svn-working-copy" inheritall="false" failonerror="true">
+      <fileset dir="." includes="extra-targets.xml" />
+    </subant>
+  </target>
+
   <!-- Calls only generate-clover-reports on Lucene, as Solr's is just a clone with other target; the database itsself is fixed -->
   <target name="generate-clover-reports">
     <subant target="generate-clover-reports" inheritall="false" failonerror="true">
-      <fileset dir="." includes="build-clover.xml" />
+      <fileset dir="." includes="extra-targets.xml" />
     </subant>
   </target>
 
   <!-- Jenkins tasks -->
-  <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,-svn-status"/>
+  <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-documentation-lint,jar-checksums,check-svn-working-copy" description="Runs the Jenkins hourly test runs"/>
   
-  <target name="jenkins-clover">
+  <target name="jenkins-clover" description="Runs nightly clover builds on Jenkins">
     <antcall target="-jenkins-clover">
       <param name="run.clover" value="true"/>
       <!-- must be 1, as clover does not like parallel test runs: -->
       <param name="tests.jvms" value="1"/>
       <!-- Also override some other props to be fast, ignoring what's set on command line: -->
       <param name="tests.multiplier" value="1"/>
-      <param name="tests.slow" value="false"/>
       <param name="tests.nightly" value="false"/>
       <param name="tests.weekly" value="false"/>
       <param name="tests.multiplier" value="1"/>
     </antcall>
   </target>
   <target name="-jenkins-clover" depends="clean,test,generate-clover-reports"/>
+
+  <target name="jenkins-maven-nightly" depends="clean,remove-maven-artifacts,run-maven-build,generate-maven-artifacts,validate-maven-dependencies"
+    description="Runs the nightly Maven build on Jenkins, including artifact deployment"/>
   
   <!-- we need this extra condition, as we want to match only on "true", not solely if property is set: -->
-  <property name="disable.javadocs-lint" value="false" />
-  <condition property="-disable.javadocs-lint">
-    <equals arg1="${disable.javadocs-lint}" arg2="true"/>
+  <property name="disable.documentation-lint" value="false" />
+  <condition property="-disable.documentation-lint">
+    <istrue value="${disable.documentation-lint}"/>
   </condition>
-  <target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
-    <antcall target="javadocs-lint"/> 
-  </target>
-
-  <!-- define here, as common-build is not included! -->
-  <property name="svn.exe" value="svn" />
-  
-  <target name="-svn-status">
-    <exec executable="${svn.exe}" dir="." failonerror="true">
-      <arg value="status"/>
-      <redirector outputproperty="svn.status.output">
-        <outputfilterchain>
-          <linecontainsregexp>
-            <regexp pattern="^\?" />
-          </linecontainsregexp>
-          <tokenfilter>
-            <replaceregex pattern="^........" replace="* " />
-            <replacestring from="${file.separator}" to="/" />
-          </tokenfilter>
-        </outputfilterchain>
-      </redirector>
-    </exec>
-    <fail message="Source checkout is dirty after running tests!!! Offending files:${line.separator}${svn.status.output}">
-      <condition>
-        <not>
-          <equals arg1="${svn.status.output}" arg2=""/>
-        </not>
-      </condition>
-    </fail>
+  <target name="-jenkins-documentation-lint" unless="-disable.documentation-lint">
+    <antcall target="documentation-lint"/> 
   </target>
 </project>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath Fri Sep 21 17:21:34 2012
@@ -1,126 +1,130 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<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/demo/src/java"/>
-	<classpathentry kind="src" path="lucene/demo/src/resources"/>
-	<classpathentry kind="src" path="lucene/demo/src/test"/>
-	<classpathentry kind="src" path="lucene/highlighter/src/java"/>
-	<classpathentry kind="src" path="lucene/highlighter/src/test"/>
-	<classpathentry kind="src" path="lucene/memory/src/java"/>
-	<classpathentry kind="src" path="lucene/memory/src/test"/>
-	<classpathentry kind="src" path="lucene/misc/src/java"/>
-	<classpathentry kind="src" path="lucene/misc/src/test"/>
-	<classpathentry kind="src" path="lucene/sandbox/src/java"/>
-	<classpathentry kind="src" path="lucene/sandbox/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="lucene/analysis/common/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-common"  path="lucene/analysis/common/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/common/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
-	<classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
-	<classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
-	<classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
-	<classpathentry kind="src" path="lucene/benchmark/src/java"/>
-	<classpathentry kind="src" path="lucene/benchmark/src/test"/>
-        <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
-	<classpathentry kind="src" path="lucene/facet/src/java"/>
-	<classpathentry kind="src" path="lucene/facet/src/examples"/>
-	<classpathentry kind="src" path="lucene/facet/src/test"/>
-	<classpathentry kind="src" path="lucene/grouping/src/java"/>
-	<classpathentry kind="src" path="lucene/grouping/src/test"/>
-	<classpathentry kind="src" path="lucene/join/src/java"/>
-	<classpathentry kind="src" path="lucene/join/src/test"/>
-	<classpathentry kind="src" path="lucene/queries/src/java"/>
-	<classpathentry kind="src" path="lucene/queries/src/test"/>
-	<classpathentry kind="src" path="lucene/queryparser/src/java"/>
-	<classpathentry kind="src" path="lucene/queryparser/src/resources"/>
-	<classpathentry kind="src" path="lucene/queryparser/src/test"/>
-	<classpathentry kind="src" path="lucene/suggest/src/java"/>
-	<classpathentry kind="src" path="lucene/suggest/src/test"/>
-	<classpathentry kind="src" path="lucene/spatial/src/java"/>
-	<classpathentry kind="src" path="lucene/spatial/src/test"/>
-	<classpathentry kind="src" path="lucene/spatial/src/test-files"/>
-	<classpathentry kind="lib" path="lucene/spatial/lib/spatial4j-0.2.jar"/>
-	<classpathentry kind="src" path="solr/core/src/java"/>
-	<classpathentry kind="src" path="solr/core/src/test"/>
-	<classpathentry kind="src" path="solr/core/src/test-files"/>
-	<classpathentry kind="src" path="solr/solrj/src/java"/>
-	<classpathentry kind="src" path="solr/solrj/src/test"/>
-	<classpathentry kind="src" path="solr/solrj/src/test-files"/>
-	<classpathentry kind="src" path="solr/test-framework/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/clustering/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/clustering/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/clustering/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/dataimporthandler/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/extraction/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/langid/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
-	<classpathentry kind="src" path="solr/contrib/langid/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/uima/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
-	<classpathentry kind="src" path="solr/contrib/uima/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
-	<classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
-	<classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
-	<classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
-	<classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
-	<classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
-	<classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
-	<classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
-	<classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
-	<classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
-	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
-	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
-	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
-	<classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
-	<classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
-	<classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
-	<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
-	<classpathentry kind="lib" path="solr/lib/commons-cli-1.2.jar"/>
-	<classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
-	<classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
-	<classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
-	<classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
-	<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
-	<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
-	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
-	<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
+  <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/codecs/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/codecs" path="lucene/codecs/src/resources"/>
+  <classpathentry kind="src" path="lucene/codecs/src/test"/>
+  <classpathentry kind="src" path="lucene/demo/src/java"/>
+  <classpathentry kind="src" path="lucene/demo/src/resources"/>
+  <classpathentry kind="src" path="lucene/demo/src/test"/>
+  <classpathentry kind="src" path="lucene/highlighter/src/java"/>
+  <classpathentry kind="src" path="lucene/highlighter/src/test"/>
+  <classpathentry kind="src" path="lucene/memory/src/java"/>
+  <classpathentry kind="src" path="lucene/memory/src/test"/>
+  <classpathentry kind="src" path="lucene/misc/src/java"/>
+  <classpathentry kind="src" path="lucene/misc/src/test"/>
+  <classpathentry kind="src" path="lucene/sandbox/src/java"/>
+  <classpathentry kind="src" path="lucene/sandbox/src/test"/>
+  <classpathentry kind="src" path="lucene/test-framework/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/tests-framework" path="lucene/test-framework/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/common/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-common" path="lucene/analysis/common/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/common/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-icu" path="lucene/analysis/icu/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
+  <classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
+  <classpathentry kind="src" output="eclipse-build/analysis-uima" path="lucene/analysis/uima/src/resources"/>
+  <classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
+  <classpathentry kind="src" path="lucene/benchmark/src/java"/>
+  <classpathentry kind="src" path="lucene/benchmark/src/test"/>
+  <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
+  <classpathentry kind="src" path="lucene/classification/src/java"/>
+  <classpathentry kind="src" path="lucene/classification/src/test"/>
+  <classpathentry kind="src" path="lucene/facet/src/java"/>
+  <classpathentry kind="src" path="lucene/facet/src/examples"/>
+  <classpathentry kind="src" path="lucene/facet/src/test"/>
+  <classpathentry kind="src" path="lucene/grouping/src/java"/>
+  <classpathentry kind="src" path="lucene/grouping/src/test"/>
+  <classpathentry kind="src" path="lucene/join/src/java"/>
+  <classpathentry kind="src" path="lucene/join/src/test"/>
+  <classpathentry kind="src" path="lucene/queries/src/java"/>
+  <classpathentry kind="src" path="lucene/queries/src/test"/>
+  <classpathentry kind="src" path="lucene/queryparser/src/java"/>
+  <classpathentry kind="src" path="lucene/queryparser/src/resources"/>
+  <classpathentry kind="src" path="lucene/queryparser/src/test"/>
+  <classpathentry kind="src" path="lucene/suggest/src/java"/>
+  <classpathentry kind="src" path="lucene/suggest/src/test"/>
+  <classpathentry kind="src" path="lucene/spatial/src/java"/>
+  <classpathentry kind="src" path="lucene/spatial/src/test"/>
+  <classpathentry kind="src" path="lucene/spatial/src/test-files"/>
+  <classpathentry kind="lib" path="lucene/spatial/lib/spatial4j-0.3.jar"/>
+  <classpathentry kind="src" path="solr/core/src/java"/>
+  <classpathentry kind="src" path="solr/core/src/test"/>
+  <classpathentry kind="src" path="solr/core/src/test-files"/>
+  <classpathentry kind="src" path="solr/solrj/src/java"/>
+  <classpathentry kind="src" path="solr/solrj/src/test"/>
+  <classpathentry kind="src" path="solr/solrj/src/test-files"/>
+  <classpathentry kind="src" path="solr/test-framework/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/clustering/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/clustering/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/clustering/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/extraction/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/langid/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
+  <classpathentry kind="src" path="solr/contrib/langid/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/uima/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
+  <classpathentry kind="src" path="solr/contrib/uima/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
+  <classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
+  <classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
+  <classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
+  <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
+  <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
+  <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
+  <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
+  <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.7.jar"/>
+  <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
+  <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
+  <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
+  <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.4.1.jar"/>
+  <classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
+  <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
+  <classpathentry kind="lib" path="solr/core/lib/commons-fileupload-1.2.1.jar"/>
+  <classpathentry kind="lib" path="solr/core/lib/commons-cli-1.2.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/httpclient-4.1.3.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/httpcore-4.1.4.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/httpmime-4.1.3.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/commons-io-2.1.jar"/>
+  <classpathentry kind="lib" path="solr/core/lib/commons-lang-2.6.jar"/>
+  <classpathentry kind="lib" path="solr/core/lib/easymock-2.2.jar"/>
+  <classpathentry kind="lib" path="solr/core/lib/guava-r05.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/jcl-over-slf4j-1.6.4.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/log4j-over-slf4j-1.6.4.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/slf4j-api-1.6.4.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/slf4j-jdk14-1.6.4.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/wstx-asl-3.2.7.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/zookeeper-3.3.6.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
@@ -133,47 +137,56 @@
   <classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.2.v20120308.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.2.v20120308.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/servlet-api-3.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.3.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.6.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.6.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.6.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8-beta5.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8-beta5.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta5.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-scratchpad-3.8-beta5.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/rome-0.9.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tagsoup-1.2.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/rome-0.9.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/tagsoup-1.2.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
   <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
   <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
-	<classpathentry kind="output" path="bin/other"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/icu4j-49.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/isoparser-1.0-RC-1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/jdom-1.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.7.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/juniversalchardet-1.0.3.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.7.0.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-schemas-3.8.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-scratchpad-3.8.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.2.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.2.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/vorbis-java-core-0.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/vorbis-java-tika-0.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/xercesImpl-2.9.1.jar"/>
+  <classpathentry kind="lib" path="solr/contrib/extraction/lib/xz-1.0.jar"/>
+  <classpathentry kind="output" path="eclipse-build/other"/>
 </classpath>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs Fri Sep 21 17:21:34 2012
@@ -1,9 +1,23 @@
-#Thu Jan 26 09:50:07 CET 2012
+#Wed Sep 19 20:37:34 EDT 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/ant.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/ant.xml Fri Sep 21 17:21:34 2012
@@ -2,15 +2,11 @@
 <project version="4">
   <component name="AntConfiguration">
     <buildFile url="file://$PROJECT_DIR$/build.xml" />
+
     <buildFile url="file://$PROJECT_DIR$/lucene/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/demo/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/highlighter/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/memory/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/misc/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/sandbox/build.xml" />
+
     <buildFile url="file://$PROJECT_DIR$/lucene/core/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
+
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/common/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/icu/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/kuromoji/build.xml" />
@@ -20,19 +16,31 @@
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/stempel/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/uima/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/benchmark/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/classification/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/codecs/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/demo/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/facet/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/grouping/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/highlighter/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/join/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/memory/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/misc/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/queries/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/queryparser/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/sandbox/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/spatial/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/suggest/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
+
     <buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
+
     <buildFile url="file://$PROJECT_DIR$/solr/core/build.xml" />
+
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/langid/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml Fri Sep 21 17:21:34 2012
@@ -2,7 +2,6 @@
   <library name="Ant">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/ant-1.8.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/ant-junit-1.8.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml Fri Sep 21 17:21:34 2012
@@ -1,9 +1,9 @@
-<component name="libraryTable">
-  <library name="HSQLDB">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
+<component name="libraryTable">
+  <library name="HSQLDB">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
 </component>
\ No newline at end of file

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml Fri Sep 21 17:21:34 2012
@@ -2,7 +2,7 @@
   <library name="JUnit">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/modules.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/modules.xml Fri Sep 21 17:21:34 2012
@@ -3,12 +3,11 @@
   <component name="ProjectModuleManager">
     <modules>
       <module filepath="$PROJECT_DIR$/parent.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/highlighter/highlighter.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/memory/memory.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/misc/misc.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/sandbox/sandbox.iml" />
+
+      <module filepath="$PROJECT_DIR$/lucene/core/src/java/lucene-core.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/core/src/resources/lucene-core-resources.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/core/src/test/lucene-core-tests.iml" />
+
       <module filepath="$PROJECT_DIR$/lucene/analysis/common/analysis-common.iml" />
       <module filepath="$PROJECT_DIR$/lucene/analysis/icu/icu.iml" />
       <module filepath="$PROJECT_DIR$/lucene/analysis/kuromoji/kuromoji.iml" />
@@ -17,23 +16,43 @@
       <module filepath="$PROJECT_DIR$/lucene/analysis/smartcn/smartcn.iml" />
       <module filepath="$PROJECT_DIR$/lucene/analysis/stempel/stempel.iml" />
       <module filepath="$PROJECT_DIR$/lucene/analysis/uima/analysis-uima.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/benchmark/benchmark.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/benchmark/src/benchmark.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/benchmark/conf/benchmark-conf.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/classification/classification.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/codecs/src/java/codecs.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/codecs/src/test/codecs-tests.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/codecs/src/resources/codecs-resources.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
       <module filepath="$PROJECT_DIR$/lucene/facet/facet.iml" />
       <module filepath="$PROJECT_DIR$/lucene/grouping/grouping.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/highlighter/highlighter.iml" />
       <module filepath="$PROJECT_DIR$/lucene/join/join.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/memory/memory.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/misc/misc.iml" />
       <module filepath="$PROJECT_DIR$/lucene/queries/queries.iml" />
       <module filepath="$PROJECT_DIR$/lucene/queryparser/queryparser.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/sandbox/sandbox.iml" />
       <module filepath="$PROJECT_DIR$/lucene/spatial/spatial.iml" />
       <module filepath="$PROJECT_DIR$/lucene/suggest/suggest.iml" />
-      <module filepath="$PROJECT_DIR$/solr/solr.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/test-framework/lucene-test-framework.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/tools/tools.iml" />
+
+      <module filepath="$PROJECT_DIR$/solr/core/src/java/solr-core.iml" />
+      <module filepath="$PROJECT_DIR$/solr/core/src/test/solr-core-tests.iml" />
+      <module filepath="$PROJECT_DIR$/solr/core/src/test-files/solr-core-test-files.iml" />
+
       <module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
+      <module filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />
+      <module filepath="$PROJECT_DIR$/solr/solrj/src/test/solrj-tests.iml" />
+      <module filepath="$PROJECT_DIR$/solr/solrj/src/test-files/solrj-test-files.iml" />
+      <module filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" />
     </modules>
   </component>
 </project>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/workspace.xml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/workspace.xml Fri Sep 21 17:21:34 2012
@@ -1,225 +1,242 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="RunManager" selected="JUnit.lucene">
+  <component name="RunManager" selected="JUnit.Lucene core">
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <option name="VM_PARAMETERS" value="-ea" />
     </configuration>
-    <configuration default="false" name="Lucene" type="JUnit" factoryName="JUnit">
-      <module name="lucene" />
+    <configuration default="false" name="Lucene core" type="JUnit" factoryName="JUnit">
+      <module name="lucene-core-tests" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/lucene-idea" />
-      <option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=temp" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/core" />
+      <option name="VM_PARAMETERS" value="-ea -Dlucene.version=5.0-SNAPSHOT -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">
       <module name="analysis-common" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-common" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/common" />
       <option name="VM_PARAMETERS" value="-ea  -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-icu" type="JUnit" factoryName="JUnit">
       <module name="icu" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-icu" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/icu" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-kuromoji" type="JUnit" factoryName="JUnit">
       <module name="kuromoji" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-kuromoji-idea" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/kuromoji" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-morfologik" type="JUnit" factoryName="JUnit">
       <module name="morfologik" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-morfologik" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/morfologik" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-phonetic" type="JUnit" factoryName="JUnit">
       <module name="phonetic" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-phonetic" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/phonetic" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-smartcn" type="JUnit" factoryName="JUnit">
       <module name="smartcn" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-smartcn" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/smartcn" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-stempel" type="JUnit" factoryName="JUnit">
       <module name="stempel" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-stempel" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/stempel" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-uima" type="JUnit" factoryName="JUnit">
       <module name="analysis-uima" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-uima" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/uima" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module benchmark" type="JUnit" factoryName="JUnit">
       <module name="benchmark" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/benchmark" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/benchmark" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module classification" type="JUnit" factoryName="JUnit">
+      <module name="classification" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/classification" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module codecs" type="JUnit" factoryName="JUnit">
+      <module name="codecs-tests" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/codecs" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-      <method>
-        <option name="AntTarget" enabled="true" target="copy-alg-files-for-testing"
-                antfile="file://$PROJECT_DIR$/lucene/benchmark/build.xml" />
-      </method>
     </configuration>
     <configuration default="false" name="Module facet" type="JUnit" factoryName="JUnit">
       <module name="facet" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/facet" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/facet" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module grouping" type="JUnit" factoryName="JUnit">
       <module name="grouping" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/grouping" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/grouping" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module highlighter" type="JUnit" factoryName="JUnit">
       <module name="highlighter" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/highlighter" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/highlighter" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module join" type="JUnit" factoryName="JUnit">
       <module name="join" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/join" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/join" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module memory" type="JUnit" factoryName="JUnit">
       <module name="memory" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/memory" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/memory" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module misc" type="JUnit" factoryName="JUnit">
       <module name="misc" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/misc" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/misc" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module queries" type="JUnit" factoryName="JUnit">
       <module name="queries" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/queries" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/queries" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module queryparser" type="JUnit" factoryName="JUnit">
       <module name="queryparser" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/queries" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/queries" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module sandbox" type="JUnit" factoryName="JUnit">
       <module name="sandbox" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/sandbox" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/sandbox" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module spatial" type="JUnit" factoryName="JUnit">
       <module name="spatial" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/spatial" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/spatial" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module suggest" type="JUnit" factoryName="JUnit">
       <module name="suggest" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/suggest" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/suggest" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="Solr" type="JUnit" factoryName="JUnit">
-      <module name="solr" />
+    <configuration default="false" name="Solr core" type="JUnit" factoryName="JUnit">
+      <module name="solr-core-tests" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-core" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=5.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Solrj" type="JUnit" factoryName="JUnit">
+      <module name="solrj-tests" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/solr-idea" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-solrj" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=5.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr analysis-extras contrib" type="JUnit" factoryName="JUnit">
       <module name="analysis-extras" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-analysis-extras" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-analysis-extras" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=5.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr clustering contrib" type="JUnit" factoryName="JUnit">
       <module name="clustering" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-clustering" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-clustering" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=5.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr dataimporthandler contrib" type="JUnit" factoryName="JUnit">
       <module name="dataimporthandler" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-dataimporthandler" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-dataimporthandler" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr dataimporthandler-extras contrib" type="JUnit" factoryName="JUnit">
       <module name="dataimporthandler-extras" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-dataimporthandler-extras" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-dataimporthandler-extras" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr extraction contrib" type="JUnit" factoryName="JUnit">
       <module name="extraction" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-cell" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-cell" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr langid contrib" type="JUnit" factoryName="JUnit">
       <module name="langid" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-langid" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-langid" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr uima contrib" type="JUnit" factoryName="JUnit">
       <module name="uima" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-uima" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-uima" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=5.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr velocity contrib" type="JUnit" factoryName="JUnit">
       <module name="velocity" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-velocity" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-velocity" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <list size="30">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.Lucene" />
+    <list size="33">
+      <item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" />
       <item index="3" class="java.lang.String" itemvalue="JUnit.Module analyzers-kuromoji" />
@@ -229,26 +246,29 @@
       <item index="7" class="java.lang.String" itemvalue="JUnit.Module analyzers-stempel" />
       <item index="8" class="java.lang.String" itemvalue="JUnit.Module analyzers-uima" />
       <item index="9" class="java.lang.String" itemvalue="JUnit.Module benchmark" />
-      <item index="10" class="java.lang.String" itemvalue="JUnit.Module facet" />
-      <item index="11" class="java.lang.String" itemvalue="JUnit.Module grouping" />
-      <item index="12" class="java.lang.String" itemvalue="JUnit.Module highlighter" />
-      <item index="13" class="java.lang.String" itemvalue="JUnit.Module join" />
-      <item index="14" class="java.lang.String" itemvalue="JUnit.Module memory" />
-      <item index="15" class="java.lang.String" itemvalue="JUnit.Module misc" />
-      <item index="16" class="java.lang.String" itemvalue="JUnit.Module queries" />
-      <item index="17" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
-      <item index="18" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
-      <item index="19" class="java.lang.String" itemvalue="JUnit.Module spatial" />
-      <item index="20" class="java.lang.String" itemvalue="JUnit.Module suggest" />
-      <item index="21" class="java.lang.String" itemvalue="JUnit.Solr" />
-      <item index="22" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
-      <item index="23" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
-      <item index="24" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
-      <item index="25" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
-      <item index="26" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
-      <item index="27" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
-      <item index="28" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
-      <item index="29" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
+      <item index="10" class="java.lang.String" itemvalue="JUnit.Module classification" />
+      <item index="11" class="java.lang.String" itemvalue="JUnit.Module codecs" />
+      <item index="12" class="java.lang.String" itemvalue="JUnit.Module facet" />
+      <item index="13" class="java.lang.String" itemvalue="JUnit.Module grouping" />
+      <item index="14" class="java.lang.String" itemvalue="JUnit.Module highlighter" />
+      <item index="15" class="java.lang.String" itemvalue="JUnit.Module join" />
+      <item index="16" class="java.lang.String" itemvalue="JUnit.Module memory" />
+      <item index="17" class="java.lang.String" itemvalue="JUnit.Module misc" />
+      <item index="18" class="java.lang.String" itemvalue="JUnit.Module queries" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
+      <item index="21" class="java.lang.String" itemvalue="JUnit.Module spatial" />
+      <item index="22" class="java.lang.String" itemvalue="JUnit.Module suggest" />
+      <item index="23" class="java.lang.String" itemvalue="JUnit.Solr core" />
+      <item index="24" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
+      <item index="25" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
+      <item index="26" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
+      <item index="27" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
+      <item index="28" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
+      <item index="29" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
+      <item index="30" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
+      <item index="31" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
+      <item index="32" class="java.lang.String" itemvalue="JUnit.Solrj" />
     </list>
   </component>
 </project>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/common/analysis-common.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/common/analysis-common.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/common/analysis-common.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/common/analysis-common.iml Fri Sep 21 17:21:34 2012
@@ -1,8 +1,8 @@
 <?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/analysis/analyzers-common/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-common/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/common/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/common/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -13,6 +13,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/icu/icu.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/icu/icu.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/icu/icu.iml Fri Sep 21 17:21:34 2012
@@ -1,8 +1,8 @@
 <?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/analysis/analyzers-icu/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-icu/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/icu/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/icu/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -23,7 +23,8 @@
       </library>
     </orderEntry>
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml Fri Sep 21 17:21:34 2012
@@ -1,8 +1,8 @@
 <?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/analysis/analyzers-kuromoji-idea/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-kuromoji-idea/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/kuromoji/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/kuromoji/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -15,7 +15,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="ICU library" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml Fri Sep 21 17:21:34 2012
@@ -1,11 +1,12 @@
 <?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/analysis/analyzers-morfologik/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-morfologik/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/morfologik/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/morfologik/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -21,7 +22,8 @@
       </library>
     </orderEntry>
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml Fri Sep 21 17:21:34 2012
@@ -1,11 +1,12 @@
 <?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/analysis/analyzers-phonetic/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-phonetic/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/phonetic/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/phonetic/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -21,7 +22,8 @@
       </library>
     </orderEntry>
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml Fri Sep 21 17:21:34 2012
@@ -1,8 +1,8 @@
 <?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/analysis/analyzers-smartcn/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-smartcn/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/smartcn/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/smartcn/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -12,7 +12,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/stempel/stempel.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/stempel/stempel.iml?rev=1388574&r1=1388573&r2=1388574&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/stempel/stempel.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/analysis/stempel/stempel.iml Fri Sep 21 17:21:34 2012
@@ -1,8 +1,8 @@
 <?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/analysis/analyzers-stempel/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-stempel/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/stempel/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/stempel/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
@@ -12,7 +12,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene" />
+    <orderEntry type="module" module-name="lucene-core" />
   </component>
 </module>