jira is down and i am trying to make progress here.
below is a patch to move the ChainedFilter from contrib/misc to
contrib/queries with the other queries and filters.
before applying the patch, you must run these commands:
svn move
lucene/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
lucene/contrib/queries/src/java/org/apache/lucene/search/
svn move
lucene/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
lucene/contrib/queries/src/test/org/apache/lucene/search/
Index: lucene/contrib/CHANGES.txt
===================================================================
--- lucene/contrib/CHANGES.txt (revision 932731)
+++ lucene/contrib/CHANGES.txt (working copy)
@@ -127,7 +127,9 @@
* 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
Index:
lucene/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
(deleted)
===================================================================
Index:
lucene/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
(deleted)
===================================================================
Index:
lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
===================================================================
---
lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
(revision
932731)
+++
lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
(working
copy)
@@ -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
Index: lucene/contrib/spatial/build.xml
===================================================================
--- lucene/contrib/spatial/build.xml (revision 932731)
+++ lucene/contrib/spatial/build.xml (working copy)
@@ -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>
Index:
lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
===================================================================
---
lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
(revision
932731)
+++
lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
(working
copy)
@@ -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
Index:
lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
===================================================================
---
lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
(revision
932731)
+++
lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
(working
copy)
@@ -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
On Sat, Apr 10, 2010 at 9:51 AM, Robert Muir (JIRA) <j...@apache.org> wrote:
>
> [
> https://issues.apache.org/jira/browse/LUCENE-2323?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel]
>
> Robert Muir updated LUCENE-2323:
> --------------------------------
>
> Attachment: LUCENE-2323_surround.patch
>
> attached is a patch to move surround to contrib/queryparser.
>
> before applying the patch please run:
> {noformat}
> svn move
> lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround
> lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/
> svn move
> lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround
> lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/
> svn move lucene/contrib/surround/README.txt lucene/contrib/queryparser
> svn delete lucene/contrib/surround
> {noformat}
>
>
> > reorganize contrib modules
> > --------------------------
> >
> > Key: LUCENE-2323
> > URL: https://issues.apache.org/jira/browse/LUCENE-2323
> > Project: Lucene - Java
> > Issue Type: Improvement
> > Components: contrib/*
> > Reporter: Robert Muir
> > Assignee: Robert Muir
> > Attachments: LUCENE-2323.patch, LUCENE-2323_surround.patch,
> LUCENE-2323_wikipedia.patch
> >
> >
> > it would be nice to reorganize contrib modules, so that they are bundled
> together by functionality.
> > For example:
> > * the wikipedia contrib is a tokenizer, i think really belongs in
> contrib/analyzers
> > * there are two highlighters, i think could be one highlighters package.
> > * there are many queryparsers and queries in different places in contrib
>
> --
> This message is automatically generated by JIRA.
> -
> If you think it was sent incorrectly contact one of the administrators:
> https://issues.apache.org/jira/secure/Administrators.jspa
> -
> For more information on JIRA, see: http://www.atlassian.com/software/jira
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscr...@lucene.apache.org
> For additional commands, e-mail: java-dev-h...@lucene.apache.org
>
>
--
Robert Muir
rcm...@gmail.com
