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 11:09:15 UTC
svn commit: r1382429 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
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/id...
Author: sarowe
Date: Sun Sep 9 09:09:11 2012
New Revision: 1382429
URL: http://svn.apache.org/viewvc?rev=1382429&view=rev
Log:
LUCENE-4367: Fix the IntelliJ configuration by splitting up modules with circular dependencies (merge trunk r1382419)
Added:
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_core_library.xml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_core_library.xml
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solrj_library.xml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_library.xml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/java/codecs.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/resources/codecs-resources.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/java/lucene-core.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/resources/lucene-core-resources.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
- copied, changed from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/test-framework/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/test-framework/lucene-test-framework.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/tools/
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/tools/tools.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/lucene/tools/tools.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/src/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/src/java/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/java/solr-core.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/src/test/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/src/test-files/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/core/src/test-files/solr-core-test-files.iml
- copied unchanged from r1382419, lucene/dev/trunk/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
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/java/solrj.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test-files/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solrj/src/test-files/solrj-test-files.iml
- copied unchanged from r1382419, lucene/dev/trunk/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
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/
- copied from r1382419, lucene/dev/trunk/dev-tools/idea/solr/test-framework/
lucene/dev/branches/branch_4x/dev-tools/idea/solr/test-framework/solr-test-framework.iml
- copied unchanged from r1382419, lucene/dev/trunk/dev-tools/idea/solr/test-framework/solr-test-framework.iml
Removed:
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Lucene_tools_library.xml
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_library.xml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/codecs/codecs.iml
lucene/dev/branches/branch_4x/dev-tools/idea/lucene/lucene.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/solr.iml
Modified:
lucene/dev/branches/branch_4x/ (props changed)
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/benchmark/benchmark.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/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/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/java/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/resources/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/test/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/resources/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test-files/ (props changed)
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/test/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/test-files/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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" />
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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 2012
@@ -1,13 +1,13 @@
<?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="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/core" />
<option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
@@ -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,10 +162,17 @@
<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=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-idea" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/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>
@@ -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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/branches/branch_4x/dev-tools/idea/lucene/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/benchmark.iml?rev=1382429&r1=1382428&r2=1382429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/benchmark.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/benchmark.iml Sun Sep 9 09:09:11 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/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml (from r1382419, lucene/dev/trunk/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?p2=lucene/dev/branches/branch_4x/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml&p1=lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml&r1=1382419&r2=1382429&rev=1382429&view=diff
==============================================================================
--- lucene/dev/trunk/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 Sun Sep 9 09:09:11 2012
@@ -11,8 +11,8 @@
<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" />
+ <orderEntry type="module" scope="TEST" module-name="codecs" />
</component>
</module>
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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/parent.iml Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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/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=1382429&r1=1382428&r2=1382429&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 Sun Sep 9 09:09:11 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>