You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/09/14 01:41:43 UTC

svn commit: r1384601 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/idea/ dev-tools/idea/.idea/ dev-tools/idea/lucene/analysis/common/ dev-tools/idea/lucene/analysis/icu/ dev-tools/idea/lucene/analysis/kuromoji/ dev-tools/idea/lucene/anal...

Author: sarowe
Date: Thu Sep 13 23:41:41 2012
New Revision: 1384601

URL: http://svn.apache.org/viewvc?rev=1384601&view=rev
Log:
LUCENE-4385: Move IntelliJ build output directories and test working directories to top-level directory idea-build/ (merged trunk r1384588)

Added:
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/conf/
      - copied from r1384588, lucene/dev/trunk/dev-tools/idea/lucene/benchmark/conf/
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/conf/benchmark-conf.iml
      - copied unchanged from r1384588, lucene/dev/trunk/dev-tools/idea/lucene/benchmark/conf/benchmark-conf.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/
      - copied from r1384588, lucene/dev/trunk/dev-tools/idea/lucene/benchmark/src/
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/benchmark.iml
      - copied unchanged from r1384588, lucene/dev/trunk/dev-tools/idea/lucene/benchmark/src/benchmark.iml
Removed:
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/benchmark.iml
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/build.xml
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/common/analysis-common.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/icu/icu.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/stempel/stempel.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/codecs.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/lucene-core.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/demo/demo.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/grouping/grouping.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/highlighter/highlighter.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/join/join.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/memory/memory.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/misc/misc.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queries/queries.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queryparser/queryparser.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/sandbox/sandbox.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/suggest/suggest.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/tools.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/extraction/extraction.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/langid/langid.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/uima/uima.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/velocity/velocity.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/solr-core.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/solrj.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/solr-test-framework.iml
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)

Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Thu Sep 13 23:41:41 2012
@@ -202,6 +202,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">

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml Thu Sep 13 23:41:41 2012
@@ -16,7 +16,6 @@
     <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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml Thu Sep 13 23:41:41 2012
@@ -16,7 +16,8 @@
       <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/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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml Thu Sep 13 23:41:41 2012
@@ -7,228 +7,224 @@
     <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/core" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/core" />
       <option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.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>
-      <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 codecs" type="JUnit" factoryName="JUnit">
       <module name="codecs-tests" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/codecs" />
+      <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>
     </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 core" type="JUnit" factoryName="JUnit">
       <module name="solr-core-tests" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/solr-core" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-core" />
       <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="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-solrj" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-solrj" />
       <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="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="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/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="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="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/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="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="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/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="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>

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/common/analysis-common.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/common/analysis-common.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/common/analysis-common.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/common/analysis-common.iml Thu Sep 13 23:41:41 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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/icu/icu.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/icu/icu.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/icu/icu.iml Thu Sep 13 23:41:41 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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml Thu Sep 13 23:41:41 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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml Thu Sep 13 23:41:41 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-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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml Thu Sep 13 23:41:41 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-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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml Thu Sep 13 23:41:41 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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/stempel/stempel.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/stempel/stempel.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/stempel/stempel.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/stempel/stempel.iml Thu Sep 13 23:41:41 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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml Thu Sep 13 23:41:41 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-uima/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-uima/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/uima/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/uima/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/codecs.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/codecs.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/codecs.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/codecs.iml Thu Sep 13 23:41:41 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/codecs/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/codecs/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml Thu Sep 13 23:41:41 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/codecs/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/codecs/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml Thu Sep 13 23:41:41 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/codecs/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/codecs/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/lucene-core.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/lucene-core.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/lucene-core.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/lucene-core.iml Thu Sep 13 23:41:41 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/core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml Thu Sep 13 23:41:41 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/core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml Thu Sep 13 23:41:41 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/core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/demo/demo.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/demo/demo.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/demo/demo.iml Thu Sep 13 23:41:41 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/demo/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/demo/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/demo/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/demo/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml Thu Sep 13 23:41:41 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/facet/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/facet/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/facet/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/facet/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/grouping/grouping.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/grouping/grouping.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/grouping/grouping.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/grouping/grouping.iml Thu Sep 13 23:41:41 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/grouping/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/grouping/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/grouping/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/grouping/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/highlighter/highlighter.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/highlighter/highlighter.iml Thu Sep 13 23:41:41 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/highlighter/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/highlighter/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/highlighter/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/highlighter/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/join/join.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/join/join.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/join/join.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/join/join.iml Thu Sep 13 23:41:41 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/join/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/join/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/join/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/join/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/memory/memory.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/memory/memory.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/memory/memory.iml Thu Sep 13 23:41:41 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/memory/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/memory/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/memory/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/memory/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/misc/misc.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/misc/misc.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/misc/misc.iml Thu Sep 13 23:41:41 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/misc/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/misc/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/misc/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/misc/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queries/queries.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queries/queries.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queries/queries.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queries/queries.iml Thu Sep 13 23:41:41 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/queries/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/queries/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/queries/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/queries/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queryparser/queryparser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queryparser/queryparser.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queryparser/queryparser.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/queryparser/queryparser.iml Thu Sep 13 23:41:41 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/queryparser/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/queryparser/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/queryparser/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/queryparser/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/sandbox/sandbox.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/sandbox/sandbox.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/sandbox/sandbox.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/sandbox/sandbox.iml Thu Sep 13 23:41:41 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/sandbox/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/sandbox/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/sandbox/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/sandbox/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml Thu Sep 13 23:41:41 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/spatial/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/spatial/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/spatial/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/spatial/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/suggest/suggest.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/suggest/suggest.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/suggest/suggest.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/suggest/suggest.iml Thu Sep 13 23:41:41 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/suggest/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/suggest/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/suggest/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/suggest/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml Thu Sep 13 23:41:41 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/test-framework/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/test-framework/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/test-framework/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/test-framework/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/tools.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/tools.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/tools.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/tools.iml Thu Sep 13 23:41:41 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/tools/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/tools/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/lucene/tools/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/lucene/tools/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml Thu Sep 13 23:41:41 2012
@@ -6,6 +6,8 @@
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/lucene/build" />
       <excludeFolder url="file://$MODULE_DIR$/lucene/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/lucene/benchmark/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/lucene/benchmark/work" />
       <excludeFolder url="file://$MODULE_DIR$/solr/build" />
       <excludeFolder url="file://$MODULE_DIR$/solr/dist" />
       <excludeFolder url="file://$MODULE_DIR$/solr/package" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Thu Sep 13 23:41:41 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/contrib/solr-analysis-extras/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-analysis-extras/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-analysis-extras/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-analysis-extras/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml Thu Sep 13 23:41:41 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/contrib/solr-clustering/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-clustering/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-clustering/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-clustering/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Thu Sep 13 23:41:41 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/contrib/solr-dataimporthandler-extras/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler-extras/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-dataimporthandler-extras/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-dataimporthandler-extras/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Thu Sep 13 23:41:41 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/contrib/solr-dataimporthandler/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-dataimporthandler/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-dataimporthandler/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/extraction/extraction.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/extraction/extraction.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/extraction/extraction.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/extraction/extraction.iml Thu Sep 13 23:41:41 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/contrib/solr-cell/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-cell/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-cell/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-cell/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/langid/langid.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/langid/langid.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/langid/langid.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/langid/langid.iml Thu Sep 13 23:41:41 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/contrib/solr-langid/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-langid/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-langid/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-langid/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/uima/uima.iml Thu Sep 13 23:41:41 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/contrib/solr-uima/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-uima/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-uima/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-uima/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/velocity/velocity.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/velocity/velocity.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/velocity/velocity.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/velocity/velocity.iml Thu Sep 13 23:41:41 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/contrib/solr-velocity/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-velocity/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-velocity/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-velocity/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/solr-core.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/solr-core.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/solr-core.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/solr-core.iml Thu Sep 13 23:41:41 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/solr-core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/solr-core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml Thu Sep 13 23:41:41 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/solr-core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/solr-core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test/solr-core-tests.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test/solr-core-tests.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test/solr-core-tests.iml Thu Sep 13 23:41:41 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/solr-core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/solr-core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/solrj.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/solrj.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/solrj.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/solrj.iml Thu Sep 13 23:41:41 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/solr-solrj/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/solr-solrj/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml Thu Sep 13 23:41:41 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/solr-solrj/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/solr-solrj/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml Thu Sep 13 23:41:41 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/solr-solrj/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../build/solr-solrj/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
@@ -16,6 +16,7 @@
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solrj" />
+    <orderEntry type="module" scope="TEST" module-name="solrj-test-files" />
     <orderEntry type="module" scope="TEST" module-name="solr-core" />
   </component>
 </module>

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/solr-test-framework.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/solr-test-framework.iml?rev=1384601&r1=1384600&r2=1384601&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/solr-test-framework.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/solr-test-framework.iml Thu Sep 13 23:41:41 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/solr-test-framework/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/solr-test-framework/classes/test" />
+    <output url="file://$MODULE_DIR$/../../idea-build/solr/solr-test-framework/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../idea-build/solr/solr-test-framework/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />