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 2011/01/02 11:01:18 UTC
svn commit: r1054374 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/idea/.idea/ dev-tools/idea/solr/
dev-tools/idea/solr/contrib/analysis-extras/
dev-tools/idea/solr/contrib/clustering/
dev-tools/idea/solr/contrib/dataimporthandler/ dev-tools/ide...
Author: sarowe
Date: Sun Jan 2 10:01:17 2011
New Revision: 1054374
URL: http://svn.apache.org/viewvc?rev=1054374&view=rev
Log:
LUCENE-2611: Re-sync IntelliJ config in dev-tools/idea/; Move both solr/src/test/test-files/ and solr/contrib/analysis-extras/src/test/test-files/ up one level; Set the IntelliJ Java language level on all Solr modules to 6.0
Added:
lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/
lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/empty
lucene/dev/trunk/solr/src/test-files/
- copied from r1054188, lucene/dev/trunk/solr/src/test/test-files/
Removed:
lucene/dev/trunk/solr/src/test/test-files/
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml
lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
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/dataimporthandler.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml
lucene/dev/trunk/dev-tools/idea/solr/solr.iml
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Sun Jan 2 10:01:17 2011
@@ -58,11 +58,11 @@
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
<classpathentry kind="src" path="solr/src/solrj"/>
- <classpathentry excluding="test-files/" kind="src" path="solr/src/test"/>
- <classpathentry kind="src" path="solr/src/test/test-files"/>
+ <classpathentry kind="src" path="solr/src/test"/>
+ <classpathentry kind="src" path="solr/src/test-files"/>
<classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
- <classpathentry excluding="test-files/" kind="src" path="solr/contrib/analysis-extras/src/test"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
<classpathentry kind="src" path="solr/contrib/clustering/src/main/java"/>
<classpathentry kind="src" path="solr/contrib/clustering/src/test/java"/>
<classpathentry kind="src" path="solr/contrib/clustering/src/test/resources"/>
Modified: lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml?rev=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml Sun Jan 2 10:01:17 2011
@@ -6,26 +6,31 @@
<entry name=".+\.(gif|png|jpeg|jpg)" />
</resourceExtensions>
<wildcardResourcePatterns>
- <entry name="?*.properties" />
- <entry name="?*.xml" />
- <entry name="?*.gif" />
- <entry name="?*.png" />
- <entry name="?*.jpeg" />
- <entry name="?*.jpg" />
- <entry name="?*.html" />
+ <entry name="?*.brk" />
+ <entry name="?*.bz2" />
+ <entry name="?*.csv" />
<entry name="?*.dtd" />
- <entry name="?*.tld" />
<entry name="?*.ftl" />
- <entry name="?*.txt" />
- <entry name="?*.bz2" />
+ <entry name="?*.gif" />
<entry name="?*.gz" />
<entry name="?*.htm" />
- <entry name="?*.zip" />
- <entry name="?*.nrm" />
- <entry name="?*.brk" />
+ <entry name="?*.html" />
+ <entry name="?*.incl" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
<entry name="?*.mem" />
+ <entry name="?*.nrm" />
+ <entry name="?*.pdf" />
+ <entry name="?*.png" />
+ <entry name="?*.properties" />
<entry name="?*.tbl" />
+ <entry name="?*.tld" />
+ <entry name="?*.txt" />
+ <entry name="?*.xml" />
<entry name="?*.xsl" />
+ <entry name="?*.vm" />
+ <entry name="?*.zip" />
+ <entry name="README*" />
</wildcardResourcePatterns>
</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=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Sun Jan 2 10:01:17 2011
@@ -4,204 +4,204 @@
<configuration default="false" name="analysis-extras contrib" type="JUnit" factoryName="JUnit">
<module name="analysis-extras" />
<option name="TEST_OBJECT" value="package" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=../../../../../build/test-results" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/analysis-extras/src/test/test-files" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="ant contrib" type="JUnit" factoryName="JUnit">
<module name="ant" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/ant" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/ant/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/ant" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="bdb contrib" type="JUnit" factoryName="JUnit">
<module name="bdb" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/db/bdb" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/db/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/db" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="bdb-je contrib" type="JUnit" factoryName="JUnit">
<module name="bdb-je" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/db/bdb-je" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/db/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/db" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-je-temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="benchmark contrib" type="JUnit" factoryName="JUnit">
<module name="benchmark" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/benchmark" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/benchmark/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/benchmark" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="clustering contrib" type="JUnit" factoryName="JUnit">
<module name="clustering" />
<option name="TEST_OBJECT" value="package" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=../../../../../build/test-results" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/clustering/src/test/resources" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/clustering/build" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="common analysis module" type="JUnit" factoryName="JUnit">
<module name="common" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/common" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../build/common/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/common" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="dataimporthandler contrib" type="JUnit" factoryName="JUnit">
<module name="dataimporthandler" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/src/test/resources" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../../../../build/test-results/temp" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/target" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="extraction contrib" type="JUnit" factoryName="JUnit">
<module name="extraction" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/extraction/src/test/resources" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../../../../build/test-results/temp" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/extraction/build" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="extras from dataimporthandler contrib" type="JUnit" factoryName="JUnit">
<module name="extras" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/src/extras/test/resources" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../../../../../build/test-results/temp" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/target/extras" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="highlighter contrib" type="JUnit" factoryName="JUnit">
<module name="highlighter" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/highlighter" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/highlighter/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/highlighter" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="icu analysis module" type="JUnit" factoryName="JUnit">
<module name="icu" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/icu" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../build/icu/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/icu" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="instantiated contrib" type="JUnit" factoryName="JUnit">
<module name="instantiated" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/instantiated" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/instantiated/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/instantiated" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
<module name="lucene" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene" />
- <option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=build/test -Dtests.linedocsfile=europarl.lines.txt.gz" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build" />
+ <option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=temp -Dtests.linedocsfile=europarl.lines.txt.gz" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="lucli contrib" type="JUnit" factoryName="JUnit">
<module name="lucli" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/lucli" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/lucli/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/lucli" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="memory contrib" type="JUnit" factoryName="JUnit">
<module name="memory" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/memory" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/memory/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/memory" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="misc contrib" type="JUnit" factoryName="JUnit">
<module name="misc" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/misc" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/misc/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/misc" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="phonetic analysis module" type="JUnit" factoryName="JUnit">
<module name="phonetic" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/phonetic" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../build/phonetic/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/phonetic" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="queries contrib" type="JUnit" factoryName="JUnit">
<module name="queries" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/queries" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/queries/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/queries" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="queryparser contrib" type="JUnit" factoryName="JUnit">
<module name="queryparser" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/queryparser" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/queryparser/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/queryparser" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="remote contrib" type="JUnit" factoryName="JUnit">
<module name="remote" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/remote" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/remote/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/remote" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="smartcn analysis module" type="JUnit" factoryName="JUnit">
<module name="smartcn" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/smartcn" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../build/smartcn/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/smartcn" />
+ <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" />
<option name="TEST_OBJECT" value="package" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=../../../build/test-results/temp" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/src/test/test-files" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/tests" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="spatial contrib" type="JUnit" factoryName="JUnit">
<module name="spatial" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/spatial" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/spatial/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/spatial" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="spellchecker contrib" type="JUnit" factoryName="JUnit">
<module name="spellchecker" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/spellchecker" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/spellchecker/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/spellchecker" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="stempel analysis module" type="JUnit" factoryName="JUnit">
<module name="stempel" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/stempel" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../build/stempel/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/stempel" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="swing contrib" type="JUnit" factoryName="JUnit">
<module name="swing" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/swing" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/swing/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/swing" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="wordnet contrib" type="JUnit" factoryName="JUnit">
<module name="wordnet" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/wordnet" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/wordnet/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/wordnet" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="xml-query-parser contrib" type="JUnit" factoryName="JUnit">
<module name="xml-query-parser" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/contrib/xml-query-parser" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=../../build/contrib/xml-query-parser/test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/xml-query-parser" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<list size="29">
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=1054374&r1=1054373&r2=1054374&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 Jan 2 10:01:17 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<output-test url="file://$MODULE_DIR$/build/test-classes" />
<exclude-output />
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=1054374&r1=1054373&r2=1054374&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 Jan 2 10:01:17 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<output-test url="file://$MODULE_DIR$/build/test-classes" />
<exclude-output />
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=1054374&r1=1054373&r2=1054374&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 Jan 2 10:01:17 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml?rev=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml Sun Jan 2 10:01:17 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../target/extras/classes" />
<output-test url="file://$MODULE_DIR$/../../target/extras/test-classes" />
<exclude-output />
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=1054374&r1=1054373&r2=1054374&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 Jan 2 10:01:17 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<output-test url="file://$MODULE_DIR$/build/test-classes" />
<exclude-output />
Modified: lucene/dev/trunk/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solr.iml?rev=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/solr.iml Sun Jan 2 10:01:17 2011
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/solr" />
<output-test url="file://$MODULE_DIR$/build/tests" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/solrj" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/common" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/webapp/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/webapp/web" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/scripts" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="module" module-name="spatial" />
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Sun Jan 2 10:01:17 2011
@@ -363,7 +363,7 @@
</solr-javac>
<!-- Copy any data files present to the classpath -->
<copy todir="${dest}/tests">
- <fileset dir="${src}/test/test-files" excludes="**/*.java"/>
+ <fileset dir="${src}/test-files" excludes="**/*.java"/>
</copy>
</target>
@@ -734,7 +734,7 @@
excludes="lib/README.committers.txt **/data/ **/logs/* **/classes/ **/*.sh **/bin/ src/scripts/ src/site/build/ **/target/ client/ruby/flare/ client/python contrib/**/build/ **/*.iml **/*.ipr **/*.iws contrib/clustering/example/lib/** contrib/clustering/lib/downloads/** contrib/analysis-extras/lib/**" />
<tarfileset dir="."
prefix="${fullnamever}"
- includes="src/test/test-files/solr/lib/classes/empty-file-main-lib.txt" />
+ includes="src/test-files/solr/lib/classes/empty-file-main-lib.txt" />
<tarfileset dir="."
mode="755"
prefix="${fullnamever}"
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/build.xml?rev=1054374&r1=1054373&r2=1054374&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/build.xml Sun Jan 2 10:01:17 2011
@@ -120,7 +120,7 @@
</solr-javac>
<!-- Copy any data files present to the classpath -->
<copy todir="${dest}/test-classes">
- <fileset dir="src/test/test-files" excludes="**/*.java"/>
+ <fileset dir="src/test-files" excludes="**/*.java"/>
</copy>
</target>
Added: lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/empty
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/empty?rev=1054374&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/empty (added)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/empty Sun Jan 2 10:01:17 2011
@@ -0,0 +1,4 @@
+Please don't remove this silly file!
+
+This is here to make sure the dir is not empty... otherwise Ht/git
+clones have problems.