diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index a16aab7f1f2..34725abaf24 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -42,8 +42,6 @@ - - diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml index 1c051e6d884..4b5c379f799 100644 --- a/dev-tools/idea/.idea/modules.xml +++ b/dev-tools/idea/.idea/modules.xml @@ -21,7 +21,6 @@ - diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml index 48cd4e80b3d..8c441bce384 100644 --- a/dev-tools/idea/.idea/workspace.xml +++ b/dev-tools/idea/.idea/workspace.xml @@ -22,13 +22,6 @@ - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev-tools/idea/modules/common/common.iml b/dev-tools/idea/modules/common/common.iml deleted file mode 100644 index 50cb2814087..00000000000 --- a/dev-tools/idea/modules/common/common.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/dev-tools/idea/modules/queries/queries.iml b/dev-tools/idea/modules/queries/queries.iml index d520eef859e..50cb2814087 100644 --- a/dev-tools/idea/modules/queries/queries.iml +++ b/dev-tools/idea/modules/queries/queries.iml @@ -13,6 +13,5 @@ - diff --git a/dev-tools/idea/solr/solr.iml b/dev-tools/idea/solr/solr.iml index 895d0c1e8a3..0826b9bbf30 100644 --- a/dev-tools/idea/solr/solr.iml +++ b/dev-tools/idea/solr/solr.iml @@ -31,7 +31,6 @@ - diff --git a/dev-tools/maven/modules/common/pom.xml.template b/dev-tools/maven/modules/common/pom.xml.template deleted file mode 100644 index b928c3bbb30..00000000000 --- a/dev-tools/maven/modules/common/pom.xml.template +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - org.apache.lucene - lucene-parent - @version@ - ../../lucene/pom.xml - - org.apache.lucene - lucene-common-module - jar - Lucene Common - Lucene Common Module - - modules/common - build - - - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-test-framework - ${project.version} - test - - - junit - junit - test - - - - ${build-directory} - ${build-directory}/classes/java - ${build-directory}/classes/test - src/java - src/test - - - ${project.build.testSourceDirectory} - - **/*.java - - - - - diff --git a/dev-tools/maven/modules/pom.xml.template b/dev-tools/maven/modules/pom.xml.template index 55548c8ee51..5fcb3c836e0 100644 --- a/dev-tools/maven/modules/pom.xml.template +++ b/dev-tools/maven/modules/pom.xml.template @@ -33,7 +33,6 @@ analysis benchmark - common facet grouping join diff --git a/dev-tools/maven/modules/queries/pom.xml.template b/dev-tools/maven/modules/queries/pom.xml.template index 376d2d4a5e5..b468a72b08e 100644 --- a/dev-tools/maven/modules/queries/pom.xml.template +++ b/dev-tools/maven/modules/queries/pom.xml.template @@ -41,11 +41,6 @@ lucene-core ${project.version} - - ${project.groupId} - lucene-common-module - ${project.version} - ${project.groupId} lucene-test-framework diff --git a/dev-tools/maven/solr/src/pom.xml.template b/dev-tools/maven/solr/src/pom.xml.template index 0ab60fe907e..89a2d6ba41f 100644 --- a/dev-tools/maven/solr/src/pom.xml.template +++ b/dev-tools/maven/solr/src/pom.xml.template @@ -101,11 +101,6 @@ lucene-grouping ${project.version} - - org.apache.lucene - lucene-common-module - ${project.version} - org.apache.lucene lucene-queries diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java index 05d98bf059d..e588994499d 100755 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; /** @lucene.internal */ public abstract class MutableValue implements Comparable { diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java index 394b11af6ca..ee7144e3c78 100644 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueBool.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; public class MutableValueBool extends MutableValue { public boolean value; diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java similarity index 96% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java index 6fd420a23d5..f0f48cf43bb 100755 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueDate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; import java.util.Date; diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java index f832541dff5..901f48b8e96 100755 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueDouble.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; public class MutableValueDouble extends MutableValue { public double value; diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java index 0d3b06a3a9d..c8a28824254 100755 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueFloat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; public class MutableValueFloat extends MutableValue { public float value; diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java index d05f51346d9..d652b1ed0eb 100755 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueInt.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; public class MutableValueInt extends MutableValue { public int value; diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java index 5410f64bf74..372e5229ef7 100644 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueLong.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; public class MutableValueLong extends MutableValue { public long value; diff --git a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java similarity index 97% rename from modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java rename to lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java index 6d507566045..89cf36153ef 100755 --- a/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java +++ b/lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.common.mutable; +package org.apache.lucene.util.mutable; import org.apache.lucene.util.BytesRef; diff --git a/modules/build.xml b/modules/build.xml index 6775b31e36d..8c7c337eb7b 100644 --- a/modules/build.xml +++ b/modules/build.xml @@ -24,7 +24,6 @@ - @@ -39,7 +38,6 @@ - @@ -54,7 +52,6 @@ - @@ -69,7 +66,6 @@ - @@ -85,7 +81,6 @@ - @@ -99,7 +94,6 @@ - @@ -115,7 +109,6 @@ - diff --git a/modules/common/LICENSE.txt b/modules/common/LICENSE.txt deleted file mode 100644 index d6456956733..00000000000 --- a/modules/common/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/modules/common/NOTICE.txt b/modules/common/NOTICE.txt deleted file mode 100644 index b48d3ed7907..00000000000 --- a/modules/common/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Lucene Common -Copyright 2011 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). diff --git a/modules/common/build.xml b/modules/common/build.xml deleted file mode 100644 index 0a0d6f8e9b3..00000000000 --- a/modules/common/build.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Module containing common classes to be used by Solr and other modules - - - - - - - - - - - \ No newline at end of file diff --git a/modules/common/src/java/overview.html b/modules/common/src/java/overview.html deleted file mode 100644 index 03b52952b74..00000000000 --- a/modules/common/src/java/overview.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Common - - - - Common - - diff --git a/modules/common/src/test/ADD_TESTS_HERE.txt b/modules/common/src/test/ADD_TESTS_HERE.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/modules/queries/build.xml b/modules/queries/build.xml index 0cbd5c42f8b..6b59abc29db 100644 --- a/modules/queries/build.xml +++ b/modules/queries/build.xml @@ -26,22 +26,5 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java index c91fe28f343..43c3c818ebe 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java @@ -17,11 +17,11 @@ package org.apache.lucene.queries.function; * limitations under the License. */ -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.search.*; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueFloat; /** * Represents field values as different types. diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java index f9582958d7e..8244a8a00f4 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java @@ -1,9 +1,9 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueBool; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueBool; public abstract class BoolDocValues extends DocValues { diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java index 292af4c65b6..c09e0222db2 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java @@ -1,9 +1,9 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueDouble; public abstract class DoubleDocValues extends DocValues { protected final ValueSource vs; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java index 312de6b27fa..368a45a7a52 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java @@ -1,9 +1,9 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueFloat; public abstract class FloatDocValues extends DocValues { protected final ValueSource vs; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java index dd1e1b3a5a7..fa6c455c81f 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java @@ -1,9 +1,9 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueInt; public abstract class IntDocValues extends DocValues { diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java index 8fbe1d96399..da4934c609b 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java @@ -1,9 +1,9 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueLong; public abstract class LongDocValues extends DocValues { diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java index 57e7a34751f..b3da187471a 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java @@ -1,10 +1,9 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueStr; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; -import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueStr; public abstract class StrDocValues extends DocValues { protected final ValueSource vs; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java index d00eb75f088..c74e07347f1 100755 --- a/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java @@ -17,8 +17,6 @@ package org.apache.lucene.queries.function.docvalues; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueStr; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSourceScorer; @@ -27,6 +25,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueStr; import java.io.IOException; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java index fb5c441e64c..c819a5404bd 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java @@ -17,8 +17,6 @@ package org.apache.lucene.queries.function.valuesource; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; @@ -27,6 +25,8 @@ import org.apache.lucene.queries.function.docvalues.DoubleDocValues; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.DoubleValuesCreator; import org.apache.lucene.search.cache.CachedArray.DoubleValues; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueDouble; import java.io.IOException; import java.util.Map; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java index 87a5db54204..87c2ef95d54 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java @@ -20,14 +20,14 @@ package org.apache.lucene.queries.function.valuesource; import java.io.IOException; import java.util.Map; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.CachedArray.FloatValues; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueFloat; /** * Obtains float field values from the {@link org.apache.lucene.search.FieldCache} diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java index d9498d3915f..33c8b559b62 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java @@ -17,8 +17,6 @@ package org.apache.lucene.queries.function.valuesource; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; @@ -27,6 +25,8 @@ import org.apache.lucene.queries.function.docvalues.IntDocValues; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.IntValuesCreator; import org.apache.lucene.search.cache.CachedArray.IntValues; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueInt; import java.io.IOException; import java.util.Map; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java index 3b3bb000897..f3abd5f5c7a 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java @@ -17,8 +17,6 @@ package org.apache.lucene.queries.function.valuesource; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; @@ -27,6 +25,8 @@ import org.apache.lucene.queries.function.docvalues.LongDocValues; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.lucene.search.cache.CachedArray.LongValues; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueLong; import java.io.IOException; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java index 266026611fd..f4379570d91 100644 --- a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java @@ -17,8 +17,6 @@ package org.apache.lucene.queries.function.valuesource; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; @@ -26,6 +24,8 @@ import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.docvalues.IntDocValues; import org.apache.lucene.search.FieldCache; import org.apache.lucene.util.ReaderUtil; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueInt; import java.io.IOException; import java.util.Map; diff --git a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java index 78423717581..65002b42266 100755 --- a/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java @@ -17,9 +17,6 @@ package org.apache.lucene.queries.function.valuesource; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueFloat; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; @@ -27,6 +24,8 @@ import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.search.*; import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ReaderUtil; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueFloat; import java.io.IOException; import java.util.Map; diff --git a/solr/common-build.xml b/solr/common-build.xml index 9f9bc3156e2..168a70047f2 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -199,7 +199,6 @@ - @@ -218,7 +217,6 @@ - @@ -256,9 +254,6 @@ - - - @@ -277,7 +272,6 @@ - diff --git a/solr/src/java/org/apache/solr/schema/BoolField.java b/solr/src/java/org/apache/solr/schema/BoolField.java index a57b101035e..fd3bdf9d5c2 100644 --- a/solr/src/java/org/apache/solr/schema/BoolField.java +++ b/solr/src/java/org/apache/solr/schema/BoolField.java @@ -17,8 +17,6 @@ package org.apache.solr.schema; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueBool; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; @@ -28,6 +26,8 @@ import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueBool; import org.apache.solr.search.QParser; import org.apache.solr.search.function.*; import org.apache.lucene.analysis.Analyzer; diff --git a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java index 3e9bffe5a64..eba2b049623 100644 --- a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java +++ b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java @@ -17,8 +17,6 @@ package org.apache.solr.schema; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.docvalues.StringIndexDocValues; @@ -26,6 +24,8 @@ import org.apache.lucene.queries.function.valuesource.FieldCacheSource; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueDouble; import org.apache.solr.search.QParser; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; diff --git a/solr/src/java/org/apache/solr/schema/SortableFloatField.java b/solr/src/java/org/apache/solr/schema/SortableFloatField.java index fac243d2270..d5adbee770c 100644 --- a/solr/src/java/org/apache/solr/schema/SortableFloatField.java +++ b/solr/src/java/org/apache/solr/schema/SortableFloatField.java @@ -17,8 +17,6 @@ package org.apache.solr.schema; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.docvalues.StringIndexDocValues; @@ -26,6 +24,8 @@ import org.apache.lucene.queries.function.valuesource.FieldCacheSource; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueFloat; import org.apache.solr.search.QParser; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; diff --git a/solr/src/java/org/apache/solr/schema/SortableIntField.java b/solr/src/java/org/apache/solr/schema/SortableIntField.java index 2bd5e4a335b..d9fa3fcb1b1 100644 --- a/solr/src/java/org/apache/solr/schema/SortableIntField.java +++ b/solr/src/java/org/apache/solr/schema/SortableIntField.java @@ -17,8 +17,6 @@ package org.apache.solr.schema; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.docvalues.StringIndexDocValues; @@ -26,6 +24,8 @@ import org.apache.lucene.queries.function.valuesource.FieldCacheSource; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueInt; import org.apache.solr.search.QParser; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; diff --git a/solr/src/java/org/apache/solr/schema/SortableLongField.java b/solr/src/java/org/apache/solr/schema/SortableLongField.java index 66b46737725..ad7ea9ad713 100644 --- a/solr/src/java/org/apache/solr/schema/SortableLongField.java +++ b/solr/src/java/org/apache/solr/schema/SortableLongField.java @@ -17,8 +17,6 @@ package org.apache.solr.schema; -import org.apache.lucene.common.mutable.MutableValue; -import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.docvalues.StringIndexDocValues; @@ -26,6 +24,8 @@ import org.apache.lucene.queries.function.valuesource.FieldCacheSource; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.mutable.MutableValue; +import org.apache.lucene.util.mutable.MutableValueLong; import org.apache.solr.search.QParser; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; diff --git a/solr/src/java/org/apache/solr/schema/TrieField.java b/solr/src/java/org/apache/solr/schema/TrieField.java index d30cb537010..b9845cf99ff 100644 --- a/solr/src/java/org/apache/solr/schema/TrieField.java +++ b/solr/src/java/org/apache/solr/schema/TrieField.java @@ -16,8 +16,6 @@ */ package org.apache.solr.schema; -import org.apache.lucene.common.mutable.MutableValueDate; -import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericField; @@ -35,6 +33,8 @@ import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.NumericUtils; +import org.apache.lucene.util.mutable.MutableValueDate; +import org.apache.lucene.util.mutable.MutableValueLong; import org.apache.solr.analysis.*; import org.apache.solr.common.SolrException; import org.apache.solr.response.TextResponseWriter; diff --git a/solr/src/java/org/apache/solr/search/Grouping.java b/solr/src/java/org/apache/solr/search/Grouping.java index 5079286a12c..af4fa2e62bb 100755 --- a/solr/src/java/org/apache/solr/search/Grouping.java +++ b/solr/src/java/org/apache/solr/search/Grouping.java @@ -18,7 +18,6 @@ package org.apache.solr.search; import org.apache.commons.lang.ArrayUtils; -import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; @@ -29,6 +28,7 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.*; import org.apache.lucene.search.grouping.*; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.mutable.MutableValue; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap;