From b3671752f2e723b461ac1c251a0e995f5eb29b2d Mon Sep 17 00:00:00 2001 From: Christopher John Male Date: Tue, 12 Jul 2011 02:22:24 +0000 Subject: [PATCH] LUCENE-3285: Moved analyzing, complexphrase, etx and surround queryparsers to qp module git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145430 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/build.xml | 3 --- lucene/contrib/queryparser/build.xml | 8 +------- modules/queryparser/build.xml | 11 +++++++++- .../analyzing/AnalyzingQueryParser.java | 2 +- .../queryparser}/analyzing/package.html | 0 .../ComplexPhraseQueryParser.java | 2 +- .../queryparser}/complexPhrase/package.html | 0 .../ext/ExtendableQueryParser.java | 4 ++-- .../queryparser}/ext/ExtensionQuery.java | 2 +- .../lucene/queryparser}/ext/Extensions.java | 2 +- .../queryparser}/ext/ParserExtension.java | 2 +- .../lucene/queryparser}/ext/package.html | 0 .../lucene/queryparser}/surround/package.html | 0 .../surround/parser/CharStream.java | 2 +- .../surround/parser/FastCharStream.java | 2 +- .../surround/parser/ParseException.java | 2 +- .../surround/parser/QueryParser.java | 20 +++++++++---------- .../surround/parser/QueryParser.jj | 20 +++++++++---------- .../surround/parser/QueryParserConstants.java | 2 +- .../parser/QueryParserTokenManager.java | 20 +++++++++---------- .../queryparser}/surround/parser/Token.java | 2 +- .../surround/parser/TokenMgrError.java | 2 +- .../queryparser}/surround/parser/package.html | 2 +- .../queryparser}/surround/query/AndQuery.java | 2 +- .../surround/query/BasicQueryFactory.java | 2 +- .../surround/query/ComposedQuery.java | 2 +- .../surround/query/DistanceQuery.java | 2 +- .../surround/query/DistanceSubQuery.java | 2 +- .../surround/query/FieldsQuery.java | 2 +- .../queryparser}/surround/query/NotQuery.java | 2 +- .../queryparser}/surround/query/OrQuery.java | 2 +- .../surround/query/SimpleTerm.java | 2 +- .../surround/query/SpanNearClauseFactory.java | 2 +- .../surround/query/SrndBooleanQuery.java | 2 +- .../surround/query/SrndPrefixQuery.java | 2 +- .../surround/query/SrndQuery.java | 2 +- .../surround/query/SrndTermQuery.java | 2 +- .../surround/query/SrndTruncQuery.java | 2 +- .../surround/query/TooManyBasicQueries.java | 2 +- .../queryparser}/surround/query/package.html | 2 +- .../analyzing/TestAnalyzingQueryParser.java | 2 +- .../complexPhrase/TestComplexPhraseQuery.java | 2 +- .../queryparser}/ext/ExtensionStub.java | 2 +- .../ext/TestExtendableQueryParser.java | 2 +- .../queryparser}/ext/TestExtensions.java | 2 +- .../surround/query/BooleanQueryTst.java | 4 ++-- .../surround/query/ExceptionQueryTst.java | 6 +++--- .../surround/query/SingleFieldTestDb.java | 2 +- .../surround/query/Test01Exceptions.java | 2 +- .../surround/query/Test02Boolean.java | 2 +- .../surround/query/Test03Distance.java | 2 +- 51 files changed, 86 insertions(+), 86 deletions(-) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/analyzing/AnalyzingQueryParser.java (99%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/analyzing/package.html (100%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/complexPhrase/ComplexPhraseQueryParser.java (99%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/complexPhrase/package.html (100%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/ext/ExtendableQueryParser.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/ext/ExtensionQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/ext/Extensions.java (99%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/ext/ParserExtension.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/ext/package.html (100%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/package.html (100%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/CharStream.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/FastCharStream.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/ParseException.java (99%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/QueryParser.java (97%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/QueryParser.jj (94%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/QueryParserConstants.java (97%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/QueryParserTokenManager.java (97%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/Token.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/TokenMgrError.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/parser/package.html (94%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/AndQuery.java (96%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/BasicQueryFactory.java (97%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/ComposedQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/DistanceQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/DistanceSubQuery.java (95%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/FieldsQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/NotQuery.java (96%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/OrQuery.java (97%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SimpleTerm.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SpanNearClauseFactory.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SrndBooleanQuery.java (96%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SrndPrefixQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SrndQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SrndTermQuery.java (97%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/SrndTruncQuery.java (98%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/TooManyBasicQueries.java (95%) rename {lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser => modules/queryparser/src/java/org/apache/lucene/queryparser}/surround/query/package.html (95%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/analyzing/TestAnalyzingQueryParser.java (99%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/complexPhrase/TestComplexPhraseQuery.java (98%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/ext/ExtensionStub.java (96%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/ext/TestExtendableQueryParser.java (99%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/ext/TestExtensions.java (98%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/surround/query/BooleanQueryTst.java (97%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/surround/query/ExceptionQueryTst.java (91%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/surround/query/SingleFieldTestDb.java (97%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/surround/query/Test01Exceptions.java (97%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/surround/query/Test02Boolean.java (98%) rename {lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser => modules/queryparser/src/test/org/apache/lucene/queryparser}/surround/query/Test03Distance.java (99%) diff --git a/lucene/build.xml b/lucene/build.xml index ab98e309df2..17e17774bea 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -416,9 +416,6 @@ - - - diff --git a/lucene/contrib/queryparser/build.xml b/lucene/contrib/queryparser/build.xml index f1492c8e606..ab7e453f4ad 100644 --- a/lucene/contrib/queryparser/build.xml +++ b/lucene/contrib/queryparser/build.xml @@ -37,7 +37,7 @@ - + @@ -102,12 +102,6 @@ import org.apache.lucene.queryParser.core.messages.*;" byline="true"/> - - - - QueryParser Contrib building dependency modules/queryparser diff --git a/modules/queryparser/build.xml b/modules/queryparser/build.xml index 7bdec278ab2..ff34f9c40de 100644 --- a/modules/queryparser/build.xml +++ b/modules/queryparser/build.xml @@ -33,10 +33,13 @@ + + + - + @@ -56,4 +59,10 @@ + + + + diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java similarity index 99% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java index ae8defe16f1..bacc296edc8 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.analyzing; +package org.apache.lucene.queryparser.analyzing; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package.html similarity index 100% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package.html diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java similarity index 99% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java index 97deb6f3fa0..f7611c7992d 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.complexPhrase; +package org.apache.lucene.queryparser.complexPhrase; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package.html similarity index 100% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package.html diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java index c85712b6f4b..fdda8c3dfdd 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,7 +18,7 @@ package org.apache.lucene.queryParser.ext; */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryParser.ext.Extensions.Pair; +import org.apache.lucene.queryparser.ext.Extensions.Pair; import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.Query; diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java index 423cad3712c..4789633b5c0 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; import org.apache.lucene.queryparser.classic.QueryParser; diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java similarity index 99% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java index 9e3ee393d1d..04f91281a2d 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java index 77f9ada5efc..294a8a35741 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/package.html similarity index 100% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/ext/package.html diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/package.html similarity index 100% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/package.html diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java index 7c2d5f2acd1..f0e5405f5f9 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. CharStream.java Version 4.1 */ /* JavaCCOptions:STATIC=false */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; /** * This interface describes a character stream that maintains line and diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java index 093c4eb4707..e035e6134b0 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java @@ -1,5 +1,5 @@ // FastCharStream.java -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java similarity index 99% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java index 99a3261967b..a555e24b84d 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */ /* JavaCCOptions:KEEP_LINE_COL=null */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; /** * This exception is thrown when parse errors are encountered. diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java similarity index 97% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java index be6f9b86c56..d79746ea32d 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. QueryParser.java */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; import java.util.ArrayList; import java.util.List; @@ -8,15 +8,15 @@ import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.queryParser.surround.query.SrndQuery; -import org.apache.lucene.queryParser.surround.query.FieldsQuery; -import org.apache.lucene.queryParser.surround.query.OrQuery; -import org.apache.lucene.queryParser.surround.query.AndQuery; -import org.apache.lucene.queryParser.surround.query.NotQuery; -import org.apache.lucene.queryParser.surround.query.DistanceQuery; -import org.apache.lucene.queryParser.surround.query.SrndTermQuery; -import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery; -import org.apache.lucene.queryParser.surround.query.SrndTruncQuery; +import org.apache.lucene.queryparser.surround.query.SrndQuery; +import org.apache.lucene.queryparser.surround.query.FieldsQuery; +import org.apache.lucene.queryparser.surround.query.OrQuery; +import org.apache.lucene.queryparser.surround.query.AndQuery; +import org.apache.lucene.queryparser.surround.query.NotQuery; +import org.apache.lucene.queryparser.surround.query.DistanceQuery; +import org.apache.lucene.queryparser.surround.query.SrndTermQuery; +import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery; +import org.apache.lucene.queryparser.surround.query.SrndTruncQuery; /** * This class is generated by JavaCC. The only method that clients should need diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj similarity index 94% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj index a29964a03c6..8c64f095552 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj @@ -28,7 +28,7 @@ options { PARSER_BEGIN(QueryParser) -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; import java.util.ArrayList; import java.util.List; @@ -37,15 +37,15 @@ import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.queryParser.surround.query.SrndQuery; -import org.apache.lucene.queryParser.surround.query.FieldsQuery; -import org.apache.lucene.queryParser.surround.query.OrQuery; -import org.apache.lucene.queryParser.surround.query.AndQuery; -import org.apache.lucene.queryParser.surround.query.NotQuery; -import org.apache.lucene.queryParser.surround.query.DistanceQuery; -import org.apache.lucene.queryParser.surround.query.SrndTermQuery; -import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery; -import org.apache.lucene.queryParser.surround.query.SrndTruncQuery; +import org.apache.lucene.queryparser.surround.query.SrndQuery; +import org.apache.lucene.queryparser.surround.query.FieldsQuery; +import org.apache.lucene.queryparser.surround.query.OrQuery; +import org.apache.lucene.queryparser.surround.query.AndQuery; +import org.apache.lucene.queryparser.surround.query.NotQuery; +import org.apache.lucene.queryparser.surround.query.DistanceQuery; +import org.apache.lucene.queryparser.surround.query.SrndTermQuery; +import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery; +import org.apache.lucene.queryparser.surround.query.SrndTruncQuery; /** * This class is generated by JavaCC. The only method that clients should need diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java similarity index 97% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java index fe45496eb14..bba63f297f7 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. QueryParserConstants.java */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; /** diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java similarity index 97% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java index fb5a93f3082..dfbe431d03a 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java @@ -1,18 +1,18 @@ /* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; import java.util.ArrayList; import java.util.List; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.queryParser.surround.query.SrndQuery; -import org.apache.lucene.queryParser.surround.query.FieldsQuery; -import org.apache.lucene.queryParser.surround.query.OrQuery; -import org.apache.lucene.queryParser.surround.query.AndQuery; -import org.apache.lucene.queryParser.surround.query.NotQuery; -import org.apache.lucene.queryParser.surround.query.DistanceQuery; -import org.apache.lucene.queryParser.surround.query.SrndTermQuery; -import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery; -import org.apache.lucene.queryParser.surround.query.SrndTruncQuery; +import org.apache.lucene.queryparser.surround.query.SrndQuery; +import org.apache.lucene.queryparser.surround.query.FieldsQuery; +import org.apache.lucene.queryparser.surround.query.OrQuery; +import org.apache.lucene.queryparser.surround.query.AndQuery; +import org.apache.lucene.queryparser.surround.query.NotQuery; +import org.apache.lucene.queryparser.surround.query.DistanceQuery; +import org.apache.lucene.queryparser.surround.query.SrndTermQuery; +import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery; +import org.apache.lucene.queryparser.surround.query.SrndTruncQuery; /** Token Manager. */ public class QueryParserTokenManager implements QueryParserConstants diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java index 6c122891fbd..21dfc0e9098 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; /** * Describes the input token stream. diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java index bced060bdaf..e0c9c1e030f 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */ /* JavaCCOptions: */ -package org.apache.lucene.queryParser.surround.parser; +package org.apache.lucene.queryparser.surround.parser; /** Token Manager Error. */ @SuppressWarnings("serial") diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html similarity index 94% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html index f8457d1eda4..0d462405dca 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html @@ -23,6 +23,6 @@ This package contains the QueryParser.jj source file for the Surround parser.

Parsing the text of a query results in a SrndQuery in the - org.apache.lucene.queryParser.surround.query package. + org.apache.lucene.queryparser.surround.query package. diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java similarity index 96% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java index a5d628c6485..08583cfa185 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java similarity index 97% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java index a55bdd2ebd5..1f9aa4debee 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java index 0b43d97ce8a..0435d09b2b8 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java index 9e40f00ddb5..ed654ba314d 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java similarity index 95% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java index d63b82ea1f9..8460b5ee761 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java index daea96d73e3..114e9c789e9 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java similarity index 96% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java index a53b6396d2b..c724be160e9 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java similarity index 97% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java index 72fd5f0d3ca..bafa7db7243 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java index 436aabafc5c..3e9c1e336d3 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java index 44f534bd923..68df313f008 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java similarity index 96% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java index d2b3c6c89c5..fc836af6909 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java index 1c2d1393eb4..6af52673c30 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java index 523c076908a..6d913ad9637 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java similarity index 97% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java index b272d16a237..b8bb356a5dd 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java index df9b9527298..9ba02a72775 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java similarity index 95% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java index bf5d0744f99..c7080d6da23 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html similarity index 95% rename from lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html index 4d125a23af5..2dd7a03a3c9 100644 --- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html @@ -22,7 +22,7 @@ This package contains SrndQuery and its subclasses.

- The parser in the org.apache.lucene.queryParser.surround.parser package + The parser in the org.apache.lucene.queryparser.surround.parser package normally generates a SrndQuery.

For searching an org.apache.lucene.search.Query is provided by diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java similarity index 99% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java index 515d430f980..22b9df40774 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.analyzing; +package org.apache.lucene.queryparser.analyzing; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java similarity index 98% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java index f3cd3f31dfd..e1f8c23aa28 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.complexPhrase; +package org.apache.lucene.queryparser.complexPhrase; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java similarity index 96% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java index 59f17221608..7285b084615 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.classic.ParseException; diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java similarity index 99% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java index 7aedc93e7ce..3592728765d 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java similarity index 98% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java index 3e73cb4576f..c590ecb397f 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.ext; +package org.apache.lucene.queryparser.ext; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java similarity index 97% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java index bba9321f3b4..f9ef31e89ef 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,7 +25,7 @@ import org.apache.lucene.search.Collector; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Query; -import org.apache.lucene.queryParser.surround.parser.QueryParser; +import org.apache.lucene.queryparser.surround.parser.QueryParser; import org.junit.Assert; diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java similarity index 91% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java index 2fa38bac811..2d2c695a46c 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,8 +17,8 @@ package org.apache.lucene.queryParser.surround.query; * limitations under the License. */ -import org.apache.lucene.queryParser.surround.parser.ParseException; -import org.apache.lucene.queryParser.surround.parser.QueryParser; +import org.apache.lucene.queryparser.surround.parser.ParseException; +import org.apache.lucene.queryparser.surround.parser.QueryParser; public class ExceptionQueryTst { diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java similarity index 97% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java index dffb925ed6b..58641195fb5 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java similarity index 97% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java index 493658cb533..fe5e3abe2e9 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java similarity index 98% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java index c179d94585a..e02e25e4269 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java similarity index 99% rename from lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java index f230bb554d5..336acf93381 100644 --- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.surround.query; +package org.apache.lucene.queryparser.surround.query; /** * Licensed to the Apache Software Foundation (ASF) under one or more