You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/02/29 06:17:40 UTC
svn commit: r1294974 - in
/lucene/dev/branches/lucene3795_lsp_spatial_module: dev-tools/eclipse/
lucene/contrib/ modules/spatial/ modules/spatial/base/ modules/spatial/lib/
modules/spatial/src/java/org/apache/lucene/spatial/strategy/
modules/spatial/sr...
Author: ryan
Date: Wed Feb 29 05:17:39 2012
New Revision: 1294974
URL: http://svn.apache.org/viewvc?rev=1294974&view=rev
Log:
LUCENE-3795: move back to single project layout. Add spatial4j jar file
Added:
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-0.1.jar (with props)
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-LICENSE-ASL.txt
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-NOTICE.txt
Removed:
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/base/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/
Modified:
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/PointType.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialOptions.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/eclipse/dot.classpath?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/eclipse/dot.classpath Wed Feb 29 05:17:39 2012
@@ -53,11 +53,10 @@
<classpathentry kind="src" path="modules/queryparser/src/test"/>
<classpathentry kind="src" path="modules/suggest/src/java"/>
<classpathentry kind="src" path="modules/suggest/src/test"/>
- <classpathentry kind="src" path="modules/spatial/base/src/java"/>
- <classpathentry kind="src" path="modules/spatial/base/src/test"/>
- <classpathentry kind="src" path="modules/spatial/strategy/src/java"/>
- <classpathentry kind="src" path="modules/spatial/strategy/src/test"/>
- <classpathentry kind="src" path="modules/spatial/strategy/src/test-files"/>
+ <classpathentry kind="src" path="modules/spatial/src/java"/>
+ <classpathentry kind="src" path="modules/spatial/src/test"/>
+ <classpathentry kind="src" path="modules/spatial/src/test-files"/>
+ <classpathentry kind="lib" path="modules/spatial/lib/spatial4j-0.1.jar"/>
<classpathentry kind="src" path="solr/core/src/java"/>
<classpathentry kind="src" path="solr/core/src/test"/>
<classpathentry kind="src" path="solr/core/src/test-files"/>
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml Wed Feb 29 05:17:39 2012
@@ -228,26 +228,15 @@
<property name="sandbox.uptodate" value="true"/>
</target>
- <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"/>
+ <property name="spatial.jar" value="${common.dir}/../modules/spatial/build/lucene-spatial-${version}.jar"/>
+ <target name="check-spatial-uptodate" unless="spatial.uptodate">
+ <module-uptodate name="spatial" jarfile="${spatial.jar}" property="spatial.uptodate"/>
</target>
- <target name="jar-spatial-base" unless="spatial-base.uptodate" depends="check-spatial-base-uptodate">
- <ant dir="${common.dir}/../modules/spatial/base" target="jar-core" inheritAll="false">
+ <target name="jar-spatial" unless="spatial.uptodate" depends="check-spatial-uptodate">
+ <ant dir="${common.dir}/../modules/spatial" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
- <property name="spatial-base.uptodate" value="true"/>
- </target>
-
- <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>
- <target name="jar-spatial-strategy" unless="spatial-strategy.uptodate" depends="check-spatial-strategy-uptodate">
- <ant dir="${common.dir}/../modules/spatial/strategy" target="jar-core" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- <property name="spatial-strategy.uptodate" value="true"/>
+ <property name="spatial.uptodate" value="true"/>
</target>
<property name="suggest.jar" value="${common.dir}/../modules/suggest/build/lucene-suggest-${version}.jar"/>
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/build.xml?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/build.xml Wed Feb 29 05:17:39 2012
@@ -1,78 +1,41 @@
<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
<project name="spatial" default="default">
-
<description>
- Lucene Spatial Support
- - base: Spatial API w/o lucene dependencies
- - strategy: Lucene based indexing strategies
+ Lucene Spatial
</description>
+
+ <property name="build.dir" location="build/" />
+ <property name="dist.dir" location="dist/" />
+ <property name="maven.dist.dir" location="../dist/maven" />
+
+ <path id="additional.dependencies">
+ <fileset dir="lib" includes="*.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
+ targetos="unix"
+ refid="additional.dependencies"
+ />
- <target name="base">
- <ant dir="base" />
- </target>
-
- <target name="strategy">
- <ant dir="strategy" />
- </target>
-
- <target name="default" depends="compile"/>
- <target name="compile" depends="base,strategy" />
-
- <target name="clean">
- <ant dir="base" target="clean" />
- <ant dir="strategy" target="clean" />
- </target>
-
- <target name="validate">
- <ant dir="base" target="validate" />
- <ant dir="strategy" target="validate" />
- </target>
- <target name="compile-core">
- <ant dir="base" target="compile-core" />
- <ant dir="strategy" target="compile-core" />
- </target>
- <target name="compile-test">
- <ant dir="base" target="compile-test" />
- <ant dir="strategy" target="compile-test" />
- </target>
- <target name="test">
- <ant dir="base" target="test" />
- <ant dir="strategy" target="test" />
- </target>
-
- <target name="build-artifacts-and-tests" depends="default,compile-test" />
-
- <target name="dist-maven" depends="default,javadocs">
- <ant dir="base" target="dist-maven" />
- <ant dir="strategy" target="dist-maven" />
- </target>
-
- <target name="javadocs">
- <ant dir="base" target="javadocs" />
- <ant dir="strategy" target="javadocs" />
- </target>
-
- <target name="javadocs-index.html">
- <ant dir="base" target="javadocs-index.html" />
- <ant dir="strategy" target="javadocs-index.html" />
- </target>
-
+ <import file="../../lucene/contrib/contrib-build.xml"/>
+
+ <path id="classpath">
+ <path refid="base.classpath"/>
+ <pathelement path="${spatial-base.jar}" />
+ <pathelement path="${queries.jar}" />
+ </path>
+
+ <path id="test.classpath">
+ <path refid="test.base.classpath" />
+ <path refid="base.classpath"/>
+ <pathelement path="${analyzers-common.jar}" />
+ <pathelement path="src/test-files" />
+ </path>
+
+
+ <target name="init" depends="contrib-build.init"/>
+ <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven"/>
+ <target name="compile" depends="jar-queries,common.compile-core" />
+ <target name="test" depends="jar-analyzers-common,compile-test,validate,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
+
</project>
Added: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-0.1.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-0.1.jar?rev=1294974&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-LICENSE-ASL.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-LICENSE-ASL.txt?rev=1294974&view=auto
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-LICENSE-ASL.txt (added)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-LICENSE-ASL.txt Wed Feb 29 05:17:39 2012
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-NOTICE.txt?rev=1294974&view=auto
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-NOTICE.txt (added)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/lib/spatial4j-NOTICE.txt Wed Feb 29 05:17:39 2012
@@ -0,0 +1,5 @@
+Apache Commons Lang
+Copyright 2001-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java Wed Feb 29 05:17:39 2012
@@ -21,9 +21,9 @@ import org.apache.lucene.index.Indexable
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.query.SpatialArgs;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.shape.Shape;
/**
* must be thread safe
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java Wed Feb 29 05:17:39 2012
@@ -17,9 +17,9 @@
package org.apache.lucene.spatial.strategy.prefix;
-import org.apache.lucene.spatial.base.prefix.Node;
-import org.apache.lucene.spatial.base.prefix.SpatialPrefixTree;
-import org.apache.lucene.spatial.base.shape.Point;
+import com.spatial4j.core.prefix.Node;
+import com.spatial4j.core.prefix.SpatialPrefixTree;
+import com.spatial4j.core.shape.Point;
import org.apache.lucene.spatial.strategy.util.ShapeFieldCacheProvider;
import org.apache.lucene.util.BytesRef;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java Wed Feb 29 05:17:39 2012
@@ -24,12 +24,12 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.spatial.base.distance.DistanceCalculator;
-import org.apache.lucene.spatial.base.prefix.Node;
-import org.apache.lucene.spatial.base.prefix.SpatialPrefixTree;
-import org.apache.lucene.spatial.base.query.SpatialArgs;
-import org.apache.lucene.spatial.base.shape.Point;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.prefix.Node;
+import com.spatial4j.core.prefix.SpatialPrefixTree;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
import org.apache.lucene.spatial.strategy.SpatialStrategy;
import org.apache.lucene.spatial.strategy.util.CachedDistanceValueSource;
@@ -56,7 +56,7 @@ public abstract class PrefixTreeStrategy
this.defaultFieldValuesArrayLen = defaultFieldValuesArrayLen;
}
- /** See {@link SpatialPrefixTree#getMaxLevelForPrecision(org.apache.lucene.spatial.base.shape.Shape, double)}. */
+ /** See {@link SpatialPrefixTree#getMaxLevelForPrecision(com.spatial4j.core.shape.Shape, double)}. */
public void setDistErrPct(double distErrPct) {
this.distErrPct = distErrPct;
}
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java Wed Feb 29 05:17:39 2012
@@ -21,10 +21,10 @@ import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.spatial.base.shape.SpatialRelation;
-import org.apache.lucene.spatial.base.prefix.Node;
-import org.apache.lucene.spatial.base.prefix.SpatialPrefixTree;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.shape.SpatialRelation;
+import com.spatial4j.core.prefix.Node;
+import com.spatial4j.core.prefix.SpatialPrefixTree;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.OpenBitSet;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java Wed Feb 29 05:17:39 2012
@@ -22,11 +22,11 @@ import org.apache.lucene.search.Filtered
import org.apache.lucene.search.Query;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.FunctionQuery;
-import org.apache.lucene.spatial.base.exception.UnsupportedSpatialOperation;
-import org.apache.lucene.spatial.base.prefix.SpatialPrefixTree;
-import org.apache.lucene.spatial.base.query.SpatialArgs;
-import org.apache.lucene.spatial.base.query.SpatialOperation;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.exception.UnsupportedSpatialOperation;
+import com.spatial4j.core.prefix.SpatialPrefixTree;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.query.SpatialOperation;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java Wed Feb 29 05:17:39 2012
@@ -19,12 +19,12 @@ package org.apache.lucene.spatial.strate
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
-import org.apache.lucene.spatial.base.exception.UnsupportedSpatialOperation;
-import org.apache.lucene.spatial.base.prefix.Node;
-import org.apache.lucene.spatial.base.prefix.SpatialPrefixTree;
-import org.apache.lucene.spatial.base.query.SpatialArgs;
-import org.apache.lucene.spatial.base.query.SpatialOperation;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.exception.UnsupportedSpatialOperation;
+import com.spatial4j.core.prefix.Node;
+import com.spatial4j.core.prefix.SpatialPrefixTree;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.query.SpatialOperation;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
import java.util.List;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java Wed Feb 29 05:17:39 2012
@@ -22,8 +22,8 @@ import org.apache.commons.lang.builder.H
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.spatial.base.distance.DistanceCalculator;
-import org.apache.lucene.spatial.base.shape.Point;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.shape.Point;
import java.io.IOException;
import java.util.List;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java Wed Feb 29 05:17:39 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.spatial.strate
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.shape.Shape;
public class ShapeFieldCache<T extends Shape> {
private List<T>[] cache;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java Wed Feb 29 05:17:39 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.strate
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.util.BytesRef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java Wed Feb 29 05:17:39 2012
@@ -25,9 +25,9 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DoubleParser;
-import org.apache.lucene.spatial.base.distance.DistanceCalculator;
-import org.apache.lucene.spatial.base.shape.Point;
-import org.apache.lucene.spatial.base.shape.simple.PointImpl;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.simple.PointImpl;
import org.apache.lucene.util.Bits;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java Wed Feb 29 05:17:39 2012
@@ -24,15 +24,15 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.*;
import org.apache.lucene.search.FieldCache.DoubleParser;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.exception.InvalidShapeException;
-import org.apache.lucene.spatial.base.exception.UnsupportedSpatialOperation;
-import org.apache.lucene.spatial.base.query.SpatialArgs;
-import org.apache.lucene.spatial.base.query.SpatialOperation;
-import org.apache.lucene.spatial.base.shape.Circle;
-import org.apache.lucene.spatial.base.shape.Point;
-import org.apache.lucene.spatial.base.shape.Rectangle;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.exception.InvalidShapeException;
+import com.spatial4j.core.exception.UnsupportedSpatialOperation;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.query.SpatialOperation;
+import com.spatial4j.core.shape.Circle;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Rectangle;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SpatialStrategy;
import org.apache.lucene.spatial.strategy.util.CachingDoubleValueSource;
import org.apache.lucene.spatial.strategy.util.NumericFieldInfo;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java Wed Feb 29 05:17:39 2012
@@ -17,10 +17,10 @@
package org.apache.lucene.spatial;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.io.LineReader;
-import org.apache.lucene.spatial.base.query.SpatialArgs;
-import org.apache.lucene.spatial.base.query.SpatialArgsParser;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.io.LineReader;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.query.SpatialArgsParser;
import java.io.IOException;
import java.io.InputStream;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java Wed Feb 29 05:17:39 2012
@@ -23,11 +23,11 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.io.sample.SampleData;
-import org.apache.lucene.spatial.base.io.sample.SampleDataReader;
-import org.apache.lucene.spatial.base.query.SpatialArgsParser;
-import org.apache.lucene.spatial.base.shape.Shape;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.io.sample.SampleData;
+import com.spatial4j.core.io.sample.SampleDataReader;
+import com.spatial4j.core.query.SpatialArgsParser;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SpatialFieldInfo;
import org.apache.lucene.spatial.strategy.SpatialStrategy;
import org.slf4j.Logger;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java Wed Feb 29 05:17:39 2012
@@ -17,11 +17,11 @@
package org.apache.lucene.spatial;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
-import org.apache.lucene.spatial.base.query.SpatialArgsParser;
-import org.apache.lucene.spatial.base.query.SpatialOperation;
-import org.apache.lucene.spatial.base.shape.Rectangle;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.query.SpatialArgsParser;
+import com.spatial4j.core.query.SpatialOperation;
+import com.spatial4j.core.shape.Rectangle;
import org.junit.Assert;
import org.junit.Test;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java Wed Feb 29 05:17:39 2012
@@ -17,8 +17,8 @@
package org.apache.lucene.spatial.strategy.prefix;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.prefix.geohash.GeohashPrefixTree;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.prefix.geohash.GeohashPrefixTree;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java Wed Feb 29 05:17:39 2012
@@ -17,8 +17,8 @@
package org.apache.lucene.spatial.strategy.prefix;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
import org.junit.Before;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java Wed Feb 29 05:17:39 2012
@@ -20,12 +20,12 @@ package org.apache.lucene.spatial.strate
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
-import org.apache.lucene.spatial.base.prefix.quad.QuadPrefixTree;
-import org.apache.lucene.spatial.base.query.SpatialArgsParser;
-import org.apache.lucene.spatial.base.shape.Shape;
-import org.apache.lucene.spatial.base.shape.simple.PointImpl;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.prefix.quad.QuadPrefixTree;
+import com.spatial4j.core.query.SpatialArgsParser;
+import com.spatial4j.core.shape.Shape;
+import com.spatial4j.core.shape.simple.PointImpl;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
import org.apache.lucene.spatial.SpatialTestCase;
import org.junit.Test;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java Wed Feb 29 05:17:39 2012
@@ -18,7 +18,7 @@
package org.apache.lucene.spatial.strategy.vector;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.spatial.base.context.SpatialContext;
+import com.spatial4j.core.context.SpatialContext;
import org.apache.lucene.spatial.strategy.util.NumericFieldInfo;
import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java Wed Feb 29 05:17:39 2012
@@ -17,8 +17,8 @@
package org.apache.lucene.spatial.strategy.vector;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
public class TwoDoublesStrategyTestCase extends BaseTwoDoublesStrategyTestCase {
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml Wed Feb 29 05:17:39 2012
@@ -134,7 +134,7 @@
<target name="prep-lucene-jars"
depends="jar-lucene-core, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-suggest, jar-highlighter, jar-memory,
- jar-misc, jar-spatial-base, jar-spatial-strategy, jar-grouping, jar-queries, jar-queryparser">
+ jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser">
<property name="solr.deps.compiled" value="true"/>
</target>
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/GeoHashField.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/GeoHashField.java Wed Feb 29 05:17:39 2012
@@ -22,12 +22,12 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.spatial.base.context.ParseUtils;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
-import org.apache.lucene.spatial.base.exception.InvalidShapeException;
-import org.apache.lucene.spatial.base.prefix.geohash.GeohashUtils;
-import org.apache.lucene.spatial.base.shape.Point;
+import com.spatial4j.core.context.ParseUtils;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.exception.InvalidShapeException;
+import com.spatial4j.core.prefix.geohash.GeohashUtils;
+import com.spatial4j.core.shape.Point;
import org.apache.solr.common.SolrException;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
@@ -44,7 +44,7 @@ import java.io.IOException;
* href="http://en.wikipedia.org/wiki/Geohash">Geohash</a> field. The field is
* provided as a lat/lon pair and is internally represented as a string.
*
- * @see org.apache.lucene.spatial.base.context.ParseUtils#parseLatitudeLongitude(double[], String)
+ * @see com.spatial4j.core.context.ParseUtils#parseLatitudeLongitude(double[], String)
*/
public class GeoHashField extends FieldType implements SpatialQueryable {
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/LatLonType.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/LatLonType.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/LatLonType.java Wed Feb 29 05:17:39 2012
@@ -24,14 +24,14 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
import org.apache.lucene.search.*;
-import org.apache.lucene.spatial.base.context.ParseUtils;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
-import org.apache.lucene.spatial.base.distance.DistanceCalculator;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
-import org.apache.lucene.spatial.base.distance.GeodesicSphereDistCalc;
-import org.apache.lucene.spatial.base.exception.InvalidShapeException;
-import org.apache.lucene.spatial.base.shape.Rectangle;
+import com.spatial4j.core.context.ParseUtils;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.distance.DistanceUtils;
+import com.spatial4j.core.distance.GeodesicSphereDistCalc;
+import com.spatial4j.core.exception.InvalidShapeException;
+import com.spatial4j.core.shape.Rectangle;
import org.apache.lucene.util.Bits;
import org.apache.solr.common.SolrException;
import org.apache.solr.response.TextResponseWriter;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/PointType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/PointType.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/PointType.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/schema/PointType.java Wed Feb 29 05:17:39 2012
@@ -25,9 +25,9 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.spatial.base.context.ParseUtils;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
-import org.apache.lucene.spatial.base.exception.InvalidShapeException;
+import com.spatial4j.core.context.ParseUtils;
+import com.spatial4j.core.distance.DistanceUtils;
+import com.spatial4j.core.exception.InvalidShapeException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java Wed Feb 29 05:17:39 2012
@@ -19,8 +19,8 @@ package org.apache.solr.search;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
-import org.apache.lucene.spatial.base.distance.DistanceUnits;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
+import com.spatial4j.core.distance.DistanceUnits;
+import com.spatial4j.core.distance.DistanceUtils;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.SpatialParams;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialOptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialOptions.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialOptions.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/SpatialOptions.java Wed Feb 29 05:17:39 2012
@@ -16,7 +16,7 @@ package org.apache.solr.search;
* limitations under the License.
*/
-import org.apache.lucene.spatial.base.distance.DistanceUnits;
+import com.spatial4j.core.distance.DistanceUnits;
import org.apache.solr.schema.SchemaField;
/**
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java Wed Feb 29 05:17:39 2012
@@ -19,7 +19,7 @@ package org.apache.solr.search.function.
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.spatial.base.prefix.geohash.GeohashUtils;
+import com.spatial4j.core.prefix.geohash.GeohashUtils;
import java.util.Map;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java Wed Feb 29 05:17:39 2012
@@ -22,13 +22,13 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.spatial.base.context.SpatialContext;
-import org.apache.lucene.spatial.base.context.simple.SimpleSpatialContext;
-import org.apache.lucene.spatial.base.distance.DistanceCalculator;
-import org.apache.lucene.spatial.base.distance.DistanceUnits;
-import org.apache.lucene.spatial.base.distance.GeodesicSphereDistCalc;
-import org.apache.lucene.spatial.base.prefix.geohash.GeohashUtils;
-import org.apache.lucene.spatial.base.shape.Point;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.simple.SimpleSpatialContext;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.distance.DistanceUnits;
+import com.spatial4j.core.distance.GeodesicSphereDistCalc;
+import com.spatial4j.core.prefix.geohash.GeohashUtils;
+import com.spatial4j.core.shape.Point;
import java.util.Map;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java Wed Feb 29 05:17:39 2012
@@ -26,9 +26,9 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.spatial.base.context.ParseUtils;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
-import org.apache.lucene.spatial.base.exception.InvalidShapeException;
+import com.spatial4j.core.context.ParseUtils;
+import com.spatial4j.core.distance.DistanceUtils;
+import com.spatial4j.core.exception.InvalidShapeException;
import org.apache.solr.common.params.SpatialParams;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.FunctionQParser;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java Wed Feb 29 05:17:39 2012
@@ -22,7 +22,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
+import com.spatial4j.core.distance.DistanceUtils;
import org.apache.solr.common.SolrException;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java Wed Feb 29 05:17:39 2012
@@ -18,7 +18,7 @@ package org.apache.solr.search.function.
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
+import com.spatial4j.core.distance.DistanceUtils;
/**
* While not strictly a distance, the Sq. Euclidean Distance is often all that is needed in many applications
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java Wed Feb 29 05:17:39 2012
@@ -22,7 +22,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
+import com.spatial4j.core.distance.DistanceUtils;
import org.apache.solr.common.SolrException;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java?rev=1294974&r1=1294973&r2=1294974&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java Wed Feb 29 05:17:39 2012
@@ -16,8 +16,8 @@ package org.apache.solr.search.function.
* limitations under the License.
*/
-import org.apache.lucene.spatial.base.distance.DistanceUtils;
-import org.apache.lucene.spatial.base.prefix.geohash.GeohashUtils;
+import com.spatial4j.core.distance.DistanceUtils;
+import com.spatial4j.core.prefix.geohash.GeohashUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.junit.BeforeClass;