mirror of https://github.com/apache/lucene.git
Brought IntelliJ IDEA configuration up-to-date: made 1.6 language level project-level - Solr specialization is no longer required; added solr langid contrib module; added *.mt to the compiler resource patterns; renamed solr contrib build dirs to be the same as the Ant locations (build/contrib/solr-*/)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1180720 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
664a7191dd
commit
bfb789b70f
|
@ -30,6 +30,7 @@
|
||||||
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
|
||||||
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/build.xml" />
|
||||||
<buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
|
||||||
|
<buildFile url="file://$PROJECT_DIR$/solr/contrib/langid/build.xml" />
|
||||||
<buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
|
||||||
<buildFile url="file://$PROJECT_DIR$/solr/solrj/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/solr/solrj/build.xml" />
|
||||||
<buildFile url="file://$PROJECT_DIR$/solr/test-framework/build.xml" />
|
<buildFile url="file://$PROJECT_DIR$/solr/test-framework/build.xml" />
|
||||||
|
|
|
@ -6,9 +6,11 @@
|
||||||
<entry name=".+\.(gif|png|jpeg|jpg)" />
|
<entry name=".+\.(gif|png|jpeg|jpg)" />
|
||||||
</resourceExtensions>
|
</resourceExtensions>
|
||||||
<wildcardResourcePatterns>
|
<wildcardResourcePatterns>
|
||||||
|
<entry name="?*.aff"/>
|
||||||
<entry name="?*.brk" />
|
<entry name="?*.brk" />
|
||||||
<entry name="?*.bz2" />
|
<entry name="?*.bz2" />
|
||||||
<entry name="?*.csv" />
|
<entry name="?*.csv" />
|
||||||
|
<entry name="?*.dic"/>
|
||||||
<entry name="?*.docx"/>
|
<entry name="?*.docx"/>
|
||||||
<entry name="?*.dtd" />
|
<entry name="?*.dtd" />
|
||||||
<entry name="?*.ftl" />
|
<entry name="?*.ftl" />
|
||||||
|
@ -20,6 +22,7 @@
|
||||||
<entry name="?*.jpeg" />
|
<entry name="?*.jpeg" />
|
||||||
<entry name="?*.jpg" />
|
<entry name="?*.jpg" />
|
||||||
<entry name="?*.mem" />
|
<entry name="?*.mem" />
|
||||||
|
<entry name="?*.mt" />
|
||||||
<entry name="?*.nrm" />
|
<entry name="?*.nrm" />
|
||||||
<entry name="?*.pdf" />
|
<entry name="?*.pdf" />
|
||||||
<entry name="?*.png" />
|
<entry name="?*.png" />
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6"/>
|
||||||
|
</project>
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
<module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.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-extras/dataimporthandler-extras.iml" />
|
||||||
<module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.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/uima/uima.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -92,6 +92,13 @@
|
||||||
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
|
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
|
||||||
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
|
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
<configuration default="false" name="langid contrib" type="JUnit" factoryName="JUnit">
|
||||||
|
<module name="langid" />
|
||||||
|
<option name="TEST_OBJECT" value="package" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-langid" />
|
||||||
|
<option name="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="lucene" type="JUnit" factoryName="JUnit">
|
<configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
|
||||||
<module name="lucene" />
|
<module name="lucene" />
|
||||||
<option name="TEST_OBJECT" value="package" />
|
<option name="TEST_OBJECT" value="package" />
|
||||||
|
@ -190,7 +197,7 @@
|
||||||
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
|
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=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>
|
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
|
||||||
</configuration>
|
</configuration>
|
||||||
<list size="27">
|
<list size="28">
|
||||||
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
|
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
|
||||||
<item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
|
<item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
|
||||||
<item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
|
<item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
|
||||||
|
@ -204,20 +211,21 @@
|
||||||
<item index="10" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
|
<item index="10" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
|
||||||
<item index="11" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
|
<item index="11" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
|
||||||
<item index="12" class="java.lang.String" itemvalue="JUnit.join module" />
|
<item index="12" class="java.lang.String" itemvalue="JUnit.join module" />
|
||||||
<item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
|
<item index="13" class="java.lang.String" itemvalue="JUnit.langid contrib" />
|
||||||
<item index="14" class="java.lang.String" itemvalue="JUnit.memory contrib" />
|
<item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
|
||||||
<item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
|
<item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
|
||||||
<item index="16" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
|
<item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
|
||||||
<item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
|
<item index="17" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
|
||||||
<item index="18" class="java.lang.String" itemvalue="JUnit.queries module" />
|
<item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
|
||||||
<item index="19" class="java.lang.String" itemvalue="JUnit.queryparser module" />
|
<item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
|
||||||
<item index="20" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
|
<item index="20" class="java.lang.String" itemvalue="JUnit.queryparser module" />
|
||||||
<item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
|
<item index="21" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
|
||||||
<item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
|
<item index="22" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
|
||||||
<item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
|
<item index="23" class="java.lang.String" itemvalue="JUnit.solr" />
|
||||||
<item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
|
<item index="24" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
|
||||||
<item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
|
<item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
|
||||||
<item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
|
<item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
|
||||||
|
<item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
|
||||||
</list>
|
</list>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/../../build/contrib/analysis-extras/classes/java" />
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-analysis-extras/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/../../build/contrib/analysis-extras/classes/test" />
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-analysis-extras/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/../../build/contrib/clustering/classes/java" />
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-clustering/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/../../build/contrib/clustering/classes/test" />
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-clustering/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler-extras/classes/java" />
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler-extras/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler-extras/classes/test" />
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler-extras/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler/classes/java" />
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler/classes/test" />
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/../../build/contrib/extraction/classes/java" />
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-cell/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/../../build/contrib/extraction/classes/test" />
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-cell/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-langid/classes/java" />
|
||||||
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-langid/classes/test" />
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="library" name="Solr library" level="project" />
|
||||||
|
<orderEntry type="library" name="Solr extraction library" level="project" />
|
||||||
|
<orderEntry type="module" module-name="solr" />
|
||||||
|
<orderEntry type="module" module-name="lucene" scope="TEST" />
|
||||||
|
</component>
|
||||||
|
</module>
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/../../build/contrib/uima/classes/java" />
|
<output url="file://$MODULE_DIR$/../../build/contrib/solr-uima/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/../../build/contrib/uima/classes/test" />
|
<output-test url="file://$MODULE_DIR$/../../build/contrib/solr-uima/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/build/solr-idea/classes/java" />
|
<output url="file://$MODULE_DIR$/build/solr-idea/classes/java" />
|
||||||
<output-test url="file://$MODULE_DIR$/build/solr-idea/classes/test" />
|
<output-test url="file://$MODULE_DIR$/build/solr-idea/classes/test" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
|
|
Loading…
Reference in New Issue