You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/09/12 07:55:54 UTC
svn commit: r1624451 - in /lucene/dev/trunk: ./ dev-tools/idea/.idea/
dev-tools/idea/lucene/codecs/src/ dev-tools/idea/lucene/codecs/src/java/
dev-tools/idea/lucene/codecs/src/test/ dev-tools/idea/lucene/core/src/
dev-tools/idea/lucene/core/src/java/ d...
Author: rjernst
Date: Fri Sep 12 05:55:53 2014
New Revision: 1624451
URL: http://svn.apache.org/r1624451
Log:
Revert accidental commit of r1624450 (had a dirty workspace)
Added:
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml
- copied unchanged from r1624449, lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/java/codecs.iml
lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml
- copied unchanged from r1624449, lucene/dev/trunk/dev-tools/idea/lucene/core/src/java/lucene-core.iml
lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
- copied unchanged from r1624449, lucene/dev/trunk/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
- copied unchanged from r1624449, lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
Removed:
lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/codecs.iml
lucene/dev/trunk/dev-tools/idea/lucene/core/src/lucene-core.iml
lucene/dev/trunk/dev-tools/idea/solr/core/src/solr-core-tests.iml
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/solrj-tests.iml
Modified:
lucene/dev/trunk/.gitignore
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/codecs/src/test/codecs-tests.iml
lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml
lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
Modified: lucene/dev/trunk/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/.gitignore?rev=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/.gitignore (original)
+++ lucene/dev/trunk/.gitignore Fri Sep 12 05:55:53 2014
@@ -10,9 +10,7 @@
/velocity.log
/build.properties
/.idea
-lucene/**/*.iml
-solr/**/*.iml
-parent.iml
+**/*.iml
**/*.ipr
**/*.iws
/.project
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=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/modules.xml Fri Sep 12 05:55:53 2014
@@ -4,58 +4,60 @@
<modules>
<module filepath="$PROJECT_DIR$/parent.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/core/src/lucene-core.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/core/src/test/lucene-core-tests.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/backward-codecs/backward-codecs.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/codecs/src/codecs.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/codecs/src/test/codecs-tests.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/test-framework/lucene-test-framework.iml" />
-
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/common/analysis-common.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/icu/icu.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/kuromoji/kuromoji.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/morfologik/morfologik.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/phonetic/phonetic.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/smartcn/smartcn.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/stempel/stempel.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/uima/analysis-uima.iml" />
-
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/src/benchmark.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/conf/benchmark-conf.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/classification/classification.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/expressions/expressions.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/facet/facet.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/grouping/grouping.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/highlighter/highlighter.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/join/join.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/memory/memory.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/misc/misc.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/queries/queries.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/queryparser/queryparser.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/replicator/replicator.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/sandbox/sandbox.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial/spatial.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/suggest/suggest.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/tools/tools.iml" />
-
- <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/java/solr-core.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/solr-core-tests.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/solrj-tests.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" />
-
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/map-reduce/map-reduce.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-cell/morphlines-cell.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.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" />
+ <module filepath="$PROJECT_DIR$/lucene/analysis/morfologik/morfologik.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/analysis/phonetic/phonetic.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/analysis/smartcn/smartcn.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/analysis/stempel/stempel.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/analysis/uima/analysis-uima.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/benchmark/src/benchmark.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/benchmark/conf/benchmark-conf.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/classification/classification.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/codecs/src/java/codecs.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/codecs/src/test/codecs-tests.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/codecs/src/resources/codecs-resources.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/expressions/expressions.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/replicator/replicator.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$/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-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/morphlines-cell/morphlines-cell.iml" />
+ <module filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
+ <module filepath="$PROJECT_DIR$/solr/contrib/map-reduce/map-reduce.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=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Fri Sep 12 05:55:53 2014
@@ -67,13 +67,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="Module backward-codecs" type="JUnit" factoryName="JUnit">
- <module name="backward-codecs" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/backward-codecs" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="Module benchmark" type="JUnit" factoryName="JUnit">
<module name="benchmark" />
<option name="TEST_OBJECT" value="package" />
@@ -242,13 +235,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="Solr map-reduce contrib" type="JUnit" factoryName="JUnit">
- <module name="map-reduce" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/map-reduce" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="Solr morphlines-cell contrib" type="JUnit" factoryName="JUnit">
<module name="morphlines-cell" />
<option name="TEST_OBJECT" value="package" />
@@ -263,6 +249,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="Solr mr (map-reduce) contrib" type="JUnit" factoryName="JUnit">
+ <module name="map-reduce" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/map-reduce" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="Solr uima contrib" type="JUnit" factoryName="JUnit">
<module name="uima" />
<option name="TEST_OBJECT" value="package" />
@@ -277,7 +270,7 @@
<option name="VM_PARAMETERS" value="-ea" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="39">
+ <list size="38">
<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" />
@@ -287,36 +280,35 @@
<item index="6" class="java.lang.String" itemvalue="JUnit.Module analyzers-smartcn" />
<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 backward-codecs" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.Module benchmark" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.Module classification" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.Module codecs" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.Module expressions" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.Module facet" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.Module grouping" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.Module highlighter" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.Module join" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.Module memory" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.Module misc" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.Module queries" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.Module replicator" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.Module spatial" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.Module suggest" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.Solr core" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
- <item index="29" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
- <item index="30" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
- <item index="31" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
- <item index="32" class="java.lang.String" itemvalue="JUnit.Solr map-reduce contrib" />
- <item index="33" class="java.lang.String" itemvalue="JUnit.Solr morphlines-cell contrib" />
- <item index="34" class="java.lang.String" itemvalue="JUnit.Solr morphlines-core contrib" />
- <item index="35" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
- <item index="36" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
- <item index="37" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
- <item index="38" class="java.lang.String" itemvalue="JUnit.Solrj" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.Module benchmark" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.Module classification" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.Module codecs" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.Module expressions" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.Module facet" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.Module grouping" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.Module highlighter" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.Module join" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.Module memory" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.Module misc" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.Module queries" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.Module replicator" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.Module spatial" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.Module suggest" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.Solr core" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
+ <item index="30" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
+ <item index="31" class="java.lang.String" itemvalue="JUnit.Solr morphlines-cell contrib" />
+ <item index="32" class="java.lang.String" itemvalue="JUnit.Solr morphlines-core contrib" />
+ <item index="33" class="java.lang.String" itemvalue="JUnit.Solr mr (map-reduce) contrib" />
+ <item index="34" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
+ <item index="35" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
+ <item index="36" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
+ <item index="37" class="java.lang.String" itemvalue="JUnit.Solrj" />
</list>
</component>
</project>
Modified: 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=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/codecs/src/test/codecs-tests.iml Fri Sep 12 05:55:53 2014
@@ -1,6 +1,7 @@
<?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$/../../../../idea-build/lucene/codecs/classes/java" />
<output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/codecs/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
Modified: lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml?rev=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/core/src/test/lucene-core-tests.iml Fri Sep 12 05:55:53 2014
@@ -1,6 +1,7 @@
<?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$/../../../../idea-build/lucene/core/classes/java" />
<output-test url="file://$MODULE_DIR$/../../../../idea-build/lucene/core/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
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=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/sandbox/sandbox.iml Fri Sep 12 05:55:53 2014
@@ -6,7 +6,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml?rev=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml Fri Sep 12 05:55:53 2014
@@ -19,7 +19,6 @@
<orderEntry type="library" name="Solr morphlines cell library" level="project" />
<orderEntry type="library" scope="TEST" name="Solr morphlines core test library" level="project" />
<orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
- <orderEntry type="library" scope="TEST" name="Solr core test 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-library" scope="TEST">
Modified: lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml?rev=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/core/src/java/solr-core.iml Fri Sep 12 05:55:53 2014
@@ -2,6 +2,7 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-core/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
Modified: lucene/dev/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=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/solrj/src/java/solrj.iml Fri Sep 12 05:55:53 2014
@@ -2,6 +2,7 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../../../idea-build/solr/solr-solrj/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
Modified: lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java?rev=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java Fri Sep 12 05:55:53 2014
@@ -19,11 +19,8 @@ package org.apache.lucene.index;
import java.io.IOException;
-import org.junit.Ignore;
-
// This class exists only so it has a name that the junit runner will not pickup,
// so these index creation "tests" can only be run explicitly
-@Ignore("Force IDEs to ignore this test")
public class CreateBackwardsCompatibilityIndex extends TestBackwardsCompatibility {
// These indexes will be created under directory /tmp/idx/.
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java?rev=1624451&r1=1624450&r2=1624451&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java Fri Sep 12 05:55:53 2014
@@ -140,7 +140,7 @@ public class TestIDVersionPostingsFormat
}
ids = new IDSource() {
final int radix = TestUtil.nextInt(random(), Character.MIN_RADIX, Character.MAX_RADIX);
- final String zeroPad = String.format(Locale.ROOT, "%0" + TestUtil.nextInt(random(), 5, 20) + "d", 0);
+ final String zeroPad = String.format(Locale.ROOT, "%0" + TestUtil.nextInt(random(), 4, 20) + "d", 0);
int upto;
@Override
public String next() {