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/02 21:56:36 UTC
svn commit: r1308511 - in /lucene/dev/branches/branch_3x:
dev-tools/idea/.idea/compiler.xml dev-tools/idea/.idea/workspace.xml
dev-tools/idea/lucene/lucene.iml lucene/contrib/benchmark/build.xml
Author: sarowe
Date: Mon Apr 2 19:56:36 2012
New Revision: 1308511
URL: http://svn.apache.org/viewvc?rev=1308511&view=rev
Log:
IntelliJ configuration: minor fixes for branch_3x
Modified:
lucene/dev/branches/branch_3x/dev-tools/idea/.idea/compiler.xml
lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
Modified: lucene/dev/branches/branch_3x/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/.idea/compiler.xml?rev=1308511&r1=1308510&r2=1308511&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/.idea/compiler.xml Mon Apr 2 19:56:36 2012
@@ -1,47 +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="?*.xml" />
- <entry name="?*.xsl" />
- <entry name="?*.utf8" />
- <entry name="?*.utf-8" />
- <entry name="?*.vm" />
- <entry name="?*.zip" />
- <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">
Modified: lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml?rev=1308511&r1=1308510&r2=1308511&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml Mon Apr 2 19:56:36 2012
@@ -17,6 +17,10 @@
<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>
+ <method>
+ <option name="AntTarget" enabled="true" target="copy-alg-files-for-testing"
+ antfile="file://$PROJECT_DIR$/lucene/contrib/benchmark/build.xml" />
+ </method>
</configuration>
<configuration default="false" name="clustering contrib" type="JUnit" factoryName="JUnit">
<module name="clustering" />
Modified: lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml?rev=1308511&r1=1308510&r2=1308511&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml Mon Apr 2 19:56:36 2012
@@ -7,7 +7,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test-framework/src/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/core/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tools/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
Modified: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml?rev=1308511&r1=1308510&r2=1308511&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml Mon Apr 2 19:56:36 2012
@@ -242,10 +242,10 @@
/>
</target>
- <target name="compile-test" depends="contrib-build.compile-test">
- <!-- copy .alg files as resources for testing -->
- <copy todir="${build.dir}/classes/test/conf">
- <fileset dir="conf"/>
- </copy>
+ <target name="compile-test" depends="copy-alg-files-for-testing,contrib-build.compile-test"/>
+ <target name="copy-alg-files-for-testing" description="copy .alg files as resources for testing">
+ <copy todir="${build.dir}/classes/test/conf">
+ <fileset dir="conf"/>
+ </copy>
</target>
</project>