Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3286: Consolidated XML QP into queryparser module 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1165174 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christopher John Male 2011-09-05 05:53:28 +00:00
parent ce785bcce4
commit 7f90632562
109 changed files with 142 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/eclipse/dot.classpath
View File

@ -18,8 +18,6 @@
<classpathentry kind="src" path="lucene/contrib/sandbox/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spatial/src/java"/>
<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/java"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/test"/>
<classpathentry kind="src" path="modules/analysis/common/src/java"/>
<classpathentry kind="src" path="modules/analysis/common/src/resources"/>
<classpathentry kind="src" path="modules/analysis/common/src/test"/>

1
dev-tools/idea/.idea/modules.xml
View File

@ -11,7 +11,6 @@
<module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/sandbox/sandbox.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/common/analysis-common.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/icu/icu.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/morfologik/morfologik.iml" />

10
dev-tools/idea/.idea/workspace.xml
View File

@ -190,14 +190,7 @@
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="xml-query-parser contrib" type="JUnit" factoryName="JUnit">
<module name="xml-query-parser" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/xml-query-parser" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<list size="28">
<list size="27">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
<item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
@ -225,7 +218,6 @@
<item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
<item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
<item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
<item index="27" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>

1
dev-tools/idea/lucene/contrib/demo/demo.iml
View File

@ -22,7 +22,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="xml-query-parser" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="queryparser" />
</component>

21
dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../build/contrib/xml-query-parser/classes/java" />
<output-test url="file://$MODULE_DIR$/../../build/contrib/xml-query-parser/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="sandbox" />
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="queryparser" />
<orderEntry type="module" module-name="queries" />
</component>
</module>

2
dev-tools/idea/modules/queryparser/queryparser.iml
View File

@ -14,5 +14,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="sandbox" />
</component>
</module>

5
dev-tools/maven/lucene/contrib/demo/pom.xml.template
View File

@ -57,11 +57,6 @@
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-xml-query-parser</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>

1
dev-tools/maven/lucene/contrib/pom.xml.template
View File

@ -38,7 +38,6 @@
<module>misc</module>
<module>sandbox</module>
<module>spatial</module>
<module>xml-query-parser</module>
</modules>
<build>
<directory>build/lucene-contrib-aggregator</directory>

86
dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
View File

@ -1,86 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-parent</artifactId>
<version>@version@</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-xml-query-parser</artifactId>
<packaging>jar</packaging>
<name>Lucene XML Query Parser</name>
<description>XML query parser</description>
<properties>
<module-directory>lucene/contrib/xml-query-parser</module-directory>
<build-directory>../../build/contrib/xml-query-parser</build-directory>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-sandbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
<outputDirectory>${build-directory}/classes/java</outputDirectory>
<testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
</build>
</project>

4
lucene/build.xml
View File

@ -49,7 +49,7 @@
excludes="*-src.jar"
/>
<patternset id="binary.root.dist.patterns"
includes="CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd,lib/*.jar,lib/*LICENSE*.txt,lib/*NOTICE*.txt,contrib/*/lib/*.jar,contrib/*/lib/*LICENSE*.txt,contrib/*/lib/*NOTICE*.txt"
includes="CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/,lib/*.jar,lib/*LICENSE*.txt,lib/*NOTICE*.txt,contrib/*/lib/*.jar,contrib/*/lib/*LICENSE*.txt,contrib/*/lib/*NOTICE*.txt"
/>
@ -257,7 +257,6 @@
<packageset dir="contrib/misc/src/java"/>
<packageset dir="contrib/sandbox/src/java"/>
<packageset dir="contrib/spatial/src/java"/>
<packageset dir="contrib/xml-query-parser/src/java"/>
<!-- end alpha sort -->
<!-- If the main javadoc Group listing includes an "Other -->
@ -274,7 +273,6 @@
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
<group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/>
<group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
<group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
</sources>
</invoke-javadoc>

3
lucene/contrib/CHANGES.txt
View File

@ -30,6 +30,9 @@ Build
FuzzyLikeThisQuery and SlowCollated* into contrib/sandbox.
Removed contrib/queries.
* LUCENE-3286: Moved remainder of contrib/xml-query-parser to module/queryparser.
Classes now found at org.apache.lucene.queryparser.xml.*
New Features
* LUCENE-2604: Added RegexpQuery support to contrib/queryparser.

11
lucene/contrib/contrib-build.xml
View File

@ -283,15 +283,4 @@
</ant>
<property name="suggest.uptodate" value="true"/>
</target>
<property name="xml-query-parser.jar" value="${common.dir}/build/contrib/xml-query-parser/lucene-xml-query-parser-${version}.jar"/>
<target name="check-xml-query-parser-uptodate" unless="xml-query-parser.uptodate">
<contrib-uptodate name="xml-query-parser" jarfile="${xml-query-parser.jar}" property="xml-query-parser.uptodate"/>
</target>
<target name="jar-xml-query-parser" unless="xml-query-parser.uptodate" depends="check-xml-query-parser-uptodate">
<ant dir="${common.dir}/contrib/xml-query-parser" target="jar-core" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="xml-query-parser.uptodate" value="true"/>
</target>
</project>

4
lucene/contrib/demo/build.xml
View File

@ -33,11 +33,10 @@
<pathelement path="${analyzers-common.jar}"/>
<pathelement path="${queryparser.jar}"/>
<pathelement path="${lucene-core.jar}"/>
<pathelement path="${xml-query-parser.jar}"/>
<pathelement location="lib/servlet-api-2.4.jar"/>
</path>
<target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-xml-query-parser,common.compile-core" />
<target name="compile-core" depends="jar-analyzers-common,jar-queryparser,common.compile-core" />
<target name="default" depends="jar-core,build-web-demo"/>
@ -52,6 +51,7 @@
<include name="${final.name}.jar"/>
</lib>
<lib file="${queries.jar}"/>
<lib file="${queryparser.jar}"/>
<lib file="${lucene-core.jar}"/>
</war>
</target>

4
lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
View File

@ -40,14 +40,14 @@ import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.queryparser.xml.CorePlusExtensionsParser;
import org.apache.lucene.queryparser.xml.QueryTemplateManager;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.Version;
import org.apache.lucene.xmlparser.CorePlusExtensionsParser;
import org.apache.lucene.xmlparser.QueryTemplateManager;
public class FormBasedXmlQueryDemo extends HttpServlet {

36
lucene/contrib/xml-query-parser/build.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project name="xml-query-parser" default="default">
<description>
XML query parser
</description>
<import file="../contrib-build.xml"/>
<path id="classpath">
<pathelement path="${queryparser.jar}"/>
<pathelement path="${queries.jar}"/>
<pathelement path="${sandbox.jar}"/>
<path refid="base.classpath"/>
</path>
<target name="compile-core" depends="jar-sandbox,jar-queryparser,jar-queries,common.compile-core" />
</project>

26
lucene/contrib/xml-query-parser/src/java/overview.html
View File

@ -1,26 +0,0 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<html>
<head>
<title>
xml-query-parser
</title>
</head>
<body>
xml-query-parser
</body>
</html>

8
modules/queryparser/build.xml
View File

@ -26,6 +26,14 @@
<import file="../../lucene/contrib/contrib-build.xml"/>
<path id="classpath">
<pathelement path="${queries.jar}"/>
<pathelement path="${sandbox.jar}"/>
<path refid="base.classpath"/>
</path>
<target name="compile-core" depends="jar-queries,jar-sandbox,common.compile-core"/>
<target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
<target name="javacc" depends="init,javacc-check,javacc-QueryParser,javacc-surround,javacc-flexible"/>

0
lucene/contrib/xml-query-parser/docs/DTDDocStyle.css → modules/queryparser/docs/xml/DTDDocStyle.css
View File

0
lucene/contrib/xml-query-parser/docs/LuceneContribQuery.dtd.entities.html → modules/queryparser/docs/xml/LuceneContribQuery.dtd.entities.html
View File

0
lucene/contrib/xml-query-parser/docs/LuceneContribQuery.dtd.html → modules/queryparser/docs/xml/LuceneContribQuery.dtd.html
View File

0
lucene/contrib/xml-query-parser/docs/LuceneContribQuery.dtd.org.html → modules/queryparser/docs/xml/LuceneContribQuery.dtd.org.html
View File

0
lucene/contrib/xml-query-parser/docs/LuceneCoreQuery.dtd.entities.html → modules/queryparser/docs/xml/LuceneCoreQuery.dtd.entities.html
View File

0
lucene/contrib/xml-query-parser/docs/LuceneCoreQuery.dtd.html → modules/queryparser/docs/xml/LuceneCoreQuery.dtd.html
View File

0
lucene/contrib/xml-query-parser/docs/LuceneCoreQuery.dtd.org.html → modules/queryparser/docs/xml/LuceneCoreQuery.dtd.org.html
View File

0
lucene/contrib/xml-query-parser/README.htm → modules/queryparser/docs/xml/README.htm
View File

0
lucene/contrib/xml-query-parser/docs/cctree.js → modules/queryparser/docs/xml/cctree.js
View File

0
lucene/contrib/xml-query-parser/docs/dtreeStyle.css → modules/queryparser/docs/xml/dtreeStyle.css
View File

0
lucene/contrib/xml-query-parser/docs/elementsIndex.html → modules/queryparser/docs/xml/elementsIndex.html
View File

0
lucene/contrib/xml-query-parser/docs/img/empty.gif → modules/queryparser/docs/xml/img/empty.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 B

After

Width:  |  Height:  |  Size: 62 B

0
lucene/contrib/xml-query-parser/docs/img/join.gif → modules/queryparser/docs/xml/img/join.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 B

After

Width:  |  Height:  |  Size: 69 B

0
lucene/contrib/xml-query-parser/docs/img/joinbottom.gif → modules/queryparser/docs/xml/img/joinbottom.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 B

After

Width:  |  Height:  |  Size: 66 B

0
lucene/contrib/xml-query-parser/docs/img/line.gif → modules/queryparser/docs/xml/img/line.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 B

After

Width:  |  Height:  |  Size: 66 B

0
lucene/contrib/xml-query-parser/docs/img/minus.gif → modules/queryparser/docs/xml/img/minus.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 B

After

Width:  |  Height:  |  Size: 86 B

0
lucene/contrib/xml-query-parser/docs/img/minusbottom.gif → modules/queryparser/docs/xml/img/minusbottom.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 B

After

Width:  |  Height:  |  Size: 85 B

0
lucene/contrib/xml-query-parser/docs/img/plus.gif → modules/queryparser/docs/xml/img/plus.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 B

After

Width:  |  Height:  |  Size: 89 B

0
lucene/contrib/xml-query-parser/docs/img/plusbottom.gif → modules/queryparser/docs/xml/img/plusbottom.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 B

After

Width:  |  Height:  |  Size: 88 B

0
lucene/contrib/xml-query-parser/docs/index.html → modules/queryparser/docs/xml/index.html
View File

0
lucene/contrib/xml-query-parser/docs/intro.html → modules/queryparser/docs/xml/intro.html
View File

0
lucene/contrib/xml-query-parser/docs/toc.html → modules/queryparser/docs/xml/toc.html
View File

4
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java
View File

@ -1,9 +1,9 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.queryparser.xml.builders.*;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.builders.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

5
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java
View File

@ -1,8 +1,9 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.xmlparser.builders.*;
import org.apache.lucene.queryparser.xml.builders.*;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/DOMUtils.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java
View File

@ -1,7 +1,7 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.search.Filter;
import org.w3c.dom.Element;

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java
View File

@ -1,7 +1,7 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.search.Filter;
import org.w3c.dom.Element;

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/ParserException.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java
View File

@ -1,7 +1,7 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.search.Query;
import org.w3c.dom.Element;

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java
View File

@ -1,7 +1,7 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.apache.lucene.search.Query;
import org.w3c.dom.Element;

2
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryTemplateManager.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BooleanFilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java
View File

@ -1,15 +1,15 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.queries.BooleanFilter;
import org.apache.lucene.search.Filter;
import org.apache.lucene.queries.FilterClause;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BooleanQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java
View File

@ -1,14 +1,14 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BoostingQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java
View File

@ -1,10 +1,10 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.queries.BoostingQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BoostingTermBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java
View File

@ -1,11 +1,11 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.payloads.AveragePayloadFunction;
import org.apache.lucene.search.payloads.PayloadTermQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**

4
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/CachedFilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java
View File

@ -1,13 +1,13 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.queryparser.xml.*;
import org.apache.lucene.search.CachingWrapperFilter;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.xmlparser.*;
import org.w3c.dom.Element;
import java.util.Map;

10
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/ConstantScoreQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java
View File

@ -1,11 +1,11 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilderFactory;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilderFactory;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/DuplicateFilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java
View File

@ -1,13 +1,13 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.sandbox.queries.DuplicateFilter;
import org.apache.lucene.search.Filter;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
import org.apache.lucene.xmlparser.ParserException;
import org.w3c.dom.Element;
/**

10
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FilteredQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java
View File

@ -1,15 +1,15 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java
View File

@ -1,12 +1,12 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.apache.lucene.sandbox.queries.FuzzyLikeThisQuery;
import org.apache.lucene.search.FuzzyQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java
View File

@ -1,7 +1,7 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import java.io.IOException;
import java.io.StringReader;
@ -12,10 +12,10 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.queries.mlt.MoreLikeThisQuery;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/MatchAllDocsQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
View File

@ -1,9 +1,9 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -22,9 +22,9 @@ import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.NumericRangeFilter;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import java.io.IOException;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -20,9 +20,9 @@ package org.apache.lucene.xmlparser.builders;
import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/RangeFilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java
View File

@ -1,13 +1,13 @@
/*
* Created on 25-Jan-2006
*/
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.TermRangeFilter;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

4
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanBuilderBase.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java
View File

@ -1,7 +1,7 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanFirstBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java
View File

@ -1,9 +1,9 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.spans.SpanFirstQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java
View File

@ -1,9 +1,9 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNotBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java
View File

@ -1,9 +1,9 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.spans.SpanNotQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java
View File

@ -1,9 +1,9 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@ -8,8 +8,8 @@ import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import java.io.IOException;

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -16,8 +16,8 @@ package org.apache.lucene.xmlparser.builders;
* limitations under the License.
*/
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
public interface SpanQueryBuilder extends QueryBuilder {

4
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java
View File

@ -1,8 +1,8 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import java.util.HashMap;

6
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanTermBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java
View File

@ -1,10 +1,10 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java
View File

@ -1,11 +1,11 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@ -7,9 +7,9 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.Filter;
import org.apache.lucene.queries.TermsFilter;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.FilterBuilder;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.FilterBuilder;
import org.apache.lucene.queryparser.xml.ParserException;
import org.w3c.dom.Element;
import java.io.IOException;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@ -9,9 +9,9 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
import java.io.IOException;

8
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java
View File

@ -1,13 +1,13 @@
package org.apache.lucene.xmlparser.builders;
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Version;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
import org.apache.lucene.xmlparser.QueryBuilder;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
import org.apache.lucene.queryparser.xml.QueryBuilder;
import org.w3c.dom.Element;
/**

0
lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/package.html → modules/queryparser/src/java/org/apache/lucene/queryparser/xml/package.html
View File

0
lucene/contrib/xml-query-parser/LuceneContribQuery.dtd → modules/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneContribQuery.dtd
View File

0
lucene/contrib/xml-query-parser/LuceneCoreQuery.dtd → modules/queryparser/src/resources/org/apache/lucene/queryparser/xml/LuceneCoreQuery.dtd
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BooleanFilter.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanFilter.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BooleanQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/BooleanQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BoostingQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BoostingTermQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/BoostingTermQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/CachedFilter.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/CachedFilter.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/ConstantScoreQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/ConstantScoreQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/DuplicateFilterQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/DuplicateFilterQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/FuzzyLikeThisQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/FuzzyLikeThisQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/LikeThisQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/LikeThisQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/MatchAllDocsQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/MatchAllDocsQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NestedBooleanQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/NestedBooleanQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NumericRangeFilterQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeFilterQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NumericRangeQueryQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/NumericRangeQueryQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/RangeFilterQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/RangeFilterQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/SpanQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/SpanQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TermQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermsFilterQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsFilterQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermsQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TermsQuery.xml
View File

2
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

2
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
View File

@ -1,4 +1,4 @@
package org.apache.lucene.xmlparser;
package org.apache.lucene.queryparser.xml;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/UserInputQuery.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQuery.xml
View File

0
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/UserInputQueryCustomField.xml → modules/queryparser/src/test/org/apache/lucene/queryparser/xml/UserInputQueryCustomField.xml
View File

Some files were not shown because too many files have changed in this diff Show More