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

dev-tools/eclipse/dot.classpath

@@ -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"/>

dev-tools/idea/.idea/modules.xml

@@ -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" />

dev-tools/idea/.idea/workspace.xml

@@ -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">
+    <list size="27">
-      <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">
       <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>

dev-tools/idea/lucene/contrib/demo/demo.iml

@@ -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>

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

@@ -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>

dev-tools/idea/modules/queryparser/queryparser.iml

@@ -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>

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

@@ -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>

dev-tools/maven/lucene/contrib/pom.xml.template

@@ -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>

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

@@ -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>

lucene/build.xml

@@ -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>

lucene/contrib/CHANGES.txt

@@ -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.

lucene/contrib/contrib-build.xml

@@ -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>

lucene/contrib/demo/build.xml

@@ -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>

lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java

@@ -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 {
 

lucene/contrib/xml-query-parser/build.xml

@@ -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>

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

@@ -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>

modules/queryparser/build.xml

@@ -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"/>

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java

@@ -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;
 

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java

@@ -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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java

@@ -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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.FilterBuilder;
+import org.apache.lucene.queryparser.xml.FilterBuilder;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 
 /**

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.FilterBuilderFactory;
+import org.apache.lucene.queryparser.xml.FilterBuilderFactory;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java

@@ -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;
 
 /**

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.FilterBuilder;
+import org.apache.lucene.queryparser.xml.FilterBuilder;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 
 /**

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java

@@ -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;
 

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
 import org.w3c.dom.Element;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java

@@ -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.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.FilterBuilder;
+import org.apache.lucene.queryparser.xml.FilterBuilder;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 
 import java.io.IOException;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 
 /**

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.FilterBuilder;
+import org.apache.lucene.queryparser.xml.FilterBuilder;
-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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java

@@ -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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 
 import java.io.IOException;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java

@@ -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.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 
 public interface SpanQueryBuilder extends QueryBuilder {

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java

@@ -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;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-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

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.FilterBuilder;
+import org.apache.lucene.queryparser.xml.FilterBuilder;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
 import org.w3c.dom.Element;
 
 import java.io.IOException;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 
 import java.io.IOException;

modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java

@@ -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.queryparser.xml.DOMUtils;
-import org.apache.lucene.xmlparser.ParserException;
+import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.xmlparser.QueryBuilder;
+import org.apache.lucene.queryparser.xml.QueryBuilder;
 import org.w3c.dom.Element;
 
 /**

modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java

@@ -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

modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java

@@ -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