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/09 10:21:39 UTC
svn commit: r1382419 - in /lucene/dev/trunk: dev-tools/idea/
dev-tools/idea/.idea/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/ dev-tools/idea/lucene/analysis/common/
dev-tools/idea/lucene/analysis/icu/
dev-tools/idea/lucene/analysis/kuromoji...
Author: sarowe
Date: Sun Sep 9 08:21:36 2012
New Revision: 1382419
URL: http://svn.apache.org/viewvc?rev=1382419&view=rev
Log:
LUCENE-4367: Fix the IntelliJ configuration by splitting up modules with circular dependencies
Added:
lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_core_library.xml (contents, props changed)
- copied, changed from r1382017, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_library.xml
lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_library.xml (with props)
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml
- copied, changed from r1382017, lucene/dev/trunk/dev-tools/idea/lucene/codecs/codecs.iml
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml (with props)
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml (with props)
lucene/dev/trunk/dev-tools/idea/lucene/core/
lucene/dev/trunk/dev-tools/idea/lucene/core/src/
lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/
lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml
- copied, changed from r1382017, lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml
lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/
lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml (with props)
lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/
lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
- copied, changed from r1382017, lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml
lucene/dev/trunk/dev-tools/idea/lucene/test-framework/
lucene/dev/trunk/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml (with props)
lucene/dev/trunk/dev-tools/idea/lucene/tools/
lucene/dev/trunk/dev-tools/idea/lucene/tools/tools.iml (with props)
lucene/dev/trunk/dev-tools/idea/solr/core/
lucene/dev/trunk/dev-tools/idea/solr/core/src/
lucene/dev/trunk/dev-tools/idea/solr/core/src/java/
lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml
- copied, changed from r1382017, lucene/dev/trunk/dev-tools/idea/solr/solr.iml
lucene/dev/trunk/dev-tools/idea/solr/core/src/test/
lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/
lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml (with props)
lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
- copied, changed from r1382017, lucene/dev/trunk/dev-tools/idea/solr/solr.iml
lucene/dev/trunk/dev-tools/idea/solr/solrj/
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml (with props)
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml (with props)
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml (with props)
lucene/dev/trunk/dev-tools/idea/solr/test-framework/
lucene/dev/trunk/dev-tools/idea/solr/test-framework/solr-test-framework.iml (with props)
Removed:
lucene/dev/trunk/dev-tools/idea/.idea/libraries/Lucene_tools_library.xml
lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_library.xml
lucene/dev/trunk/dev-tools/idea/lucene/codecs/codecs.iml
lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml
lucene/dev/trunk/dev-tools/idea/solr/solr.iml
Modified:
lucene/dev/trunk/dev-tools/idea/.idea/ant.xml
lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/common/analysis-common.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/icu/icu.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/stempel/stempel.iml
lucene/dev/trunk/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
lucene/dev/trunk/dev-tools/idea/lucene/benchmark/benchmark.iml
lucene/dev/trunk/dev-tools/idea/lucene/demo/demo.iml
lucene/dev/trunk/dev-tools/idea/lucene/facet/facet.iml
lucene/dev/trunk/dev-tools/idea/lucene/grouping/grouping.iml
lucene/dev/trunk/dev-tools/idea/lucene/highlighter/highlighter.iml
lucene/dev/trunk/dev-tools/idea/lucene/join/join.iml
lucene/dev/trunk/dev-tools/idea/lucene/memory/memory.iml
lucene/dev/trunk/dev-tools/idea/lucene/misc/misc.iml
lucene/dev/trunk/dev-tools/idea/lucene/queries/queries.iml
lucene/dev/trunk/dev-tools/idea/lucene/queryparser/queryparser.iml
lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml
lucene/dev/trunk/dev-tools/idea/lucene/spatial/spatial.iml
lucene/dev/trunk/dev-tools/idea/lucene/suggest/suggest.iml
lucene/dev/trunk/dev-tools/idea/parent.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml
lucene/dev/trunk/lucene/codecs/src/java/ (props changed)
lucene/dev/trunk/lucene/codecs/src/resources/ (props changed)
lucene/dev/trunk/lucene/codecs/src/test/ (props changed)
lucene/dev/trunk/lucene/core/src/java/ (props changed)
lucene/dev/trunk/lucene/core/src/resources/ (props changed)
lucene/dev/trunk/lucene/core/src/test/ (props changed)
lucene/dev/trunk/lucene/tools/ (props changed)
lucene/dev/trunk/solr/core/src/java/ (props changed)
lucene/dev/trunk/solr/core/src/test/ (props changed)
lucene/dev/trunk/solr/core/src/test-files/ (props changed)
lucene/dev/trunk/solr/solrj/src/java/ (props changed)
lucene/dev/trunk/solr/solrj/src/test/ (props changed)
lucene/dev/trunk/solr/solrj/src/test-files/ (props changed)
lucene/dev/trunk/solr/test-framework/ (props changed)
Modified: lucene/dev/trunk/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/ant.xml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/ant.xml Sun Sep 9 08:21:36 2012
@@ -21,6 +21,7 @@
<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/codecs/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/join/build.xml" />
Copied: lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_core_library.xml (from r1382017, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_library.xml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_core_library.xml?p2=lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_core_library.xml&p1=lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_library.xml&r1=1382017&r2=1382419&rev=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_library.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_core_library.xml Sun Sep 9 08:21:36 2012
@@ -1,10 +1,10 @@
<component name="libraryTable">
- <library name="Solr library">
+ <library name="Solr core library">
<CLASSES>
- <root url="file://$PROJECT_DIR$/solr/lib" />
+ <root url="file://$PROJECT_DIR$/solr/core/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
- <jarDirectory url="file://$PROJECT_DIR$/solr/lib" recursive="false" />
+ <jarDirectory url="file://$PROJECT_DIR$/solr/core/lib" recursive="false" />
</library>
</component>
\ No newline at end of file
Added: lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_library.xml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_library.xml (added)
+++ lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_library.xml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="Solrj library">
+ <CLASSES>
+ <root url="file://$PROJECT_DIR$/solr/solrj/lib" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ <jarDirectory url="file://$PROJECT_DIR$/solr/solrj/lib" recursive="true" />
+ </library>
+</component>
\ No newline at end of file
Modified: lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/modules.xml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/modules.xml Sun Sep 9 08:21:36 2012
@@ -3,13 +3,11 @@
<component name="ProjectModuleManager">
<modules>
<module filepath="$PROJECT_DIR$/parent.iml" />
- <module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
- <module filepath="$PROJECT_DIR$/lucene/codecs/codecs.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" />
@@ -19,22 +17,40 @@
<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/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/trunk/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Sun Sep 9 08:21:36 2012
@@ -1,14 +1,14 @@
<?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$/lucene/build/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">
@@ -79,7 +79,7 @@
</method>
</configuration>
<configuration default="false" name="Module codecs" type="JUnit" factoryName="JUnit">
- <module name="facet" />
+ <module name="codecs-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/codecs" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
@@ -162,25 +162,32 @@
<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$/solr/build/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$/solr/build/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="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="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">
@@ -215,7 +222,7 @@
<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="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">
@@ -225,8 +232,8 @@
<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="32">
+ <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" />
@@ -236,26 +243,28 @@
<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 codecs" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.Module facet" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.Module grouping" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.Module highlighter" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.Module join" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.Module memory" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.Module misc" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.Module queries" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.Module spatial" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.Module suggest" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.Solr core" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
+ <item index="30" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
+ <item index="31" class="java.lang.String" itemvalue="JUnit.Solrj" />
</list>
</component>
</project>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/analysis/common/analysis-common.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/common/analysis-common.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/common/analysis-common.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/common/analysis-common.iml Sun Sep 9 08:21:36 2012
@@ -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/trunk/dev-tools/idea/lucene/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/icu/icu.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/icu/icu.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/icu/icu.iml Sun Sep 9 08:21:36 2012
@@ -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/trunk/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml Sun Sep 9 08:21:36 2012
@@ -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/trunk/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml Sun Sep 9 08:21:36 2012
@@ -22,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/trunk/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml Sun Sep 9 08:21:36 2012
@@ -22,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/trunk/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml Sun Sep 9 08:21:36 2012
@@ -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/trunk/dev-tools/idea/lucene/analysis/stempel/stempel.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/stempel/stempel.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/stempel/stempel.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/stempel/stempel.iml Sun Sep 9 08:21:36 2012
@@ -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/trunk/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml Sun Sep 9 08:21:36 2012
@@ -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/trunk/dev-tools/idea/lucene/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/benchmark/benchmark.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/benchmark/benchmark.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/benchmark/benchmark.iml Sun Sep 9 08:21:36 2012
@@ -24,13 +24,14 @@
</orderEntry>
<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="facet" />
<orderEntry type="module" module-name="highlighter" />
<orderEntry type="module" module-name="icu" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="memory" />
<orderEntry type="module" module-name="analysis-common" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
</component>
</module>
Copied: lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml (from r1382017, lucene/dev/trunk/dev-tools/idea/lucene/codecs/codecs.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml?p2=lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml&p1=lucene/dev/trunk/dev-tools/idea/lucene/codecs/codecs.iml&r1=1382017&r2=1382419&rev=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/codecs/codecs.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml Sun Sep 9 08:21:36 2012
@@ -1,16 +1,15 @@
<?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$/../../../build/codecs/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../build/codecs/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
</content>
<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" module-name="codecs-resources" />
+ <orderEntry type="module" module-name="lucene-core" />
</component>
</module>
Added: lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,13 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
Added: lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,18 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
+ </content>
+ <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" scope="TEST" module-name="codecs" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-core" />
+ </component>
+</module>
+
Copied: lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml (from r1382017, lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml?p2=lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml&p1=lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml&r1=1382017&r2=1382419&rev=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml Sun Sep 9 08:21:36 2012
@@ -1,24 +1,15 @@
<?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/lucene-idea/classes/java" />
- <output-test url="file://$MODULE_DIR$/build/lucene-idea/classes/test" />
+ <output url="file://$MODULE_DIR$/../../../build/core/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../build/core/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/test-framework/src/resources" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/tools/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/dist" />
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Lucene tools library" level="project" />
- <orderEntry type="library" name="Ant" level="project"/>
+ <orderEntry type="module" module-name="lucene-core-resources" />
</component>
</module>
Added: lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,13 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
Copied: lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml (from r1382017, lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml?p2=lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml&p1=lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml&r1=1382017&r2=1382419&rev=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml Sun Sep 9 08:21:36 2012
@@ -1,24 +1,18 @@
<?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/lucene-idea/classes/java" />
- <output-test url="file://$MODULE_DIR$/build/lucene-idea/classes/test" />
+ <output url="file://$MODULE_DIR$/../../../build/core/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../build/core/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/test-framework/src/resources" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/tools/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/dist" />
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Lucene tools library" level="project" />
- <orderEntry type="library" name="Ant" level="project"/>
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="codecs" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-core" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/demo/demo.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/demo/demo.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/demo/demo.iml Sun Sep 9 08:21:36 2012
@@ -12,6 +12,7 @@
<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-library">
<library>
<CLASSES>
@@ -22,7 +23,7 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="analysis-common" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/facet/facet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/facet/facet.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/facet/facet.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/facet/facet.iml Sun Sep 9 08:21:36 2012
@@ -13,7 +13,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/trunk/dev-tools/idea/lucene/grouping/grouping.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/grouping/grouping.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/grouping/grouping.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/grouping/grouping.iml Sun Sep 9 08:21:36 2012
@@ -11,7 +11,8 @@
<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" />
<orderEntry type="module" module-name="queries" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/highlighter/highlighter.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/highlighter/highlighter.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/highlighter/highlighter.iml Sun Sep 9 08:21:36 2012
@@ -11,8 +11,9 @@
<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="memory" />
<orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/join/join.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/join/join.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/join/join.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/join/join.iml Sun Sep 9 08:21:36 2012
@@ -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="grouping" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/memory/memory.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/memory/memory.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/memory/memory.iml Sun Sep 9 08:21:36 2012
@@ -11,8 +11,9 @@
<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="misc" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/misc/misc.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/misc/misc.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/misc/misc.iml Sun Sep 9 08:21:36 2012
@@ -11,6 +11,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/trunk/dev-tools/idea/lucene/queries/queries.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/queries/queries.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/queries/queries.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/queries/queries.iml Sun Sep 9 08:21:36 2012
@@ -12,6 +12,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/trunk/dev-tools/idea/lucene/queryparser/queryparser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/queryparser/queryparser.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/queryparser/queryparser.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/queryparser/queryparser.iml Sun Sep 9 08:21:36 2012
@@ -13,7 +13,8 @@
<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" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="sandbox" />
</component>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml Sun Sep 9 08:21:36 2012
@@ -20,7 +20,8 @@
</library>
</orderEntry>
<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/trunk/dev-tools/idea/lucene/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/spatial/spatial.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/spatial/spatial.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/spatial/spatial.iml Sun Sep 9 08:21:36 2012
@@ -22,7 +22,8 @@
</library>
</orderEntry>
<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" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="analysis-common" scope="TEST"/>
</component>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/suggest/suggest.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/suggest/suggest.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/suggest/suggest.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/suggest/suggest.iml Sun Sep 9 08:21:36 2012
@@ -11,6 +11,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>
Added: lucene/dev/trunk/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,17 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="codecs" />
+ <orderEntry type="module" module-name="lucene-core" />
+ </component>
+</module>
Added: lucene/dev/trunk/dev-tools/idea/lucene/tools/tools.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/tools/tools.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/tools/tools.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/lucene/tools/tools.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,24 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Ant" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/lib" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ <jarDirectory url="file://$MODULE_DIR$/lib" recursive="true" />
+ </library>
+ </orderEntry>
+ </component>
+</module>
Modified: lucene/dev/trunk/dev-tools/idea/parent.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/parent.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/parent.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/parent.iml Sun Sep 9 08:21:36 2012
@@ -4,6 +4,11 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.idea" />
<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$/solr/build" />
+ <excludeFolder url="file://$MODULE_DIR$/solr/dist" />
+ <excludeFolder url="file://$MODULE_DIR$/solr/package" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Sun Sep 9 08:21:36 2012
@@ -21,15 +21,19 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Morfologik library" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" module-name="morfologik" />
<orderEntry type="module" module-name="icu" />
<orderEntry type="module" module-name="smartcn" />
- <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
<orderEntry type="module" module-name="stempel" />
<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/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml Sun Sep 9 08:21:36 2012
@@ -21,17 +21,21 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH 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" scope="TEST" module-name="solr-test-framework" />
<orderEntry type="module" module-name="highlighter" />
<orderEntry type="module" module-name="memory" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="phonetic" />
- <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
<orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="suggest" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="analysis-common" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Sun Sep 9 08:21:36 2012
@@ -12,12 +12,15 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
- <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
<orderEntry type="module" module-name="dataimporthandler" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Sun Sep 9 08:21:36 2012
@@ -14,10 +14,14 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" scope="TEST" name="HSQLDB" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
- <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
<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/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml Sun Sep 9 08:21:36 2012
@@ -12,9 +12,13 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
+ <orderEntry type="module" module-name="lucene-core" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml Sun Sep 9 08:21:36 2012
@@ -13,7 +13,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
<orderEntry type="module-library">
<library>
@@ -25,7 +26,9 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml Sun Sep 9 08:21:36 2012
@@ -13,7 +13,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -24,8 +25,11 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="analysis-uima" />
<orderEntry type="module" module-name="analysis-common" />
</component>
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml?rev=1382419&r1=1382418&r2=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml Sun Sep 9 08:21:36 2012
@@ -12,10 +12,13 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr velocity library" level="project" />
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="solrj" />
</component>
</module>
Copied: lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml (from r1382017, lucene/dev/trunk/dev-tools/idea/solr/solr.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml?p2=lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml&p1=lucene/dev/trunk/dev-tools/idea/solr/solr.iml&r1=1382017&r2=1382419&rev=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml Sun Sep 9 08:21:36 2012
@@ -1,26 +1,18 @@
<?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-idea/classes/java" />
- <output-test url="file://$MODULE_DIR$/build/solr-idea/classes/test" />
+ <output url="file://$MODULE_DIR$/../../../build/solr-core/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../build/solr-core/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/solrj/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/test-files" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/solrj/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/solrj/src/test-files" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/dist" />
- <excludeFolder url="file://$MODULE_DIR$/package" />
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr example library" level="project" />
+ <orderEntry type="module" module-name="solrj" />
<orderEntry type="module" module-name="kuromoji" />
<orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="grouping" />
@@ -31,7 +23,7 @@
<orderEntry type="module" module-name="phonetic" />
<orderEntry type="module" module-name="suggest" />
<orderEntry type="module" module-name="analysis-common" />
- <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
</component>
</module>
Added: lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,13 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
Copied: lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml (from r1382017, lucene/dev/trunk/dev-tools/idea/solr/solr.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml?p2=lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml&p1=lucene/dev/trunk/dev-tools/idea/solr/solr.iml&r1=1382017&r2=1382419&rev=1382419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml Sun Sep 9 08:21:36 2012
@@ -1,37 +1,29 @@
<?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-idea/classes/java" />
- <output-test url="file://$MODULE_DIR$/build/solr-idea/classes/test" />
+ <output url="file://$MODULE_DIR$/../../../build/solr-core/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../build/solr-core/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/solrj/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/test-files" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/solrj/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/solrj/src/test-files" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/dist" />
- <excludeFolder url="file://$MODULE_DIR$/package" />
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr library" level="project" />
- <orderEntry type="library" name="Solr example library" level="project" />
- <orderEntry type="module" module-name="kuromoji" />
- <orderEntry type="module" module-name="spatial" />
- <orderEntry type="module" module-name="grouping" />
- <orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="icu" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="phonetic" />
- <orderEntry type="module" module-name="suggest" />
- <orderEntry type="module" module-name="analysis-common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queryparser" />
+ <orderEntry type="library" scope="TEST" name="Solr core library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solrj library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
+ <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="solr-core-test-files" />
+ <orderEntry type="module" scope="TEST" module-name="solr-core" />
+ <orderEntry type="module" scope="TEST" module-name="solrj" />
+ <orderEntry type="module" scope="TEST" module-name="lucene-core" />
+ <orderEntry type="module" scope="TEST" module-name="analysis-common" />
+ <orderEntry type="module" scope="TEST" module-name="queryparser" />
+ <orderEntry type="module" scope="TEST" module-name="queries" />
+ <orderEntry type="module" scope="TEST" module-name="suggest" />
+ <orderEntry type="module" scope="TEST" module-name="spatial" />
+ <orderEntry type="module" scope="TEST" module-name="misc" />
</component>
</module>
Added: lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,14 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Solrj library" level="project" />
+ </component>
+</module>
Added: lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,13 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
Added: lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,21 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr core library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solrj library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
+ <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="solr-core" />
+ </component>
+</module>
Added: lucene/dev/trunk/dev-tools/idea/solr/test-framework/solr-test-framework.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/test-framework/solr-test-framework.iml?rev=1382419&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/test-framework/solr-test-framework.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/test-framework/solr-test-framework.iml Sun Sep 9 08:21:36 2012
@@ -0,0 +1,23 @@
+<?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" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="JUnit" level="project" />
+ <orderEntry type="library" name="Solr core library" level="project" />
+ <orderEntry type="library" name="Solr example library" level="project" />
+ <orderEntry type="library" name="Solrj library" level="project" />
+ <orderEntry type="module" module-name="lucene-test-framework" />
+ <orderEntry type="module" module-name="analysis-common" />
+ <orderEntry type="module" module-name="solrj" />
+ <orderEntry type="module" module-name="solr-core" />
+ <orderEntry type="module" module-name="lucene-core" />
+ </component>
+</module>