From 06283e9f63d71f88f8895355330e9fc30d89182d Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 10 Apr 2010 15:36:46 +0000
Subject: [PATCH] LUCENE-2323: move ChainedFilter from misc to contrib/queries

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@932748 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/contrib/CHANGES.txt                           |  4 +++-
 .../org/apache/lucene/search}/ChainedFilter.java     |  2 +-
 .../org/apache/lucene/search}/ChainedFilterTest.java |  2 +-
 lucene/contrib/spatial/build.xml                     | 12 ++++++------
 .../lucene/spatial/tier/DistanceQueryBuilder.java    |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename lucene/contrib/{misc/src/java/org/apache/lucene/misc => queries/src/java/org/apache/lucene/search}/ChainedFilter.java (99%)
 rename lucene/contrib/{misc/src/test/org/apache/lucene/misc => queries/src/test/org/apache/lucene/search}/ChainedFilterTest.java (99%)

diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index da4baa787e7..e1986441b23 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -127,7 +127,9 @@ Build
 
  * LUCENE-2323: Moved contrib/regex into contrib/queries. Moved the
    queryparsers under contrib/misc and contrib/surround into contrib/queryparser. 
-   Moved contrib/fast-vector-highlighter into contrib/highlighter.  (Robert Muir)
+   Moved contrib/fast-vector-highlighter into contrib/highlighter. 
+   Moved ChainedFilter from contrib/misc to contrib/queries. contrib/spatial now
+   depends on contrib/queries instead of contrib/misc.  (Robert Muir)
    
  * LUCENE-2333: Fix failures during contrib builds, when classes in
    core were changed without ant clean. This fix also optimizes the
diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java b/lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
similarity index 99%
rename from lucene/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
rename to lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
index a1dfdaef2a0..f06d0e23a06 100644
--- a/lucene/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
+++ b/lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
@@ -1,4 +1,4 @@
-package org.apache.lucene.misc;
+package org.apache.lucene.search;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/lucene/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java b/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
similarity index 99%
rename from lucene/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
rename to lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
index 5eaaa79df97..a8f4010de0f 100644
--- a/lucene/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
+++ b/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
@@ -1,4 +1,4 @@
-package org.apache.lucene.misc;
+package org.apache.lucene.search;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/lucene/contrib/spatial/build.xml b/lucene/contrib/spatial/build.xml
index 37c6f04b539..9516c2c763a 100644
--- a/lucene/contrib/spatial/build.xml
+++ b/lucene/contrib/spatial/build.xml
@@ -25,18 +25,18 @@
 
   <import file="../contrib-build.xml"/>
 
-  <contrib-uptodate name="misc" property="misc.uptodate" classpath.property="misc.jar"/>
+  <contrib-uptodate name="queries" property="queries.uptodate" classpath.property="queries.jar"/>
 
   <path id="classpath">
-    <pathelement path="${misc.jar}"/>
+    <pathelement path="${queries.jar}"/>
     <path refid="base.classpath"/>
   </path>
 
-  <target name="compile-core" depends="build-misc, common.compile-core" />
+  <target name="compile-core" depends="build-queries, common.compile-core" />
 
-  <target name="build-misc" unless="misc.uptodate">
-    <echo>Misc building dependency ${misc.jar}</echo>
-    <ant antfile="../misc/build.xml" target="default" inheritall="false" dir="../misc" />
+  <target name="build-queries" unless="queries.uptodate">
+    <echo>Misc building dependency ${queries.jar}</echo>
+    <ant antfile="../queries/build.xml" target="default" inheritall="false" dir="../queries" />
   </target>
   
 </project>
diff --git a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
index 91526f60031..ed7393651b1 100644
--- a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
+++ b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
@@ -18,11 +18,11 @@
 package org.apache.lucene.spatial.tier;
 
 import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.ChainedFilter;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryWrapperFilter;
 import org.apache.lucene.spatial.geohash.GeoHashDistanceFilter;
-import org.apache.lucene.misc.ChainedFilter;
 
 /**
  * <p><font color="red"><b>NOTE:</b> This API is still in