From 5818381078124c9f22633742b062442db3665011 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryan@apache.org>
Date: Wed, 22 Feb 2012 18:27:17 +0000
Subject: [PATCH] LUCENE-3795: fix paths for spatial-base.jar and
 spatial-strategy.jar

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1292433 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/idea/.idea/ant.xml       | 1 -
 lucene/build.xml                   | 2 --
 lucene/contrib/contrib-build.xml   | 4 ++--
 modules/spatial/strategy/build.xml | 2 --
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index d538244628f..a4d3dc14155 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -8,7 +8,6 @@
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/misc/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/sandbox/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/spatial/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/core/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
diff --git a/lucene/build.xml b/lucene/build.xml
index 6e5591adece..e0790889d13 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -264,7 +264,6 @@
           <packageset dir="contrib/memory/src/java"/>
           <packageset dir="contrib/misc/src/java"/>
           <packageset dir="contrib/sandbox/src/java"/>
-          <packageset dir="contrib/spatial/src/java"/>
           <!-- end alpha sort -->
 
           <!-- If the main javadoc Group listing includes an "Other   -->
@@ -279,7 +278,6 @@
           <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
           <group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
           <group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/>
-          <group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
           
         </sources>
       </invoke-javadoc>
diff --git a/lucene/contrib/contrib-build.xml b/lucene/contrib/contrib-build.xml
index 13f37b0f911..659618a3d86 100644
--- a/lucene/contrib/contrib-build.xml
+++ b/lucene/contrib/contrib-build.xml
@@ -228,7 +228,7 @@
     <property name="sandbox.uptodate" value="true"/>
   </target>
 
-  <property name="spatial-base.jar" value="${common.dir}/../modules/spatial/base/build/lucene-spatial-base-${version}.jar"/>
+  <property name="spatial-base.jar" value="${common.dir}/../modules/spatial/build/base/lucene-spatial-base-${version}.jar"/>
   <target name="check-spatial-base-uptodate" unless="spatial-base.uptodate">
     <module-uptodate name="spatial/base" jarfile="${spatial-base.jar}" property="spatial-base.uptodate"/>
   </target>
@@ -239,7 +239,7 @@
     <property name="spatial-base.uptodate" value="true"/>
   </target>
 
-  <property name="spatial-strategy.jar" value="${common.dir}/../modules/spatial/strategy/build/lucene-spatial-strategy-${version}.jar"/>
+  <property name="spatial-strategy.jar" value="${common.dir}/../modules/spatial/build/strategy/lucene-spatial-strategy-${version}.jar"/>
   <target name="check-spatial-strategy-uptodate" unless="spatial-strategy.uptodate">
     <module-uptodate name="spatial/strategy" jarfile="${spatial-strategy.jar}" property="spatial-strategy.uptodate"/>
   </target>
diff --git a/modules/spatial/strategy/build.xml b/modules/spatial/strategy/build.xml
index 36c4b415caa..1d843329530 100644
--- a/modules/spatial/strategy/build.xml
+++ b/modules/spatial/strategy/build.xml
@@ -29,8 +29,6 @@
     <!--
     <fileset dir="lib" includes="*.jar"/>
     -->
-    <!-- TODO why is this necessary if we put <pathelement path="${spatial-base.jar}" /> in classpath? -->
-    <pathelement path="../base/build/classes/java" />
     <fileset dir="../base/lib" includes="*.jar"/>
   </path>
   <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />