From a4d26756b35dd3edb1c9a20da4038704986018d5 Mon Sep 17 00:00:00 2001 From: David Wayne Smiley Date: Mon, 20 Feb 2012 22:47:17 +0000 Subject: [PATCH] Rename module to 'spatial' git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1291500 13f79535-47bb-0310-9956-ffa450edef68 --- modules/{spatial-lucene => spatial}/LICENSE.txt | 0 modules/{spatial-lucene => spatial}/pom.xml | 0 .../java/org/apache/lucene/spatial/base/context/ParseUtils.java | 0 .../org/apache/lucene/spatial/base/context/SpatialContext.java | 0 .../apache/lucene/spatial/base/context/SpatialContextFactory.java | 0 .../lucene/spatial/base/context/simple/SimpleSpatialContext.java | 0 .../spatial/base/context/simple/SimpleSpatialContextFactory.java | 0 .../lucene/spatial/base/distance/AbstractDistanceCalculator.java | 0 .../apache/lucene/spatial/base/distance/CartesianDistCalc.java | 0 .../apache/lucene/spatial/base/distance/DistanceCalculator.java | 0 .../org/apache/lucene/spatial/base/distance/DistanceUnits.java | 0 .../org/apache/lucene/spatial/base/distance/DistanceUtils.java | 0 .../lucene/spatial/base/distance/GeodesicSphereDistCalc.java | 0 .../org/apache/lucene/spatial/base/distance/package-info.java | 0 .../lucene/spatial/base/exception/InvalidShapeException.java | 0 .../lucene/spatial/base/exception/InvalidSpatialArgument.java | 0 .../spatial/base/exception/UnsupportedSpatialOperation.java | 0 .../main/java/org/apache/lucene/spatial/base/io/LineReader.java | 0 .../java/org/apache/lucene/spatial/base/io/geonames/Geoname.java | 0 .../apache/lucene/spatial/base/io/geonames/GeonamesReader.java | 0 .../java/org/apache/lucene/spatial/base/io/sample/SampleData.java | 0 .../apache/lucene/spatial/base/io/sample/SampleDataReader.java | 0 .../main/java/org/apache/lucene/spatial/base/package-info.java | 0 .../src/main/java/org/apache/lucene/spatial/base/prefix/Node.java | 0 .../org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java | 0 .../lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java | 0 .../lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java | 0 .../apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java | 0 .../java/org/apache/lucene/spatial/base/prefix/package-info.java | 0 .../apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java | 0 .../java/org/apache/lucene/spatial/base/query/SpatialArgs.java | 0 .../org/apache/lucene/spatial/base/query/SpatialArgsParser.java | 0 .../org/apache/lucene/spatial/base/query/SpatialOperation.java | 0 .../java/org/apache/lucene/spatial/base/query/package-info.java | 0 .../main/java/org/apache/lucene/spatial/base/shape/Circle.java | 0 .../java/org/apache/lucene/spatial/base/shape/MultiShape.java | 0 .../src/main/java/org/apache/lucene/spatial/base/shape/Point.java | 0 .../main/java/org/apache/lucene/spatial/base/shape/Rectangle.java | 0 .../src/main/java/org/apache/lucene/spatial/base/shape/Shape.java | 0 .../org/apache/lucene/spatial/base/shape/SpatialRelation.java | 0 .../org/apache/lucene/spatial/base/shape/simple/CircleImpl.java | 0 .../apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java | 0 .../org/apache/lucene/spatial/base/shape/simple/PointImpl.java | 0 .../apache/lucene/spatial/base/shape/simple/RectangleImpl.java | 0 .../java/org/apache/lucene/spatial/benchmark/IndexShapeTask.java | 0 .../java/org/apache/lucene/spatial/benchmark/QueryShapeTask.java | 0 .../java/org/apache/lucene/spatial/benchmark/ShapeGenerator.java | 0 .../java/org/apache/lucene/spatial/benchmark/StrategyAware.java | 0 .../apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java | 0 .../java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java | 0 .../java/org/apache/lucene/spatial/strategy/SpatialStrategy.java | 0 .../java/org/apache/lucene/spatial/strategy/package-info.java | 0 .../strategy/prefix/PointPrefixTreeFieldCacheProvider.java | 0 .../lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java | 0 .../apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java | 0 .../lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java | 0 .../spatial/strategy/prefix/RecursivePrefixTreeStrategy.java | 0 .../spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java | 0 .../org/apache/lucene/spatial/strategy/prefix/package-info.java | 0 .../lucene/spatial/strategy/util/CachedDistanceValueSource.java | 0 .../lucene/spatial/strategy/util/CachingDoubleValueSource.java | 0 .../org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java | 0 .../org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java | 0 .../lucene/spatial/strategy/util/ShapeFieldCacheProvider.java | 0 .../apache/lucene/spatial/strategy/util/StringListTokenizer.java | 0 .../org/apache/lucene/spatial/strategy/util/TruncateFilter.java | 0 .../apache/lucene/spatial/strategy/util/ValueSourceFilter.java | 0 .../lucene/spatial/strategy/vector/DistanceValueSource.java | 0 .../lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java | 0 .../apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java | 0 .../src/test/java/org/apache/lucene/spatial/RandomSeed.java | 0 .../test/java/org/apache/lucene/spatial/SpatialMatchConcern.java | 0 .../src/test/java/org/apache/lucene/spatial/SpatialTestCase.java | 0 .../src/test/java/org/apache/lucene/spatial/SpatialTestQuery.java | 0 .../src/test/java/org/apache/lucene/spatial/StrategyTestCase.java | 0 .../test/java/org/apache/lucene/spatial/TestTestFramework.java | 0 .../lucene/spatial/base/context/BaseSpatialContextTestCase.java | 0 .../lucene/spatial/base/context/SpatialContextFactoryTest.java | 0 .../lucene/spatial/base/context/SpatialContextTestCase.java | 0 .../org/apache/lucene/spatial/base/distance/TestDistances.java | 0 .../apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java | 0 .../org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java | 0 .../lucene/spatial/base/prefix/geohash/TestGeohashUtils.java | 0 .../org/apache/lucene/spatial/base/shape/AbstractTestShapes.java | 0 .../java/org/apache/lucene/spatial/base/shape/TestShapes2D.java | 0 .../java/org/apache/lucene/spatial/base/shape/TestShapesGeo.java | 0 .../strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java | 0 .../strategy/prefix/RecursivePrefixTreeStrategyTestCase.java | 0 .../lucene/spatial/strategy/prefix/TestSpatialPrefixField.java | 0 .../spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java | 0 .../spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java | 0 .../spatial/strategy/vector/TwoDoublesStrategyTestCase.java | 0 .../src/test/resources/cities-IsWithin-BBox.txt | 0 .../src/test/resources/data/countries-bbox.txt | 0 .../src/test/resources/data/countries-poly.txt | 0 .../src/test/resources/data/geonames-IE.txt | 0 .../src/test/resources/data/states-bbox.txt | 0 .../src/test/resources/data/states-poly.txt | 0 .../src/test/resources/data/world-cities-points.txt | 0 .../src/test/resources/states-Intersects-BBox.txt | 0 .../src/test/resources/states-IsWithin-BBox.txt | 0 101 files changed, 0 insertions(+), 0 deletions(-) rename modules/{spatial-lucene => spatial}/LICENSE.txt (100%) rename modules/{spatial-lucene => spatial}/pom.xml (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/context/ParseUtils.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/context/SpatialContext.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/distance/package-info.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/io/LineReader.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleData.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/package-info.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/Node.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/package-info.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgs.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/query/SpatialOperation.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/query/package-info.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/Circle.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/MultiShape.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/Point.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/Rectangle.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/Shape.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/benchmark/IndexShapeTask.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/benchmark/QueryShapeTask.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/benchmark/ShapeGenerator.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/benchmark/StrategyAware.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/package-info.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/prefix/package-info.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java (100%) rename modules/{spatial-lucene => spatial}/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/RandomSeed.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/SpatialMatchConcern.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/SpatialTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/SpatialTestQuery.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/StrategyTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/TestTestFramework.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/distance/TestDistances.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/shape/TestShapes2D.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/base/shape/TestShapesGeo.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/cities-IsWithin-BBox.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/data/countries-bbox.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/data/countries-poly.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/data/geonames-IE.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/data/states-bbox.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/data/states-poly.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/data/world-cities-points.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/states-Intersects-BBox.txt (100%) rename modules/{spatial-lucene => spatial}/src/test/resources/states-IsWithin-BBox.txt (100%) diff --git a/modules/spatial-lucene/LICENSE.txt b/modules/spatial/LICENSE.txt similarity index 100% rename from modules/spatial-lucene/LICENSE.txt rename to modules/spatial/LICENSE.txt diff --git a/modules/spatial-lucene/pom.xml b/modules/spatial/pom.xml similarity index 100% rename from modules/spatial-lucene/pom.xml rename to modules/spatial/pom.xml diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/ParseUtils.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/ParseUtils.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/ParseUtils.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/ParseUtils.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/SpatialContext.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/SpatialContext.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/SpatialContext.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/SpatialContext.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/package-info.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/package-info.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/distance/package-info.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/distance/package-info.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/LineReader.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/LineReader.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/LineReader.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/LineReader.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleData.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleData.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleData.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleData.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/package-info.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/package-info.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/package-info.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/package-info.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/Node.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/Node.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/Node.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/Node.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/package-info.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/package-info.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/package-info.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/package-info.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgs.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgs.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgs.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgs.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/SpatialOperation.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/SpatialOperation.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/SpatialOperation.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/SpatialOperation.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/package-info.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/package-info.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/query/package-info.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/query/package-info.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Circle.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Circle.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Circle.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Circle.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/MultiShape.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/MultiShape.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/MultiShape.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/MultiShape.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Point.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Point.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Point.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Point.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Rectangle.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Rectangle.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Rectangle.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Rectangle.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Shape.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Shape.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/Shape.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/Shape.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/IndexShapeTask.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/IndexShapeTask.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/IndexShapeTask.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/IndexShapeTask.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/QueryShapeTask.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/QueryShapeTask.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/QueryShapeTask.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/QueryShapeTask.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/ShapeGenerator.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/ShapeGenerator.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/ShapeGenerator.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/ShapeGenerator.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/StrategyAware.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/StrategyAware.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/benchmark/StrategyAware.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/benchmark/StrategyAware.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/package-info.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/package-info.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/package-info.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/package-info.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/package-info.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/package-info.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/prefix/package-info.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/prefix/package-info.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java diff --git a/modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java b/modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java similarity index 100% rename from modules/spatial-lucene/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java rename to modules/spatial/src/main/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/RandomSeed.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/RandomSeed.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/RandomSeed.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/RandomSeed.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/SpatialMatchConcern.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/SpatialMatchConcern.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/SpatialMatchConcern.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/SpatialMatchConcern.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/SpatialTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/SpatialTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/SpatialTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/SpatialTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/SpatialTestQuery.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/SpatialTestQuery.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/SpatialTestQuery.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/SpatialTestQuery.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/StrategyTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/StrategyTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/StrategyTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/StrategyTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/TestTestFramework.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/TestTestFramework.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/TestTestFramework.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/TestTestFramework.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/distance/TestDistances.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/distance/TestDistances.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/distance/TestDistances.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/distance/TestDistances.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/shape/TestShapes2D.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/shape/TestShapes2D.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/shape/TestShapes2D.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/shape/TestShapes2D.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/shape/TestShapesGeo.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/base/shape/TestShapesGeo.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/base/shape/TestShapesGeo.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/base/shape/TestShapesGeo.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java diff --git a/modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java b/modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java similarity index 100% rename from modules/spatial-lucene/src/test/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java rename to modules/spatial/src/test/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java diff --git a/modules/spatial-lucene/src/test/resources/cities-IsWithin-BBox.txt b/modules/spatial/src/test/resources/cities-IsWithin-BBox.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/cities-IsWithin-BBox.txt rename to modules/spatial/src/test/resources/cities-IsWithin-BBox.txt diff --git a/modules/spatial-lucene/src/test/resources/data/countries-bbox.txt b/modules/spatial/src/test/resources/data/countries-bbox.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/data/countries-bbox.txt rename to modules/spatial/src/test/resources/data/countries-bbox.txt diff --git a/modules/spatial-lucene/src/test/resources/data/countries-poly.txt b/modules/spatial/src/test/resources/data/countries-poly.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/data/countries-poly.txt rename to modules/spatial/src/test/resources/data/countries-poly.txt diff --git a/modules/spatial-lucene/src/test/resources/data/geonames-IE.txt b/modules/spatial/src/test/resources/data/geonames-IE.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/data/geonames-IE.txt rename to modules/spatial/src/test/resources/data/geonames-IE.txt diff --git a/modules/spatial-lucene/src/test/resources/data/states-bbox.txt b/modules/spatial/src/test/resources/data/states-bbox.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/data/states-bbox.txt rename to modules/spatial/src/test/resources/data/states-bbox.txt diff --git a/modules/spatial-lucene/src/test/resources/data/states-poly.txt b/modules/spatial/src/test/resources/data/states-poly.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/data/states-poly.txt rename to modules/spatial/src/test/resources/data/states-poly.txt diff --git a/modules/spatial-lucene/src/test/resources/data/world-cities-points.txt b/modules/spatial/src/test/resources/data/world-cities-points.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/data/world-cities-points.txt rename to modules/spatial/src/test/resources/data/world-cities-points.txt diff --git a/modules/spatial-lucene/src/test/resources/states-Intersects-BBox.txt b/modules/spatial/src/test/resources/states-Intersects-BBox.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/states-Intersects-BBox.txt rename to modules/spatial/src/test/resources/states-Intersects-BBox.txt diff --git a/modules/spatial-lucene/src/test/resources/states-IsWithin-BBox.txt b/modules/spatial/src/test/resources/states-IsWithin-BBox.txt similarity index 100% rename from modules/spatial-lucene/src/test/resources/states-IsWithin-BBox.txt rename to modules/spatial/src/test/resources/states-IsWithin-BBox.txt