You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/04/01 05:29:13 UTC

svn commit: r1308011 - in /lucene/dev/trunk/dev-tools/idea: .idea/ .idea/libraries/ lucene/contrib/misc/ modules/analysis/common/ modules/benchmark/ solr/contrib/analysis-extras/

Author: sarowe
Date: Sun Apr  1 03:29:12 2012
New Revision: 1308011

URL: http://svn.apache.org/viewvc?rev=1308011&view=rev
Log:
Make most of the IntelliJ build work again.  (Benchmark module still isn't quite right yet)

Added:
    lucene/dev/trunk/dev-tools/idea/.idea/libraries/Morfologik_library.xml
Removed:
    lucene/dev/trunk/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml
Modified:
    lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml
    lucene/dev/trunk/dev-tools/idea/lucene/contrib/misc/misc.iml
    lucene/dev/trunk/dev-tools/idea/modules/analysis/common/analysis-common.iml
    lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml

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=1308011&r1=1308010&r2=1308011&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/compiler.xml Sun Apr  1 03:29:12 2012
@@ -1,48 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions>
-      <entry name=".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
     <wildcardResourcePatterns>
-      <entry name="?*.aff"/>
-      <entry name="?*.brk" />
-      <entry name="?*.bz2" />
-      <entry name="?*.csv" />
-      <entry name="?*.dat" />
-      <entry name="?*.dic" />
-      <entry name="?*.docx"/>
-      <entry name="?*.dtd" />
-      <entry name="?*.ftl" />
-      <entry name="?*.gif" />
-      <entry name="?*.gz" />
-      <entry name="?*.htm" />
-      <entry name="?*.html" />
-      <entry name="?*.incl" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.json" />
-      <entry name="?*.mem" />
-      <entry name="?*.mt" />
-      <entry name="?*.nrm" />
-      <entry name="?*.pdf" />
-      <entry name="?*.png" />
-      <entry name="?*.properties" />
-      <entry name="?*.rslp"/>
-      <entry name="?*.tbl" />
-      <entry name="?*.tld" />
-      <entry name="?*.txt" />
-      <entry name="?*.utf8"/>
-      <entry name="?*.utf-8"/>
-      <entry name="?*.xml" />
-      <entry name="?*.xsl" />
-      <entry name="?*.vm" />
-      <entry name="?*.zip" />
-      <entry name="org.apache.lucene.codecs*" />
-      <entry name="README*" />
-      <entry name="[a-zA-Z][a-zA-Z]" />
-      <entry name="[a-zA-Z][a-zA-Z]-[a-zA-Z][a-zA-Z]" />
+      <entry name="!*.(cpp|java|jflex|jflex-macro|jj|js|pl|py)"/>
     </wildcardResourcePatterns>
   </component>
   <component name="JavacSettings">

Added: lucene/dev/trunk/dev-tools/idea/.idea/libraries/Morfologik_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/libraries/Morfologik_library.xml?rev=1308011&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/libraries/Morfologik_library.xml (added)
+++ lucene/dev/trunk/dev-tools/idea/.idea/libraries/Morfologik_library.xml Sun Apr  1 03:29:12 2012
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Morfologik library">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/modules/analysis/morfologik/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/modules/analysis/morfologik/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file

Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/misc/misc.iml?rev=1308011&r1=1308010&r2=1308011&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/misc/misc.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/misc/misc.iml Sun Apr  1 03:29:12 2012
@@ -5,7 +5,6 @@
     <output-test url="file://$MODULE_DIR$/../../build/contrib/misc/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
     </content>

Modified: lucene/dev/trunk/dev-tools/idea/modules/analysis/common/analysis-common.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/modules/analysis/common/analysis-common.iml?rev=1308011&r1=1308010&r2=1308011&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/modules/analysis/common/analysis-common.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/modules/analysis/common/analysis-common.iml Sun Apr  1 03:29:12 2012
@@ -7,7 +7,7 @@
     <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/java/tools" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />

Modified: lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1308011&r1=1308010&r2=1308011&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml Sun Apr  1 03:29:12 2012
@@ -7,6 +7,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/conf" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/work" />
     </content>

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=1308011&r1=1308010&r2=1308011&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 Apr  1 03:29:12 2012
@@ -22,7 +22,9 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="Solr library" level="project" />
+    <orderEntry type="library" name="Morfologik library" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" module-name="morfologik" />
     <orderEntry type="module" module-name="icu" />
     <orderEntry type="module" module-name="smartcn" />
     <orderEntry type="module" module-name="solr" />