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/10/09 23:30:48 UTC
svn commit: r1180720 - in /lucene/dev/trunk/dev-tools/idea: .idea/ solr/
solr/contrib/analysis-extras/ solr/contrib/clustering/
solr/contrib/dataimporthandler-extras/ solr/contrib/dataimporthandler/
solr/contrib/extraction/ solr/contrib/langid/ solr/co...
Author: sarowe
Date: Sun Oct 9 21:30:47 2011
New Revision: 1180720
URL: http://svn.apache.org/viewvc?rev=1180720&view=rev
Log:
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-*/)
Added:
lucene/dev/trunk/dev-tools/idea/.idea/misc.xml (with props)
lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/
lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml
Modified:
lucene/dev/trunk/dev-tools/idea/.idea/ant.xml
lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml
lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml
lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
lucene/dev/trunk/dev-tools/idea/solr/solr.iml
Modified: lucene/dev/trunk/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/ant.xml?rev=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/ant.xml Sun Oct 9 21:30:47 2011
@@ -30,6 +30,7 @@
<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/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/solrj/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/test-framework/build.xml" />
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=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml Sun Oct 9 21:30:47 2011
@@ -6,9 +6,11 @@
<entry name=".+\.(gif|png|jpeg|jpg)" />
</resourceExtensions>
<wildcardResourcePatterns>
+ <entry name="?*.aff"/>
<entry name="?*.brk" />
<entry name="?*.bz2" />
<entry name="?*.csv" />
+ <entry name="?*.dic"/>
<entry name="?*.docx"/>
<entry name="?*.dtd" />
<entry name="?*.ftl" />
@@ -20,6 +22,7 @@
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
<entry name="?*.mem" />
+ <entry name="?*.mt" />
<entry name="?*.nrm" />
<entry name="?*.pdf" />
<entry name="?*.png" />
Added: lucene/dev/trunk/dev-tools/idea/.idea/misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/misc.xml?rev=1180720&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/misc.xml (added)
+++ lucene/dev/trunk/dev-tools/idea/.idea/misc.xml Sun Oct 9 21:30:47 2011
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6"/>
+</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=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/modules.xml Sun Oct 9 21:30:47 2011
@@ -30,6 +30,7 @@
<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/extraction/extraction.iml" />
+ <module filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
</modules>
</component>
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=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Sun Oct 9 21:30:47 2011
@@ -92,6 +92,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</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">
<module name="lucene" />
<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="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="27">
+ <list size="28">
<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="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="11" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
<item index="12" class="java.lang.String" itemvalue="JUnit.join module" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.queries module" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser module" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.langid contrib" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser module" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
</list>
</component>
</project>
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=1180720&r1=1180719&r2=1180720&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 Oct 9 21:30:47 2011
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../build/contrib/analysis-extras/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../build/contrib/analysis-extras/classes/test" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/solr-analysis-extras/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-analysis-extras/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
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=1180720&r1=1180719&r2=1180720&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 Oct 9 21:30:47 2011
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../build/contrib/clustering/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../build/contrib/clustering/classes/test" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/solr-clustering/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-clustering/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?rev=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Sun Oct 9 21:30:47 2011
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler-extras/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler-extras/classes/test" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler-extras/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler-extras/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
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=1180720&r1=1180719&r2=1180720&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 Oct 9 21:30:47 2011
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler/classes/test" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-dataimporthandler/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
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=1180720&r1=1180719&r2=1180720&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 Oct 9 21:30:47 2011
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../build/contrib/extraction/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../build/contrib/extraction/classes/test" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/solr-cell/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-cell/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
Added: lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml?rev=1180720&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml Sun Oct 9 21:30:47 2011
@@ -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>
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml Sun Oct 9 21:30:47 2011
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../build/contrib/uima/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../build/contrib/uima/classes/test" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../../build/contrib/solr-uima/classes/java" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/solr-uima/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
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=1180720&r1=1180719&r2=1180720&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/solr.iml Sun Oct 9 21:30:47 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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-test url="file://$MODULE_DIR$/build/solr-idea/classes/test" />
<exclude-output />