diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index 796e0f9a646..26c8fd4b06e 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -55,6 +55,10 @@ + + + + diff --git a/dev-tools/maven/modules/spatial/base/pom.xml.template b/dev-tools/maven/modules/spatial/base/pom.xml.template new file mode 100644 index 00000000000..06d74640f98 --- /dev/null +++ b/dev-tools/maven/modules/spatial/base/pom.xml.template @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + @version@ + ../../../lucene/pom.xml + + org.apache.lucene + lucene-spatial-base + jar + Lucene Spatial Base + Spatial Code w/o lucene dependencies + + modules/spatial/base + ../build/base + + + + + ${project.groupId} + lucene-test-framework + ${project.version} + test + + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/modules/spatial/pom.xml.template b/dev-tools/maven/modules/spatial/pom.xml.template new file mode 100644 index 00000000000..fdeb20425c1 --- /dev/null +++ b/dev-tools/maven/modules/spatial/pom.xml.template @@ -0,0 +1,49 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + @version@ + ../../lucene/pom.xml + + org.apache.lucene + lucene-spatial-modules-aggregator + Lucene Spatial Modules aggregator POM + pom + + base + strategy + + + build/lucene-spatial-modules-aggregator + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/dev-tools/maven/modules/spatial/strategy/pom.xml.template b/dev-tools/maven/modules/spatial/strategy/pom.xml.template new file mode 100644 index 00000000000..12dc36f5938 --- /dev/null +++ b/dev-tools/maven/modules/spatial/strategy/pom.xml.template @@ -0,0 +1,90 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + @version@ + ../../../lucene/pom.xml + + org.apache.lucene + lucene-spatial-strategy + jar + Lucene Spatial Strategies + + Spatial Strategies for Apache Lucene + + + modules/spatial/strategy + ../build/strategy + + + + + ${project.groupId} + lucene-test-framework + ${project.version} + test + + + ${project.groupId} + lucene-spatial-base + ${project.version} + + + ${project.groupId} + lucene-core + ${project.version} + + + ${project.groupId} + lucene-queries + ${lucene.version} + + + ${project.groupId} + lucene-analyzers-common + ${lucene.version} + + + ${project.groupId} + lucene-benchmark + ${lucene.version} + true + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java index 1f4ea4a0897..13ef61c50cc 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java @@ -112,7 +112,6 @@ public abstract class SpatialContext { /** * Is this a geospatial context (true) or simply 2d spatial (false) - * @return */ public boolean isGeo() { return getUnits().isGeo(); @@ -156,7 +155,6 @@ public abstract class SpatialContext { * * @param ctr * @param distance The units of "distance" should be the same as {@link #getUnits()}. - * @return */ public abstract Circle makeCircle(Point ctr, double distance); diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java index ca59d78ca68..7862bed0cad 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java @@ -41,7 +41,6 @@ public abstract class SpatialContextFactory { * then {@link SimpleSpatialContextFactory} is chosen. * @param args * @param classLoader - * @return */ public static SpatialContext makeSpatialContext(Map args, ClassLoader classLoader) { SpatialContextFactory instance; diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/Node.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/Node.java index 03a3a9f4c84..9d3ecbd39d7 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/Node.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/Node.java @@ -165,9 +165,6 @@ public abstract class Node implements Comparable { * cell's boundary. * Precondition: Never called when getLevel() == maxLevel. * Precondition: this.getShape().relate(p) != DISJOINT. - * - * @param p - * @return */ public abstract Node getSubCell(Point p); diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java index c559358240f..b604e92dcb0 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java @@ -88,7 +88,6 @@ public class SpatialArgs { /** * Considers {@link SpatialOperation#BBoxWithin} in returning the shape. - * @return */ public Shape getShape() { if (shape != null && (operation == SpatialOperation.BBoxWithin || operation == SpatialOperation.BBoxIntersects)) diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java index 1a6181c4c87..4669433d2b3 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java @@ -43,7 +43,6 @@ public enum SpatialRelation { * If you were to call aShape.relate(bShape) and aShape.relate(cShape), you could call * this to merge the intersect results as if bShape & cShape were combined into {@link MultiShape}. * @param other - * @return */ public SpatialRelation combine(SpatialRelation other) { if (this == other) diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java index 144f0538913..4f195fabe7a 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java @@ -69,7 +69,6 @@ public class CircleImpl implements Circle { /** * Note that the bounding box might contain a minX that is > maxX, due to WGS84 dateline. - * @return */ @Override public Rectangle getBoundingBox() { diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java index b53909ec22f..297d043117a 100644 --- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java +++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java @@ -68,8 +68,8 @@ public class GeoCircleImpl extends CircleImpl { /** * Called after bounding box is intersected. - * @bboxSect INTERSECTS or CONTAINS from enclosingBox's intersection - * @result DISJOINT, CONTAINS, or INTERSECTS (not WITHIN) + * @param bboxSect INTERSECTS or CONTAINS from enclosingBox's intersection + * @return DISJOINT, CONTAINS, or INTERSECTS (not WITHIN) */ @Override protected SpatialRelation relateRectanglePhase2(Rectangle r, SpatialRelation bboxSect, SpatialContext ctx) { diff --git a/modules/spatial/base/src/java/overview.html b/modules/spatial/base/src/java/overview.html new file mode 100644 index 00000000000..65d1c29603c --- /dev/null +++ b/modules/spatial/base/src/java/overview.html @@ -0,0 +1,23 @@ + + + + Apache Lucene Spatial Base + + + + \ No newline at end of file diff --git a/modules/spatial/build.xml b/modules/spatial/build.xml index e281046bce6..3ce21b5014b 100644 --- a/modules/spatial/build.xml +++ b/modules/spatial/build.xml @@ -60,18 +60,18 @@ - - + + - - + + - - + + diff --git a/modules/spatial/strategy/src/java/overview.html b/modules/spatial/strategy/src/java/overview.html new file mode 100644 index 00000000000..d246ef0b9b2 --- /dev/null +++ b/modules/spatial/strategy/src/java/overview.html @@ -0,0 +1,23 @@ + + + + Apache Lucene Spatial Strategies + + + + \ No newline at end of file