You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2012/03/01 08:09:00 UTC
svn commit: r1295438 - in
/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea:
.idea/ant.xml .idea/modules.xml .idea/workspace.xml
modules/spatial/spatial.iml solr/solr.iml
Author: dsmiley
Date: Thu Mar 1 07:08:59 2012
New Revision: 1295438
URL: http://svn.apache.org/viewvc?rev=1295438&view=rev
Log:
LUCENE-3795: get intellij build to work.
Modified:
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/modules/spatial/spatial.iml
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/solr/solr.iml
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml?rev=1295438&r1=1295437&r2=1295438&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml Thu Mar 1 07:08:59 2012
@@ -25,8 +25,7 @@
<buildFile url="file://$PROJECT_DIR$/modules/join/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/queries/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/queryparser/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/modules/spatial/base/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/modules/spatial/strategy/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/spatial/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/suggest/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/core/build.xml" />
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/modules.xml?rev=1295438&r1=1295437&r2=1295438&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/modules.xml Thu Mar 1 07:08:59 2012
@@ -23,8 +23,7 @@
<module filepath="$PROJECT_DIR$/modules/join/join.iml" />
<module filepath="$PROJECT_DIR$/modules/queries/queries.iml" />
<module filepath="$PROJECT_DIR$/modules/queryparser/queryparser.iml" />
- <module filepath="$PROJECT_DIR$/modules/spatial/base/spatial-base.iml" />
- <module filepath="$PROJECT_DIR$/modules/spatial/strategy/spatial-strategy.iml" />
+ <module filepath="$PROJECT_DIR$/modules/spatial/spatial.iml" />
<module filepath="$PROJECT_DIR$/modules/suggest/suggest.iml" />
<module filepath="$PROJECT_DIR$/solr/solr.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/workspace.xml?rev=1295438&r1=1295437&r2=1295438&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/workspace.xml Thu Mar 1 07:08:59 2012
@@ -173,7 +173,7 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="spatial module" type="JUnit" factoryName="JUnit">
- <module name="spatial-strategy" />
+ <module name="spatial" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/spatial/build" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/modules/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/modules/spatial/spatial.iml?rev=1295438&r1=1295437&r2=1295438&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/modules/spatial/spatial.iml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/modules/spatial/spatial.iml Thu Mar 1 07:08:59 2012
@@ -1,8 +1,8 @@
<?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/classes/java" />
- <output-test url="file://$MODULE_DIR$/../build/classes/test" />
+ <output url="file://$MODULE_DIR$/build/classes/java" />
+ <output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -11,6 +11,16 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library" exported="">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/lib" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+ </library>
+ </orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" module-name="lucene" exported="" />
<orderEntry type="module" module-name="queries" />
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/solr/solr.iml?rev=1295438&r1=1295437&r2=1295438&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/solr/solr.iml Thu Mar 1 07:08:59 2012
@@ -21,8 +21,7 @@
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr example library" level="project" />
<orderEntry type="module" module-name="kuromoji" />
- <orderEntry type="module" module-name="spatial-base" />
- <orderEntry type="module" module-name="spatial-strategy" />
+ <orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="grouping" />
<orderEntry type="module" module-name="highlighter" />
<orderEntry type="module" module-name="icu" />