You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/02/21 15:13:40 UTC
svn commit: r1072973 [3/11] - in /lucene/dev/branches/docvalues: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/demo/
dev-tools/idea/lucene/contrib/highlighter/ dev-tools/idea/lucene/contrib...
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java Mon Feb 21 14:13:28 2011
@@ -26,8 +26,6 @@ import org.apache.lucene.queryParser.cor
*/
public class OpaqueQueryNode extends QueryNodeImpl {
- private static final long serialVersionUID = 0L;
-
private CharSequence schema = null;
private CharSequence value = null;
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java Mon Feb 21 14:13:28 2011
@@ -29,8 +29,6 @@ import org.apache.lucene.queryParser.cor
*/
public class OrQueryNode extends BooleanQueryNode {
- private static final long serialVersionUID = -3692323307688017852L;
-
/**
* @param clauses
* - the query nodes to be or'ed
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java Mon Feb 21 14:13:28 2011
@@ -25,8 +25,6 @@ import org.apache.lucene.queryParser.cor
*/
public class ParametricQueryNode extends FieldQueryNode {
- private static final long serialVersionUID = -5770038129741218116L;
-
private CompareOperator operator;
public enum CompareOperator {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java Mon Feb 21 14:13:28 2011
@@ -29,8 +29,6 @@ import org.apache.lucene.queryParser.cor
public class ParametricRangeQueryNode extends QueryNodeImpl implements
FieldableNode {
- private static final long serialVersionUID = 7120958816535573935L;
-
public ParametricRangeQueryNode(ParametricQueryNode lowerBound,
ParametricQueryNode upperBound) {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java Mon Feb 21 14:13:28 2011
@@ -41,8 +41,6 @@ import org.apache.lucene.queryParser.cor
*/
public class PathQueryNode extends QueryNodeImpl {
- private static final long serialVersionUID = -8325921322405804789L;
-
public static class QueryText implements Cloneable {
CharSequence value = null;
/**
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java Mon Feb 21 14:13:28 2011
@@ -26,8 +26,6 @@ import org.apache.lucene.queryParser.cor
public class PhraseSlopQueryNode extends QueryNodeImpl implements FieldableNode {
- private static final long serialVersionUID = 0L;
-
private int value = 0;
/**
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.queryParser.cor
*/
public class ProximityQueryNode extends BooleanQueryNode {
- private static final long serialVersionUID = 9018220596680832916L;
-
public enum Type {
PARAGRAPH {
@Override
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNode.java Mon Feb 21 14:13:28 2011
@@ -17,7 +17,6 @@ package org.apache.lucene.queryParser.co
* limitations under the License.
*/
-import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -27,7 +26,7 @@ import org.apache.lucene.queryParser.cor
* A {@link QueryNode} is a interface implemented by all nodes on a QueryNode
* tree.
*/
-public interface QueryNode extends Serializable {
+public interface QueryNode {
/** convert to a query string understood by the query parser */
// TODO: this interface might be changed in the future
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.queryParser.cor
*/
public abstract class QueryNodeImpl implements QueryNode, Cloneable {
- private static final long serialVersionUID = 5569870883474845989L;
-
/* index default field */
// TODO remove PLAINTEXT_FIELD_NAME replacing it with configuration APIs
public static final String PLAINTEXT_FIELD_NAME = "_plain";
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java Mon Feb 21 14:13:28 2011
@@ -25,8 +25,6 @@ import org.apache.lucene.queryParser.cor
*/
public class QuotedFieldQueryNode extends FieldQueryNode {
- private static final long serialVersionUID = -6675157780051428987L;
-
/**
* @param field
* - field name
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java Mon Feb 21 14:13:28 2011
@@ -34,8 +34,6 @@ import org.apache.lucene.queryParser.cor
*/
public class SlopQueryNode extends QueryNodeImpl implements FieldableNode {
- private static final long serialVersionUID = 0L;
-
private int value = 0;
/**
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TokenizedPhraseQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TokenizedPhraseQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TokenizedPhraseQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TokenizedPhraseQueryNode.java Mon Feb 21 14:13:28 2011
@@ -28,8 +28,6 @@ import org.apache.lucene.queryParser.cor
public class TokenizedPhraseQueryNode extends QueryNodeImpl implements
FieldableNode {
- private static final long serialVersionUID = -7185108320787917541L;
-
public TokenizedPhraseQueryNode() {
setLeaf(false);
allocate();
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html Mon Feb 21 14:13:28 2011
@@ -26,7 +26,7 @@ Contains query nodes that are commonly u
<h2>Query Nodes</h2>
<p>
The package <tt>org.apache.lucene.queryParser.nodes</tt> contains all the basic query nodes. The interface
-that represents a query node is {@link org.apache.lucene.queryParser.core.nodes.QueryNode}. Every query node must be serializable.
+that represents a query node is {@link org.apache.lucene.queryParser.core.nodes.QueryNode}.
</p>
<p>
{@link org.apache.lucene.queryParser.core.nodes.QueryNode}s are used by the text parser to create a syntax tree.
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorImpl.java Mon Feb 21 14:13:28 2011
@@ -244,8 +244,6 @@ public abstract class QueryNodeProcessor
private static class ChildrenList extends ArrayList<QueryNode> {
- private static final long serialVersionUID = -2613518456949297135L;
-
boolean beingUsed;
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -31,8 +31,6 @@ import org.apache.lucene.util.AttributeI
public class AllowLeadingWildcardAttributeImpl extends AttributeImpl
implements AllowLeadingWildcardAttribute {
- private static final long serialVersionUID = -2804763012723049527L;
-
private boolean allowLeadingWildcard = false; // default in 2.9
public void setAllowLeadingWildcard(boolean allowLeadingWildcard) {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class AnalyzerAttributeImpl extends AttributeImpl
implements AnalyzerAttribute {
- private static final long serialVersionUID = -6804760312723049526L;
-
private Analyzer analyzer;
public AnalyzerAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class BoostAttributeImpl extends AttributeImpl
implements BoostAttribute {
- private static final long serialVersionUID = -2104763012523049527L;
-
private float boost = 1.0f;
public BoostAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class DateResolutionAttributeImpl extends AttributeImpl
implements DateResolutionAttribute {
- private static final long serialVersionUID = -6804360312723049526L;
-
private DateTools.Resolution dateResolution = null;
public DateResolutionAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -32,8 +32,6 @@ import org.apache.lucene.util.AttributeI
public class DefaultOperatorAttributeImpl extends AttributeImpl
implements DefaultOperatorAttribute {
- private static final long serialVersionUID = -6804760312723049526L;
-
private Operator operator = Operator.OR;
public DefaultOperatorAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -32,8 +32,6 @@ import org.apache.lucene.util.AttributeI
public class DefaultPhraseSlopAttributeImpl extends AttributeImpl
implements DefaultPhraseSlopAttribute {
- private static final long serialVersionUID = -2104763012527049527L;
-
private int defaultPhraseSlop = 0;
public DefaultPhraseSlopAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -36,8 +36,6 @@ import org.apache.lucene.util.AttributeI
public class FieldBoostMapAttributeImpl extends AttributeImpl
implements FieldBoostMapAttribute {
- private static final long serialVersionUID = -2104763012523049527L;
-
private Map<String, Float> boosts = new LinkedHashMap<String, Float>();
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java Mon Feb 21 14:13:28 2011
@@ -34,8 +34,6 @@ import org.apache.lucene.queryParser.cor
*/
public class FieldBoostMapFCListener implements FieldConfigListener {
- private static final long serialVersionUID = -5929802948798314067L;
-
private QueryConfigHandler config = null;
public FieldBoostMapFCListener(QueryConfigHandler config) {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java Mon Feb 21 14:13:28 2011
@@ -36,8 +36,6 @@ import org.apache.lucene.queryParser.cor
*/
public class FieldDateResolutionFCListener implements FieldConfigListener {
- private static final long serialVersionUID = -5929802948798314067L;
-
private QueryConfigHandler config = null;
public FieldDateResolutionFCListener(QueryConfigHandler config) {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class FieldDateResolutionMapAttributeImpl extends AttributeImpl
implements FieldDateResolutionMapAttribute {
- private static final long serialVersionUID = -2104763012523049527L;
-
private Map<CharSequence, DateTools.Resolution> dateRes = new HashMap<CharSequence, DateTools.Resolution>();
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class FuzzyAttributeImpl extends AttributeImpl
implements FuzzyAttribute {
- private static final long serialVersionUID = -2104763012527049527L;
-
private int prefixLength = FuzzyQuery.defaultPrefixLength;
private float minSimilarity = FuzzyQuery.defaultMinSimilarity;
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class LocaleAttributeImpl extends AttributeImpl
implements LocaleAttribute {
- private static final long serialVersionUID = -6804760312720049526L;
-
private Locale locale = Locale.getDefault();
public LocaleAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class LowercaseExpandedTermsAttributeImpl extends AttributeImpl
implements LowercaseExpandedTermsAttribute {
- private static final long serialVersionUID = -2804760312723049527L;
-
private boolean lowercaseExpandedTerms = true;
public LowercaseExpandedTermsAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
public class MultiFieldAttributeImpl extends AttributeImpl
implements MultiFieldAttribute {
- private static final long serialVersionUID = -6809760312720049526L;
-
private CharSequence[] fields;
public MultiFieldAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.util.AttributeI
*/
public class MultiTermRewriteMethodAttributeImpl extends AttributeImpl
implements MultiTermRewriteMethodAttribute {
-
- private static final long serialVersionUID = -2104763012723049527L;
private MultiTermQuery.RewriteMethod multiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -31,8 +31,6 @@ import org.apache.lucene.util.AttributeI
public class PositionIncrementsAttributeImpl extends AttributeImpl
implements PositionIncrementsAttribute {
- private static final long serialVersionUID = -2804763012793049527L;
-
private boolean positionIncrementsEnabled = false;
public PositionIncrementsAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -35,8 +35,6 @@ import org.apache.lucene.util.AttributeI
public class RangeCollatorAttributeImpl extends AttributeImpl
implements RangeCollatorAttribute {
- private static final long serialVersionUID = -6804360312723049526L;
-
private Collator rangeCollator;
public RangeCollatorAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java Mon Feb 21 14:13:28 2011
@@ -30,8 +30,6 @@ import org.apache.lucene.queryParser.sta
*/
public class BooleanModifierNode extends ModifierQueryNode {
- private static final long serialVersionUID = -557816496416587068L;
-
public BooleanModifierNode(QueryNode node, Modifier mod) {
super(node, mod);
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java Mon Feb 21 14:13:28 2011
@@ -33,8 +33,6 @@ import org.apache.lucene.search.PhraseQu
public class MultiPhraseQueryNode extends QueryNodeImpl implements
FieldableNode {
- private static final long serialVersionUID = -2138501723963320158L;
-
public MultiPhraseQueryNode() {
setLeaf(false);
allocate();
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/PrefixWildcardQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/PrefixWildcardQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/PrefixWildcardQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/PrefixWildcardQueryNode.java Mon Feb 21 14:13:28 2011
@@ -27,8 +27,6 @@ import org.apache.lucene.queryParser.cor
*/
public class PrefixWildcardQueryNode extends WildcardQueryNode {
- private static final long serialVersionUID = 6851557641826407515L;
-
/**
* @param field
* - field name
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java Mon Feb 21 14:13:28 2011
@@ -34,8 +34,6 @@ import org.apache.lucene.queryParser.sta
*/
public class RangeQueryNode extends ParametricRangeQueryNode {
- private static final long serialVersionUID = 7400866652044314657L;
-
private Collator collator;
/**
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RegexpQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RegexpQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RegexpQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RegexpQueryNode.java Mon Feb 21 14:13:28 2011
@@ -29,7 +29,6 @@ import org.apache.lucene.util.BytesRef;
*/
public class RegexpQueryNode extends QueryNodeImpl implements TextableQueryNode,
FieldableNode {
- private static final long serialVersionUID = 0L;
private CharSequence text;
private CharSequence field;
/**
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java Mon Feb 21 14:13:28 2011
@@ -34,8 +34,6 @@ import org.apache.lucene.search.Similari
*/
public class StandardBooleanQueryNode extends BooleanQueryNode {
- private static final long serialVersionUID = 1938287817191138787L;
-
private boolean disableCoord;
/**
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/WildcardQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/WildcardQueryNode.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/WildcardQueryNode.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/WildcardQueryNode.java Mon Feb 21 14:13:28 2011
@@ -25,7 +25,6 @@ import org.apache.lucene.queryParser.cor
* phrases. Examples: a*b*c Fl?w? m?ke*g
*/
public class WildcardQueryNode extends FieldQueryNode {
- private static final long serialVersionUID = 0L;
/**
* @param field
Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttributeImpl.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttributeImpl.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttributeImpl.java Mon Feb 21 14:13:28 2011
@@ -31,8 +31,6 @@ import org.apache.lucene.util.AttributeI
public class UniqueFieldAttributeImpl extends AttributeImpl implements
UniqueFieldAttribute {
- private static final long serialVersionUID = 8553318595851064232L;
-
private CharSequence uniqueField;
public UniqueFieldAttributeImpl() {
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java Mon Feb 21 14:13:28 2011
@@ -36,11 +36,6 @@ import org.apache.lucene.spatial.tier.Di
*/
public class GeoHashDistanceFilter extends DistanceFilter {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
private double lat;
private double lng;
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java Mon Feb 21 14:13:28 2011
@@ -31,8 +31,6 @@ import org.apache.lucene.search.FieldCom
*/
public class DistanceFieldComparatorSource extends FieldComparatorSource {
- private static final long serialVersionUID = 1L;
-
private DistanceFilter distanceFilter;
private DistanceScoreDocLookupComparator dsdlc;
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java Mon Feb 21 14:13:28 2011
@@ -19,8 +19,6 @@ package org.apache.lucene.spatial.tier;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.HashMap;
-import java.io.IOException;
-import java.io.ObjectInputStream;
import org.apache.lucene.search.Filter;
import org.apache.lucene.spatial.tier.DistanceHandler.Precision;
@@ -63,12 +61,6 @@ public abstract class DistanceFilter ext
distanceLookupCache = new WeakHashMap<String,Double>();
}
- /** needed for deserialization, because the cache is transient */
- private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
- stream.defaultReadObject();
- distanceLookupCache = new WeakHashMap<String,Double>();
- }
-
public Map<Integer,Double> getDistances(){
return distances;
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java Mon Feb 21 14:13:28 2011
@@ -30,8 +30,6 @@ import org.apache.lucene.spatial.geohash
* release.</font>
*/
public class DistanceQueryBuilder {
-
- private static final long serialVersionUID = 1L;
private final double lat;
private final double lng;
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java Mon Feb 21 14:13:28 2011
@@ -24,11 +24,6 @@ package org.apache.lucene.spatial.tier;
*/
public class InvalidGeoException extends Exception {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
public InvalidGeoException(String message){
super(message);
}
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java Mon Feb 21 14:13:28 2011
@@ -33,11 +33,6 @@ import org.apache.lucene.spatial.Distanc
* release.</font>
*/
public class LatLongDistanceFilter extends DistanceFilter {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
double lat;
double lng;
Modified: lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java Mon Feb 21 14:13:28 2011
@@ -17,7 +17,6 @@
package org.apache.lucene.spatial.tier;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -26,7 +25,7 @@ import java.util.List;
* flux and might change in incompatible ways in the next
* release.</font>
*/
-public class Shape implements Serializable{
+public class Shape {
private List<Double> area = new ArrayList<Double>();
private String tierId;
Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java Mon Feb 21 14:13:28 2011
@@ -154,7 +154,6 @@ public class NumericRangeFilterBuilder i
}
static class NoMatchFilter extends Filter {
- private static final long serialVersionUID = 1L;
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException {
Modified: lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java Mon Feb 21 14:13:28 2011
@@ -21,6 +21,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.Version;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.AfterClass;
+import org.junit.Assume;
import org.junit.BeforeClass;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -186,6 +187,7 @@ public class TestParser extends LuceneTe
}
public void testDuplicateFilterQueryXML() throws ParserException, IOException
{
+ Assume.assumeTrue(searcher.getIndexReader().getSequentialSubReaders().length == 1);
Query q=parse("DuplicateFilterQuery.xml");
int h = searcher.search(q, null, 1000).totalHits;
assertEquals("DuplicateFilterQuery should produce 1 result ", 1,h);
Modified: lucene/dev/branches/docvalues/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/contributions.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/contributions.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/contributions.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="api/core/index.html">Core</a>
</div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
<div class="menuitem">
<a href="api/contrib-ant/index.html">Ant</a>
</div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
<a href="api/contrib-highlighter/index.html">Highlighter</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/docvalues/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="api/core/index.html">Core</a>
</div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
<div class="menuitem">
<a href="api/contrib-ant/index.html">Ant</a>
</div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
<a href="api/contrib-highlighter/index.html">Highlighter</a>
</div>
<div class="menuitem">
@@ -243,7 +243,7 @@ document.write("Last Published: " + docu
<a href="#About this Document">About this Document</a>
</li>
<li>
-<a href="#About the Demos">About the Demos</a>
+<a href="#About the Demo">About the Demo</a>
</li>
<li>
<a href="#Setting your CLASSPATH">Setting your CLASSPATH</a>
@@ -269,12 +269,12 @@ It walks you through some basic installa
-<a name="N1001C"></a><a name="About the Demos"></a>
-<h2 class="boxed">About the Demos</h2>
+<a name="N1001C"></a><a name="About the Demo"></a>
+<h2 class="boxed">About the Demo</h2>
<div class="section">
<p>
-The Lucene command-line demo code consists of two applications that demonstrate various
-functionalities of Lucene and how one should go about adding Lucene to their applications.
+The Lucene command-line demo code consists of an application that demonstrates various
+functionalities of Lucene and how you can add Lucene to your applications.
</p>
</div>
@@ -285,19 +285,38 @@ functionalities of Lucene and how one sh
<p>
First, you should <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">download</a> the
latest Lucene distribution and then extract it to a working directory. Alternatively, you can <a href="http://wiki.apache.org/lucene-java/SourceRepository">check out the sources from
-Subversion</a>, and then run <span class="codefrag">ant war-demo</span> to generate the JARs and WARs.
+Subversion</a>, and then run <span class="codefrag">ant</span> in the <span class="codefrag">lucene/contrib/demo/</span>
+directory to generate the JARs.
</p>
<p>
-You should see the Lucene JAR file in the directory you created when you extracted the archive. It
-should be named something like <span class="codefrag">lucene-core-{version}.jar</span>. You should also see a file
-called <span class="codefrag">lucene-demos-{version}.jar</span>. If you checked out the sources from Subversion then
-the JARs are located under the <span class="codefrag">build</span> subdirectory (after running <span class="codefrag">ant</span>
-successfully). Put both of these files in your Java CLASSPATH.
+You need three JARs: the Lucene JAR, the common analysis JAR, and the Lucene demo JAR. You should
+see the Lucene JAR file in the directory you created when you extracted the archive -- it
+should be named something like <span class="codefrag">lucene-core-{version}.jar</span>. You should also see files
+called <span class="codefrag">lucene-analysis-common-{version}.jar</span> and <span class="codefrag">lucene-demos-{version}.jar</span>.
+If you checked out the sources from Subversion then the JARs are located at:
+</p>
+<ul>
+
+<li>
+<span class="codefrag">lucene/build/lucene-core-4.0-SNAPSHOT.jar</span>
+</li>
+
+<li>
+<span class="codefrag">modules/analysis/build/common/lucene-analyzers-common-4.0-SNAPSHOT.jar</span>
+</li>
+
+<li>
+<span class="codefrag">lucene/build/contrib/demo/lucene-demo-4.0-SNAPSHOT.jar</span>
+</li>
+
+</ul>
+<p>
+Put all three of these files in your Java CLASSPATH.
</p>
</div>
-<a name="N10048"></a><a name="Indexing Files"></a>
+<a name="N1005A"></a><a name="Indexing Files"></a>
<h2 class="boxed">Indexing Files</h2>
<div class="section">
<p>
@@ -326,7 +345,7 @@ you whether you want more results.
</div>
-<a name="N10063"></a><a name="About the code..."></a>
+<a name="N10075"></a><a name="About the code..."></a>
<h2 class="boxed">About the code...</h2>
<div class="section">
<p>
Modified: lucene/dev/branches/docvalues/lucene/docs/demo.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo.pdf?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo.pdf (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo.pdf Mon Feb 21 14:13:28 2011
@@ -5,10 +5,10 @@
/Producer (FOP 0.20.5) >>
endobj
5 0 obj
-<< /Length 615 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 620 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gaua<9lHd\&;KZO$6PI!?%6<CP-iV[<N3S;[rr8rS-4]$>qk[>h\QrZS[;SS9*tq%RUKg"Z-=iJi,V6e@1\!3'-R1n!sH%5#,o-gM!\Hg&>W_;dQP+4,u7[XPB1\/7+Ao>h6sjnT"]0]79`e]WO?[k;oKaS!U7po!1:=t2l\T8<?6L#r.p94.<?l?jB`?l038uuEe$.W^c@$,@KV02CAHj//>4$?<TUQg7s>#Bp5qGZ?qA1f]/4l9qWt_?2:EL'cF#E*R:c*3!Ck-/0XCNFDE8O<J(V4oJ\h<J^30"F>N6or?.h2[V=Slf,qoS;K]fqX$ud%MC+h7cPP?[U:^fU"'&U0IL[V?uh&+DIdDl;"6G?7r_&sh]k]?hfla8Q]3%>0u=5DG&/T6jGqH&jZ3)^jab#@g6E8GGq!JO7#He(-UOT1?^=(N\mBt[#]19e)\_:&\L!JaIgHe/5Op:2edT?ObYU-JMC2SaGRr9aARs80`*5f((_ZiWP15qTo"p`1o%59aUF&<)EQghTEIEu9ZP`,n*A9E"KdQeS'N5OeuqYu:e!d&GO`,cA=lXZ,AgX1apdDH2ge;CeqB,ZWqo+1q'MCh3Jq$g>sp!2=LlrV~>
+Gaua<9l...@r9cX>rr^526HS!<li_onK1^]#n3'lr*JmJC680[JEN^Noc=%tXM!/p\f&kr%.eX,5IcEX!a%d5"KN!`b9?t0&f'Ma%>'VnCe*&p%L!a4rLs+5'5'H=-<NGC^jj9_$"^lY8)Z~>
endstream
endobj
6 0 obj
@@ -42,7 +42,7 @@ endobj
10 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 102.0 500.966 194.66 488.966 ]
+/Rect [ 102.0 500.966 189.992 488.966 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A 11 0 R
@@ -80,10 +80,10 @@ endobj
>>
endobj
18 0 obj
-<< /Length 2210 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2291 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gatm=gQ(#H&:O:SW;D_\L`''6pE@=idS1AXBppnU'MTZ_M7/\77>IVg0nT=M8,&].\o&DhfNh)n3HO?,n-jBESGfa`I@f+;>"#f7<PL[hX5CY)Lb)2:/G%$qYH6Eo-FOZa*rP[.lL-b+$$AC(EbdQ0I<Mre4hD.T>(*V[cYRAQK,*;d[@4(d$_I[TEbG@DR$&iJgo6WcI(^/h)MW!r(;o@4Ls$gbiVhZbnkJ-HXd=Le>3'uT$A-PM)!Mh3(3LORFDDjg]Wa,&WU6)F4*FEhgGDto:O"WW@H]9^rk-s(V:'`I4=Lu.MC2KCP>.Gl*-j/k^WSs5bAstb/G!+nX0u],[q3d)hVtC/Ce)EXI89Q4'IX6jOhV-eh'8hXU;U8-;/Wh`/$VI2Y?6q,(bK\fbEtmjDK$p<q)[>rZMoU:0`OqKqGBYnJJ`%AWkmbO+UMt__9"]-<93ht$;Vm<rEqorfD2TqomNG`\s->m"aN@Q[f]aq=c/hP6,qe-g5N[8$\dRkf#Y<&R`P4"/</rq("dr3oW97g&4X%I"-]]4M^^:TSjUB?[<7nXe`n\Y<QYatNEt+;ZkWg&$\)2n7@Bi&2qTiJTI`[AZl8Cho+Q_Jb%ZZ\.#ArL(uTcHM(:mr;1l'18:3?K99A#OOV_r>n*]%>07Pj#flfpm7Wp+E+Up%IZNi_.0!0"i=fA6Q)D_k++qAlF=COfa-ni50k---sF.'2R1IVT#6a-8$i,O\d!&[IP<:18`hUf!';VctOicL2.WT:;snqcU(VRXj$4:aP9RQu]IZ7t/+p`:%(=I':"DN$Ad/]A3^Tj0a"=TC-O01#k<T%:el[u6G(qmK"flKSkcrp83%$%TG>2[:\m9s&0^5,Aeo!s3ldNl2,GY1F^(L,[^+$A3t\^ah0S+]PD=g[!1,r%,?lh_>k^%MXdW6a+qnYXZqU'/:a;a,r@e/S*SE/[P74PpX.f(;h<:A@r(d)W\aPNYO<5B03b/,o/c
'iUW2/p\YGtSAg(2_EbRXX'qR>6Lss(QGDD!-RR.Na9s@266=YhT"om]6e**%b-F>NBY[;]N^41UOI/1S4;)o8`i[.dBY3&08kCjC#`!A9,#hQIE7@Y+b61RZ.eG`NERceoR<-J#ETn:EcM\B_\XYEu$>DF#H0'=_mAi"eP&mQgGYTS#j_>u65<`[p`T7e=DY:?*h<T?]V:;ngrMWF0.dM2moP3K\9e"4%i_ll$/3A<.K#mF&LNk*Z')7nHh"$'_bgq(bPH&lF*`,2q)WO=;,r`1;7C(u`V<%K<2YS,?4IdP0V(Z#S\o%@&#U@s!+M#/AJuUQ=6l<HeoGa?#q^ml>L>ns51u8M7oK9t'l'b1l.Sc8B'J$W7&3Wr,l_R]F:^'2F/Q\"[5&H/ca!mkc@.k7s2FUL2%(aN69_(6Za.=&ORE1%,lHmbr.f2'qoVod':`]<.BCo(HUlZP4p'_9MBdt^6.P7V+J7GaO&*;@+bl:kCe9oTlG-8cr=le>D6D@dg^L]C#=f)?M.HB[QA%K,HlS/GeT6PgXRotO0>]KB!l(l3TNOL7XToE#&c)1P^(=CK\S<.9m^bEFpW:H<e<HI#)UCobil'sFM;.n<T41d#&A(Y[0n+TZCY$V-/YEp@l*asP"HFiP<g<m>E;WGfNGC_giP0YH+RZ&Op4^G'Bf+&eP&85gc4AW20E/ke)ijlp]n3&uKZdU/hbY4SO8QWs+>7u;0&X-&,7t#7%,QfG*PXYn<D:u06g'DTeH%Tm1Nn=G9PaTD?C%(P>KYfh%i0\HOFNCYcc8FKaiAbQ`Fc(8B!B=*U'UE!hE]W9:XhaLL<T^RFnF%u!$dBT=!e[c!YmmjTa:#-U"cbPn5al6n0jt7NK9+J"^/EJS:sGX8iGpcS\!Z-4hjok,meo](i]tQN+N\T-BV>g#[$&DCn:n5$MM)i.$]V1B4&[+Y!%nj:1o)D`e.Zqu\8B<Z5C_N32NAMP(*iM>7)Z!c'iL
ApB@3f"?'iiONA.Hf2$YLXs(JQpDCRZpAlSf7,tU=Mh:tDZ5?"?%DS#`2rlN@B?D<99@+KR?LEuLr]PQU&'jU&7/in1-#<1J[[2,DB_q*T:D+=/e3=%6P2fJk7SC$lTJ#CZY=uc#Ra91@6Zd]Af5K\)SXeQt-(&f9qT+3*d[Y&#<k%un>T\&3cYuZXgBJrY("Z099%=LIC8a^1emp2S@1^`f)-\u^@!6c9H('~>
+Gatm=99[ga&AI=/Ge(Uj&]L'.iALd"4Gj3+abAI)K4?Eg)93)i4COQ8^Mh<AQ...@cAX6_>J^SfbbD[5AAJ/<cZ>CoQG6iB`s+IBo7Dp-qE>GXERJ\`aJP@(Fd;qQAMSB.<)DUL^9B*PTTc!HNT.IU1=\\^:0]INl<h8Ck^73\/%I^+HN2"NgM;6<6fL+m!E6,@rj?gD8V7mOd)LTWQK"&#+GZ@K^dJ#$q43]Z`Of6gj4HgX=82Sn"_pFDc%<,#u:"%P(+:^S;6;/;jr1sCi'\l?2!h]lP6.B#_70("B;i\$%o=#Off,lVGYKT8>>nVaNX[prb88oZHHLU6C+`ip*;EcrtUtkJi7rClnZ,h3\)T!t*OHO4ZV1<!:XfF5\"7)XNlmok._;m5H0n?5#aMgkjel*]<^_O4T4O""%,StZl1NLT*!T:M"q45VU)G62695[Q;(b)?ck9`/p2M1B0(om6\'."LXl+JVM=f'YfEO@oKZYt0n(faWsmdou`146YYc?Mr^9U[[9S9M0d8f@kQCgcGAe#27a//CKc$4RB^7uK0d;5dr!f''e+NJB*%TErj$N&MOpHZIJ5"0.9j4[*;X(Q<(R&8\`1ZQE_&o^5YqX"#jfOV-c#,q`m'a^]^gM7b"jl2$"`qs4WIUKI;5NX/6h1@9b
+#kM2Z*bC%6N="e5&L\Lk(5[+^@RGLOV%E=nK_eFt0VKg[/<V$...@SodO>q]AWtAiZ\2lBM6t]G+&sp3[N!?c1JkZcf>#c0&k]UQ=PpM-Y5<j;U,Q=jpmBD<$DsCc^/RdAN)q.p1f\%e*?!uNBZ.;<:U,;K/.M;^"n^`jn:oa2ZdPU4,W:o]Vu70Kq"t+PHI<M$4`H<[qESJC_W](F/Glr-VN[EihI950&:2,-<A*h3mQ5e_-Lm,(EQk?&]#c%ne!=J?#l@IT;-2.@=9,X!+2WWO8kckp\Dt)o>?:ug!uupK6%,_(_bS
E`,e8/X)%LAsFJhB]PIp@j#+rg[3kMqlmXZ?K2"n^sd(qFkRaatMisu`K/l'qA4b$?[,+dZX7DstI-$5f$U!%&cMjb+)1=0&Q_gl2IpUB;=kYc!E(*rk'<ptM8\iK+!^EuI??$;hGqE*`DF7ndr0pE]Acu0:/Ro!IW0:T+lEQ7;?TV`[=ee/=\YgrG7lf<LNMThp^ch^i\M.l,Kk_k_$NnslqMEES_dk(0^+7;P*h:2uA<K.EP[-nDJC>6QYC8'8gOO<Ca2;cJbb6-"[.p`s)pCX3nf&3qRe9dNq%(3:KALXW_rrXq'W&O~>
endstream
endobj
19 0 obj
@@ -94,80 +94,95 @@ endobj
/Contents 18 0 R
>>
endobj
+20 0 obj
+<< /Length 471 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+GarnSbAMqd&A7ljp6Zo\fZ(pMM%nYjC=PZngtEehE!R)m.?IU/qjL$.8R!?HAsqJGSTPXAgDG>]JqGa"*jd;mZonR!"+VkRs*m4N!/1Ohn--:>0&#bS'ps:e.LfVSKVB;8ee2XhLj+Y?L27%j;!:igBB_Uu#C)dGHj+TBQ'nb_k1#?og$94q-Iir;niOear<0JX]G^?d*!a3-<l?Cu'0QCFlh*rZ=<a*FPY.uuChUuQE]LL2X;M/.s2pYW:;Xk3I<AL\Y?4C:8tWrdiKWPH)OaGuFNTLu0=+5HQ0AG/Q$&jZif_kt1lG>(-^2W24rDnUFq^Ea8gK^3n;:U#>,ugZX6?1^L=T]lN;BKYBlD<PMNVE:3+.mWBDYX6*;T^<DI'#cWG?SQY4?Ddm9Kpuo5@=L&MZWM&]MZ7*H3"en;GsW?`J,jCNCt(e`<UG:0LMRT^,lF=P(.\e>[N<IK0A:[F"~>
+endstream
+endobj
21 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 20 0 R
+>>
+endobj
+23 0 obj
<<
/Title (\376\377\0\61\0\40\0\101\0\142\0\157\0\165\0\164\0\40\0\164\0\150\0\151\0\163\0\40\0\104\0\157\0\143\0\165\0\155\0\145\0\156\0\164)
- /Parent 20 0 R
- /Next 22 0 R
+ /Parent 22 0 R
+ /Next 24 0 R
/A 9 0 R
>> endobj
-22 0 obj
+24 0 obj
<<
- /Title (\376\377\0\62\0\40\0\101\0\142\0\157\0\165\0\164\0\40\0\164\0\150\0\145\0\40\0\104\0\145\0\155\0\157\0\163)
- /Parent 20 0 R
- /Prev 21 0 R
- /Next 23 0 R
+ /Title (\376\377\0\62\0\40\0\101\0\142\0\157\0\165\0\164\0\40\0\164\0\150\0\145\0\40\0\104\0\145\0\155\0\157)
+ /Parent 22 0 R
+ /Prev 23 0 R
+ /Next 25 0 R
/A 11 0 R
>> endobj
-23 0 obj
+25 0 obj
<<
/Title (\376\377\0\63\0\40\0\123\0\145\0\164\0\164\0\151\0\156\0\147\0\40\0\171\0\157\0\165\0\162\0\40\0\103\0\114\0\101\0\123\0\123\0\120\0\101\0\124\0\110)
- /Parent 20 0 R
- /Prev 22 0 R
- /Next 24 0 R
+ /Parent 22 0 R
+ /Prev 24 0 R
+ /Next 26 0 R
/A 13 0 R
>> endobj
-24 0 obj
+26 0 obj
<<
/Title (\376\377\0\64\0\40\0\111\0\156\0\144\0\145\0\170\0\151\0\156\0\147\0\40\0\106\0\151\0\154\0\145\0\163)
- /Parent 20 0 R
- /Prev 23 0 R
- /Next 25 0 R
+ /Parent 22 0 R
+ /Prev 25 0 R
+ /Next 27 0 R
/A 15 0 R
>> endobj
-25 0 obj
+27 0 obj
<<
/Title (\376\377\0\65\0\40\0\101\0\142\0\157\0\165\0\164\0\40\0\164\0\150\0\145\0\40\0\143\0\157\0\144\0\145\0\56\0\56\0\56)
- /Parent 20 0 R
- /Prev 24 0 R
+ /Parent 22 0 R
+ /Prev 26 0 R
/A 17 0 R
>> endobj
-26 0 obj
+28 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F3
/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
-27 0 obj
+29 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F5
/BaseFont /Times-Roman
/Encoding /WinAnsiEncoding >>
endobj
-28 0 obj
+30 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F1
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
-29 0 obj
+31 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F9
/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
-30 0 obj
+32 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F2
/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
-31 0 obj
+33 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F7
@@ -176,19 +191,19 @@ endobj
endobj
1 0 obj
<< /Type /Pages
-/Count 2
-/Kids [6 0 R 19 0 R ] >>
+/Count 3
+/Kids [6 0 R 19 0 R 21 0 R ] >>
endobj
2 0 obj
<< /Type /Catalog
/Pages 1 0 R
- /Outlines 20 0 R
+ /Outlines 22 0 R
/PageMode /UseOutlines
>>
endobj
3 0 obj
<<
-/Font << /F3 26 0 R /F5 27 0 R /F1 28 0 R /F9 29 0 R /F2 30 0 R /F7 31 0 R >>
+/Font << /F3 28 0 R /F5 29 0 R /F1 30 0 R /F9 31 0 R /F2 32 0 R /F7 33 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -212,60 +227,62 @@ endobj
15 0 obj
<<
/S /GoTo
-/D [19 0 R /XYZ 85.0 375.198 null]
+/D [19 0 R /XYZ 85.0 295.198 null]
>>
endobj
17 0 obj
<<
/S /GoTo
-/D [19 0 R /XYZ 85.0 209.264 null]
+/D [21 0 R /XYZ 85.0 659.0 null]
>>
endobj
-20 0 obj
+22 0 obj
<<
- /First 21 0 R
- /Last 25 0 R
+ /First 23 0 R
+ /Last 27 0 R
>> endobj
xref
-0 32
+0 34
0000000000 65535 f
-0000005712 00000 n
-0000005777 00000 n
-0000005869 00000 n
+0000006464 00000 n
+0000006536 00000 n
+0000006628 00000 n
0000000015 00000 n
0000000071 00000 n
-0000000777 00000 n
-0000000897 00000 n
-0000000950 00000 n
-0000006003 00000 n
-0000001085 00000 n
-0000006066 00000 n
-0000001221 00000 n
-0000006132 00000 n
-0000001357 00000 n
-0000006198 00000 n
-0000001492 00000 n
-0000006264 00000 n
-0000001628 00000 n
-0000003931 00000 n
-0000006330 00000 n
-0000004039 00000 n
-0000004242 00000 n
-0000004436 00000 n
-0000004672 00000 n
-0000004861 00000 n
-0000005050 00000 n
-0000005163 00000 n
-0000005273 00000 n
-0000005381 00000 n
-0000005487 00000 n
-0000005603 00000 n
+0000000782 00000 n
+0000000902 00000 n
+0000000955 00000 n
+0000006762 00000 n
+0000001090 00000 n
+0000006825 00000 n
+0000001227 00000 n
+0000006891 00000 n
+0000001363 00000 n
+0000006957 00000 n
+0000001498 00000 n
+0000007023 00000 n
+0000001634 00000 n
+0000004018 00000 n
+0000004126 00000 n
+0000004689 00000 n
+0000007087 00000 n
+0000004797 00000 n
+0000005000 00000 n
+0000005188 00000 n
+0000005424 00000 n
+0000005613 00000 n
+0000005802 00000 n
+0000005915 00000 n
+0000006025 00000 n
+0000006133 00000 n
+0000006239 00000 n
+0000006355 00000 n
trailer
<<
-/Size 32
+/Size 34
/Root 2 0 R
/Info 4 0 R
>>
startxref
-6381
+7138
%%EOF
Modified: lucene/dev/branches/docvalues/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/docs/demo2.html?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/docvalues/lucene/docs/demo2.html Mon Feb 21 14:13:28 2011
@@ -129,11 +129,8 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="api/core/index.html">Core</a>
</div>
-<div class="menuitem">
-<a href="api/demo/index.html">Demo</a>
-</div>
-<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
-<div id="menu_1.1.3.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.3.3', 'skin/')" id="menu_1.1.3.3Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.3.3" class="menuitemgroup">
<div class="menuitem">
<a href="api/contrib-ant/index.html">Ant</a>
</div>
@@ -147,6 +144,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
+<a href="api/contrib-demo/index.html">Demo</a>
+</div>
+<div class="menuitem">
<a href="api/contrib-highlighter/index.html">Highlighter</a>
</div>
<div class="menuitem">
@@ -251,9 +251,6 @@ document.write("Last Published: " + docu
<li>
<a href="#Searching Files">Searching Files</a>
</li>
-<li>
-<a href="#The Web example...">The Web example...</a>
-</li>
</ul>
</div>
@@ -275,9 +272,9 @@ how to use Lucene in their applications.
<div class="section">
<p>
Relative to the directory created when you extracted Lucene or retrieved it from Subversion, you
-should see a directory called <span class="codefrag">src</span> which in turn contains a directory called
-<span class="codefrag">demo</span>. This is the root for all of the Lucene demos. Under this directory is
-<span class="codefrag">org/apache/lucene/demo</span>. This is where all the Java sources for the demos live.
+should see a directory called <span class="codefrag">lucene/contrib/demo/</span>. This is the root for the Lucene
+demo. Under this directory is <span class="codefrag">src/java/org/apache/lucene/demo/</span>. This is where all
+the Java sources for the demo live.
</p>
<p>
Within this directory you should see the <span class="codefrag">IndexFiles.java</span> class we executed earlier.
@@ -286,94 +283,111 @@ Bring it up in <span class="codefrag">vi
</div>
-<a name="N10037"></a><a name="IndexFiles"></a>
+<a name="N10034"></a><a name="IndexFiles"></a>
<h2 class="boxed">IndexFiles</h2>
<div class="section">
<p>
-As we discussed in the previous walk-through, the <a href="api/demo/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class creates a Lucene
+As we discussed in the previous walk-through, the <a href="api/contrib-demo/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class creates a Lucene
Index. Let's take a look at how it does this.
</p>
<p>
-The first substantial thing the <span class="codefrag">main</span> function does is instantiate <a href="api/core/org/apache/lucene/index/IndexWriter.html">IndexWriter</a>. It passes the string
-"<span class="codefrag">index</span>" and a new instance of a class called <a href="api/core/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a>.
-The "<span class="codefrag">index</span>" string is the name of the filesystem directory where all index information
-should be stored. Because we're not passing a full path, this will be created as a subdirectory of
-the current working directory (if it does not already exist). On some platforms, it may be created
-in other directories (such as the user's home directory).
+The <span class="codefrag">main()</span> method parses the command-line parameters, then in preparation for
+instantiating <a href="api/core/org/apache/lucene/index/IndexWriter.html">IndexWriter</a>, opens a
+<a href="api/core/org/apache/lucene/store/Directory.html">Directory</a> and instantiates
+<a href="api/module-analysis-common/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a> and
+<a href="api/core/org/apache/lucene/index/IndexWriterConfig.html">IndexWriterConfig</a>.
</p>
<p>
-The <a href="api/core/org/apache/lucene/index/IndexWriter.html">IndexWriter</a> is the main
-class responsible for creating indices. To use it you must instantiate it with a path that it can
-write the index into. If this path does not exist it will first create it. Otherwise it will
-refresh the index at that path. You can also create an index using one of the subclasses of <a href="api/core/org/apache/lucene/store/Directory.html">Directory</a>. In any case, you must also pass an
-instance of <a href="api/core/org/apache/lucene/analysis/Analyzer.html">org.apache.lucene.analysis.Analyzer</a>.
+The value of the <span class="codefrag">-index</span> command-line parameter is the name of the filesystem directory
+where all index information should be stored. If <span class="codefrag">IndexFiles</span> is invoked with a
+relative path given in the <span class="codefrag">-index</span> command-line parameter, or if the <span class="codefrag">-index</span>
+command-line parameter is not given, causing the default relative index path "<span class="codefrag">index</span>"
+to be used, the index path will be created as a subdirectory of the current working directory
+(if it does not already exist). On some platforms, the index path may be created in a different
+directory (such as the user's home directory).
</p>
<p>
-The particular <a href="api/core/org/apache/lucene/analysis/Analyzer.html">Analyzer</a> we
-are using, <a href="api/core/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a>, is
-little more than a standard Java Tokenizer, converting all strings to lowercase and filtering out
-stop words and characters from the index. By stop words and characters I mean common language
-words such as articles (a, an, the, etc.) and other strings that may have less value for searching
-(e.g. <b>'s</b>) . It should be noted that there are different rules for every language, and you
-should use the proper analyzer for each. Lucene currently provides Analyzers for a number of
-different languages (see the <span class="codefrag">*Analyzer.java</span> sources under <a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/">modules/analysis/common/src/java/org/apache/lucene/analysis</a>).
+The <span class="codefrag">-docs</span> command-line parameter value is the location of the directory containing
+files to be indexed.
</p>
<p>
-Looking further down in the file, you should see the <span class="codefrag">indexDocs()</span> code. This recursive
-function simply crawls the directories and uses <a href="api/demo/org/apache/lucene/demo/FileDocument.html">FileDocument</a> to create <a href="api/core/org/apache/lucene/document/Document.html">Document</a> objects. The <a href="api/core/org/apache/lucene/document/Document.html">Document</a> is simply a data object to
-represent the content in the file as well as its creation time and location. These instances are
-added to the <span class="codefrag">indexWriter</span>. Take a look inside <a href="api/demo/org/apache/lucene/demo/FileDocument.html">FileDocument</a>. It's not particularly
-complicated. It just adds fields to the <a href="api/core/org/apache/lucene/document/Document.html">Document</a>.
+The <span class="codefrag">-update</span> command-line parameter tells <span class="codefrag">IndexFiles</span> not to delete the
+index if it already exists. When <span class="codefrag">-update</span> is not given, <span class="codefrag">IndexFiles</span> will
+first wipe the slate clean before indexing any documents.
</p>
<p>
-As you can see there isn't much to creating an index. The devil is in the details. You may also
-wish to examine the other samples in this directory, particularly the <a href="api/demo/org/apache/lucene/demo/IndexHTML.html">IndexHTML</a> class. It is a bit more
-complex but builds upon this example.
+Lucene <a href="api/core/org/apache/lucene/store/Directory.html">Directory</a>s are used by the
+<span class="codefrag">IndexWriter</span> to store information in the index. In addition to the
+<a href="api/core/org/apache/lucen/store/FSDirectory.html">FSDirectory</a> implementation we are using,
+there are several other <span class="codefrag">Directory</span> subclasses that can write to RAM, to databases, etc.
+</p>
+<p>
+Lucene <a href="api/core/org/apache/lucene/analysis/Analyzer.html">Analyzer</a>s are processing pipelines
+that break up text into indexed tokens, a.k.a. terms, and optionally perform other operations on these
+tokens, e.g. downcasing, synonym insertion, filtering out unwanted tokens, etc. The <span class="codefrag">Analyzer</span>
+we are using is <span class="codefrag">StandardAnalyzer</span>, which creates tokens using the Word Break rules from the
+Unicode Text Segmentation algorithm specified in <a href="http://unicode.org/reports/tr29/">Unicode
+Standard Annex #29</a>; converts tokens to lowercase; and then filters out stopwords. Stopwords are
+common language words such as articles (a, an, the, etc.) and other tokens that may have less value for
+searching. It should be noted that there are different rules for every language, and you should use the
+proper analyzer for each. Lucene currently provides Analyzers for a number of different languages (see
+the <span class="codefrag">*Analyzer.java</span> sources under
+<a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/">modules/analysis/common/src/java/org/apache/lucene/analysis</a>).
+</p>
+<p>
+The <span class="codefrag">IndexWriterConfig</span> instance holds all configuration for <span class="codefrag">IndexWriter</span>. For
+example, we set the <span class="codefrag">OpenMode</span> to use here based on the value of the <span class="codefrag">-update</span>
+command-line parameter.
+</p>
+<p>
+Looking further down in the file, after <span class="codefrag">IndexWriter</span> is instantiated, you should see the
+<span class="codefrag">indexDocs()</span> code. This recursive function crawls the directories and creates
+<a href="api/core/org/apache/lucene/document/Document.html">Document</a> objects. The
+<span class="codefrag">Document</span> is simply a data object to represent the text content from the file as well as
+its creation time and location. These instances are added to the <span class="codefrag">IndexWriter</span>. If
+the <span class="codefrag">-update</span> command-line parameter is given, the <span class="codefrag">IndexWriter</span>
+<span class="codefrag">OpenMode</span> will be set to <span class="codefrag">OpenMode.CREATE_OR_APPEND</span>, and rather than
+adding documents to the index, the <span class="codefrag">IndexWriter</span> will <strong>update</strong> them
+in the index by attempting to find an already-indexed document with the same identifier (in our
+case, the file path serves as the identifier); deleting it from the index if it exists; and then
+adding the new document to the index.
</p>
</div>
-<a name="N100A0"></a><a name="Searching Files"></a>
+<a name="N100DB"></a><a name="Searching Files"></a>
<h2 class="boxed">Searching Files</h2>
<div class="section">
<p>
-The <a href="api/demo/org/apache/lucene/demo/SearchFiles.html">SearchFiles</a> class is
-quite simple. It primarily collaborates with an <a href="api/core/org/apache/lucene/search/IndexSearcher.html">IndexSearcher</a>, <a href="api/core/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a>
-(which is used in the <a href="api/core/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class as well) and a
-<a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a>. The
+The <a href="api/contrib-demo/org/apache/lucene/demo/SearchFiles.html">SearchFiles</a> class is
+quite simple. It primarily collaborates with an
+<a href="api/core/org/apache/lucene/search/IndexSearcher.html">IndexSearcher</a>,
+<a href="api/modules-analysis-common/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</a> (which is used in the
+<a href="api/contrib-demo/org/apache/lucene/demo/IndexFiles.html">IndexFiles</a> class as well)
+and a <a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a>. The
query parser is constructed with an analyzer used to interpret your query text in the same way the
-documents are interpreted: finding the end of words and removing useless words like 'a', 'an' and
-'the'. The <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object contains
-the results from the <a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a> which is passed to
-the searcher. Note that it's also possible to programmatically construct a rich <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object without using the query
+documents are interpreted: finding word boundaries, downcasing, and removing useless words like
+'a', 'an' and 'the'. The <a href="api/core/org/apache/lucene/search/Query.html">Query</a>
+object contains the results from the
+<a href="api/core/org/apache/lucene/queryParser/QueryParser.html">QueryParser</a> which is passed
+to the searcher. Note that it's also possible to programmatically construct a rich
+<a href="api/core/org/apache/lucene/search/Query.html">Query</a> object without using the query
parser. The query parser just enables decoding the <a href="queryparsersyntax.html">Lucene query
-syntax</a> into the corresponding <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object. Search can be executed in
-two different ways:
+syntax</a> into the corresponding <a href="api/core/org/apache/lucene/search/Query.html">Query</a>
+object. Search can be executed in two different ways:
+</p>
<ul>
<li>Streaming: A <a href="api/core/org/apache/lucene/search/Collector.html">Collector</a> subclass
simply prints out the document ID and score for each matching document.</li>
-<li>Paging: Using a <a href="api/core/org/apache/lucene/search/TopScoreDocCollector.html">TopScoreDocCollector</a>
- the search results are printed in pages, sorted by score (i. e. relevance).</li>
+<li>Paging: Using the <span class="codefrag">IndexSearcher.search(query,n)</span> method that returns
+<a href="api/core/org/apache/lucene/search/TopDocs.html">TopDocs</a> with max <span class="codefrag">n</span> hits,
+the search results are printed in pages, sorted by score (i.e. relevance).</li>
-</ul>
-
-</p>
-</div>
-
-
-<a name="N100E2"></a><a name="The Web example..."></a>
-<h2 class="boxed">The Web example...</h2>
-<div class="section">
-<p>
-
-<a href="demo3.html">read on>>></a>
-
-</p>
+</ul>
</div>
-
</div>
<!--+
|end content