You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ep...@apache.org on 2020/09/17 21:00:56 UTC
[lucene-solr] branch SOLR-14866 updated (b39d03f -> ef3d1ec)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a change to branch SOLR-14866
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from b39d03f we never use the [options="header"] layout, so document what we do use
add 27a14fe Revert "SOLR-14151: Bug fixes (#1815)"
add a8099d6 Merge branch 'master' of github.com:apache/lucene-solr
add 7b8e72e SOLR-14871 Use Annotations for v2 APIs in/cluster path (#1878)
add 6b87cfb Merge branch 'master' of github.com:apache/lucene-solr
add 93094ef LUCENE-9510: Don't compress temporary stored fields and term vectors when index sorting is enabled. (#1874)
add ad71bee LUCENE-9525: Better handle small documents with Lucene87StoredFieldsFormat. (#1876)
add bc0c9ff SOLR-14799: JWT authentication plugin only requires sub claim when principalClaim=sub
add c63684f Revert "SOLR-14799: JWT authentication plugin only requires sub claim when principalClaim=sub"
add 2202246 SOLR-14799: JWT authentication plugin only requires sub claim when principalClaim=sub
add a0404a7 SOLR-14799: add CHANGES entry
add c7d234c SOLR-14613: Autoscaling replacement using placement plugins
add e5d3e4d Merge branch 'master' of github.com:apache/lucene-solr
add 5bc7fb2 SOLR-14871: remove unused test
add cbb1659 Revert "Revert "SOLR-14151: Bug fixes (#1815)""
add 4f344cb LUCENE-9530: cleaned up javacc gradle generation scripts. (#1883)
add 515608a SOLR-14151: fixed the classloading issue
add 6c9d7ad LUCENE-9527: upgrade javacc to 7.0.4 (#1884)
add 2364a7a SOLR-14792: Remove VelocityResponseWriter
add dbba48b SOLR-14613: use set-placement-plugin for both setting and unsetting plugin config
add e0a6490 Further tune Lucene87StoredFieldsFormat for small documents. (#1888)
add 33f7280 LUCENE-9529: Track dirtiness of stored fields via a number of docs, not chunks. (#1882)
add ef3d1ec mergin
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 -
build.gradle | 2 +-
gradle/documentation/render-javadoc.gradle | 7 -
gradle/generation/javacc.gradle | 585 ++++----
gradle/maven/defaults-maven.gradle | 1 -
lucene/CHANGES.txt | 4 +
.../compressing/CompressingStoredFieldsReader.java | 68 +-
.../compressing/CompressingStoredFieldsWriter.java | 13 +-
.../compressing/CompressingTermVectorsReader.java | 32 +-
.../compressing/CompressingTermVectorsWriter.java | 15 +-
.../codecs/lucene87/BugfixDeflater_JDK8252739.java | 13 +-
.../DeflateWithPresetDictCompressionMode.java | 22 +-
.../lucene87/LZ4WithPresetDictCompressionMode.java | 26 +-
.../lucene87/Lucene87StoredFieldsFormat.java | 35 +-
.../lucene/index/SortingStoredFieldsConsumer.java | 59 +-
.../lucene/index/SortingTermVectorsConsumer.java | 22 +-
.../lucene/queryparser/classic/CharStream.java | 9 +-
.../lucene/queryparser/classic/FastCharStream.java | 20 +
.../lucene/queryparser/classic/ParseException.java | 38 +-
.../lucene/queryparser/classic/QueryParser.java | 705 +++++-----
.../classic/QueryParserTokenManager.java | 455 ++++---
.../apache/lucene/queryparser/classic/Token.java | 7 +-
.../lucene/queryparser/classic/TokenMgrError.java | 24 +-
.../flexible/standard/parser/CharStream.java | 9 +-
.../flexible/standard/parser/FastCharStream.java | 20 +
.../flexible/standard/parser/ParseException.java | 84 +-
.../standard/parser/StandardSyntaxParser.java | 1021 ++++++++------
.../standard/parser/StandardSyntaxParser.jj | 13 +-
.../parser/StandardSyntaxParserTokenManager.java | 391 +++---
.../flexible/standard/parser/Token.java | 7 +-
.../flexible/standard/parser/TokenMgrError.java | 24 +-
.../queryparser/surround/parser/CharStream.java | 9 +-
.../surround/parser/FastCharStream.java | 20 +
.../surround/parser/ParseException.java | 38 +-
.../queryparser/surround/parser/QueryParser.java | 580 ++++----
.../surround/parser/QueryParserTokenManager.java | 322 +++--
.../lucene/queryparser/surround/parser/Token.java | 7 +-
.../queryparser/surround/parser/TokenMgrError.java | 24 +-
.../flexible/standard/TestQPHelper.java | 9 +
.../DeflateWithPresetCompressingCodec.java | 2 +-
.../compressing/LZ4WithPresetCompressingCodec.java | 2 +-
.../TestCompressingStoredFieldsFormat.java | 3 +-
.../TestCompressingTermVectorsFormat.java | 2 +-
settings.gradle | 1 -
solr/CHANGES.txt | 2 +
.../java/org/apache/solr/response/PageTool.java | 92 --
.../solr/response/SolrVelocityResourceLoader.java | 61 -
.../solr/response/VelocityResponseWriter.java | 468 -------
.../src/java/org/apache/solr/response/package.html | 23 -
solr/contrib/velocity/src/java/overview.html | 21 -
.../velocity/src/resources/VM_global_library.vm | 4 -
solr/contrib/velocity/src/resources/_macros.vm | 70 -
solr/contrib/velocity/src/resources/macros.vm | 3 -
.../velocity/src/resources/velocity/_default.vm | 14 -
.../velocity/src/resources/velocity/browse.vm | 73 -
.../velocity/src/resources/velocity/error.vm | 4 -
.../velocity/src/resources/velocity/facets.vm | 23 -
.../velocity/src/resources/velocity/footer.vm | 19 -
.../velocity/src/resources/velocity/head.vm | 185 ---
.../contrib/velocity/src/resources/velocity/hit.vm | 27 -
.../velocity/src/resources/velocity/layout.vm | 19 -
.../src/resources/velocity/resources.properties | 6 -
.../src/resources/velocity/results_list.vm | 3 -
.../velocity/src/test-files/velocity/file.vm | 1 -
.../velocity/solr/collection1/conf/schema.xml | 26 -
.../velocity/solr/collection1/conf/solrconfig.xml | 52 -
.../solr/collection1/conf/velocity-init.properties | 18 -
.../collection1/conf/velocity/VM_global_library.vm | 3 -
.../solr/collection1/conf/velocity/encoding.vm | 1 -
.../solr/collection1/conf/velocity/layout.vm | 1 -
.../solr/collection1/conf/velocity/locale.vm | 1 -
.../collection1/conf/velocity/locale_number.vm | 1 -
.../solr/collection1/conf/velocity/macros.vm | 3 -
.../solr/collection1/conf/velocity/numFound.vm | 1 -
.../collection1/conf/velocity/outside_the_box.vm | 4 -
.../solr/collection1/conf/velocity/resource_get.vm | 1 -
.../conf/velocity/sandbox_intersection.vm | 5 -
.../conf/velocity/test_macro_legacy_support.vm | 1 -
.../conf/velocity/test_macro_overridden.vm | 1 -
.../conf/velocity/test_macro_visible.vm | 1 -
solr/contrib/velocity/src/test/custom_tool.vm | 19 -
solr/contrib/velocity/src/test/foreach.vm | 14 -
.../solr/velocity/VelocityResponseWriterTest.java | 318 -----
.../src/test/velocity/resources.properties | 18 -
.../src/test/velocity/resources_en_UK.properties | 18 -
.../src/java/org/apache/solr/api/AnnotatedApi.java | 12 +-
.../src/java/org/apache/solr/api/PayloadObj.java | 4 +-
.../apache/solr/cloud/api/collections/Assign.java | 64 +-
.../cloud/api/collections/CreateCollectionCmd.java | 3 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 3 +-
.../solr/cloud/api/collections/RestoreCmd.java | 3 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 3 +-
.../src/java/org/apache/solr/cluster/Cluster.java | 50 +
.../src/java/org/apache/solr/cluster/Node.java} | 21 +-
.../src/java/org/apache/solr/cluster/Replica.java} | 39 +-
.../src/java/org/apache/solr/cluster/Shard.java | 60 +
.../org/apache/solr/cluster/SolrCollection.java | 78 ++
.../java/org/apache/solr/cluster/package-info.java | 28 +
.../solr/cluster/placement/AttributeFetcher.java | 85 ++
.../solr/cluster/placement/AttributeValues.java | 55 +
.../solr/cluster/placement/PlacementException.java | 48 +
.../solr/cluster/placement/PlacementPlan.java | 43 +
.../cluster/placement/PlacementPlanFactory.java | 51 +
.../solr/cluster/placement/PlacementPlugin.java | 51 +
.../cluster/placement/PlacementPluginConfig.java | 115 ++
.../cluster/placement/PlacementPluginFactory.java} | 27 +-
.../solr/cluster/placement/PlacementRequest.java | 64 +
.../solr/cluster/placement/ReplicaPlacement.java | 56 +
.../placement/impl/AttributeFetcherImpl.java | 228 ++++
.../placement/impl/AttributeValuesImpl.java | 114 ++
.../placement/impl/PlacementPlanFactoryImpl.java} | 26 +-
.../cluster/placement/impl/PlacementPlanImpl.java} | 31 +-
.../impl/PlacementPluginAssignStrategy.java | 68 +
.../placement/impl/PlacementPluginConfigImpl.java | 204 +++
.../placement/impl/PlacementRequestImpl.java | 100 ++
.../placement/impl/ReplicaPlacementImpl.java | 83 ++
.../impl/SimpleClusterAbstractionsImpl.java | 392 ++++++
.../solr/cluster/placement/impl/package-info.java} | 21 +-
.../solr/cluster/placement/package-info.java | 40 +
.../SamplePluginAffinityReplicaPlacement.java | 509 +++++++
.../plugins/SamplePluginMinimizeCores.java | 138 ++
.../plugins/SamplePluginRandomPlacement.java | 88 ++
.../cluster/placement/plugins/package-info.java} | 21 +-
.../java/org/apache/solr/core/CoreContainer.java | 4 +
.../org/apache/solr/core/SolrResourceLoader.java | 111 +-
.../java/org/apache/solr/handler/ClusterAPI.java | 191 +++
.../org/apache/solr/handler/SolrConfigHandler.java | 2 +-
.../solr/handler/admin/CollectionHandlerApi.java | 53 -
.../solr/handler/admin/CollectionsHandler.java | 63 +-
.../java/org/apache/solr/parser/CharStream.java | 9 +-
.../org/apache/solr/parser/FastCharStream.java | 20 +
.../org/apache/solr/parser/ParseException.java | 38 +-
.../java/org/apache/solr/parser/QueryParser.java | 729 +++++-----
.../solr/parser/QueryParserTokenManager.java | 556 ++++----
.../src/java/org/apache/solr/parser/Token.java | 7 +-
.../java/org/apache/solr/parser/TokenMgrError.java | 24 +-
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 5 +-
.../java/org/apache/solr/schema/SchemaManager.java | 10 +-
.../org/apache/solr/security/JWTAuthPlugin.java | 8 +-
.../runtimecode/payload-component.jar.bin | Bin 0 -> 17815 bytes
.../solr/handler/admin/TestCollectionAPIs.java | 10 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 21 +-
.../apache/solr/security/JWTAuthPluginTest.java | 18 +-
solr/example/files/README.md | 167 ---
.../browse-resources/velocity/resources.properties | 82 --
.../velocity/resources_de_DE.properties | 18 -
.../velocity/resources_fr_FR.properties | 20 -
solr/example/files/conf/currency.xml | 67 -
solr/example/files/conf/elevate.xml | 42 -
solr/example/files/conf/email_url_types.txt | 2 -
solr/example/files/conf/lang/contractions_ca.txt | 8 -
solr/example/files/conf/lang/contractions_fr.txt | 15 -
solr/example/files/conf/lang/contractions_ga.txt | 5 -
solr/example/files/conf/lang/contractions_it.txt | 23 -
solr/example/files/conf/lang/hyphenations_ga.txt | 5 -
solr/example/files/conf/lang/stemdict_nl.txt | 6 -
solr/example/files/conf/lang/stoptags_ja.txt | 420 ------
solr/example/files/conf/lang/stopwords_ar.txt | 125 --
solr/example/files/conf/lang/stopwords_bg.txt | 193 ---
solr/example/files/conf/lang/stopwords_ca.txt | 220 ---
solr/example/files/conf/lang/stopwords_cz.txt | 172 ---
solr/example/files/conf/lang/stopwords_da.txt | 110 --
solr/example/files/conf/lang/stopwords_de.txt | 294 ----
solr/example/files/conf/lang/stopwords_el.txt | 78 --
solr/example/files/conf/lang/stopwords_en.txt | 54 -
solr/example/files/conf/lang/stopwords_es.txt | 356 -----
solr/example/files/conf/lang/stopwords_eu.txt | 99 --
solr/example/files/conf/lang/stopwords_fa.txt | 313 -----
solr/example/files/conf/lang/stopwords_fi.txt | 97 --
solr/example/files/conf/lang/stopwords_fr.txt | 186 ---
solr/example/files/conf/lang/stopwords_ga.txt | 110 --
solr/example/files/conf/lang/stopwords_gl.txt | 161 ---
solr/example/files/conf/lang/stopwords_hi.txt | 235 ----
solr/example/files/conf/lang/stopwords_hu.txt | 211 ---
solr/example/files/conf/lang/stopwords_hy.txt | 46 -
solr/example/files/conf/lang/stopwords_id.txt | 359 -----
solr/example/files/conf/lang/stopwords_it.txt | 303 -----
solr/example/files/conf/lang/stopwords_ja.txt | 127 --
solr/example/files/conf/lang/stopwords_lv.txt | 172 ---
solr/example/files/conf/lang/stopwords_nl.txt | 119 --
solr/example/files/conf/lang/stopwords_no.txt | 194 ---
solr/example/files/conf/lang/stopwords_pt.txt | 253 ----
solr/example/files/conf/lang/stopwords_ro.txt | 233 ----
solr/example/files/conf/lang/stopwords_ru.txt | 243 ----
solr/example/files/conf/lang/stopwords_sv.txt | 133 --
solr/example/files/conf/lang/stopwords_th.txt | 119 --
solr/example/files/conf/lang/stopwords_tr.txt | 212 ---
solr/example/files/conf/lang/userdict_ja.txt | 29 -
solr/example/files/conf/managed-schema | 520 -------
solr/example/files/conf/params.json | 34 -
solr/example/files/conf/protwords.txt | 21 -
solr/example/files/conf/solrconfig.xml | 1423 --------------------
solr/example/files/conf/stopwords.txt | 14 -
solr/example/files/conf/synonyms.txt | 29 -
solr/example/files/conf/update-script.js | 115 --
solr/example/files/conf/velocity/browse.vm | 32 -
solr/example/files/conf/velocity/dropit.js | 0
solr/example/files/conf/velocity/facet_doc_type.vm | 2 -
.../files/conf/velocity/facet_text_shingles.vm | 12 -
solr/example/files/conf/velocity/facets.vm | 24 -
solr/example/files/conf/velocity/footer.vm | 29 -
solr/example/files/conf/velocity/head.vm | 290 ----
solr/example/files/conf/velocity/hit.vm | 77 --
.../files/conf/velocity/img/english_640.png | Bin 138412 -> 0 bytes
.../example/files/conf/velocity/img/france_640.png | Bin 99992 -> 0 bytes
.../files/conf/velocity/img/germany_640.png | Bin 105271 -> 0 bytes
solr/example/files/conf/velocity/img/globe_256.png | Bin 46622 -> 0 bytes
.../files/conf/velocity/jquery.tx3-tag-cloud.js | 0
solr/example/files/conf/velocity/js/dropit.js | 97 --
.../files/conf/velocity/js/jquery.autocomplete.js | 763 -----------
.../files/conf/velocity/js/jquery.tx3-tag-cloud.js | 70 -
solr/example/files/conf/velocity/layout.vm | 42 -
solr/example/files/conf/velocity/macros.vm | 16 -
.../example/files/conf/velocity/mime_type_lists.vm | 68 -
solr/example/files/conf/velocity/results.vm | 20 -
solr/example/files/conf/velocity/results_list.vm | 21 -
solr/licenses/velocity-engine-core-2.0.jar.sha1 | 1 -
solr/licenses/velocity-engine-core-LICENSE-ASL.txt | 202 ---
solr/licenses/velocity-engine-core-NOTICE.txt | 7 -
solr/licenses/velocity-tools-generic-3.0.jar.sha1 | 1 -
.../velocity-tools-generic-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-generic-NOTICE.txt | 12 -
solr/licenses/velocity-tools-view-3.0.jar.sha1 | 1 -
solr/licenses/velocity-tools-view-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-view-NOTICE.txt | 12 -
solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1 | 1 -
.../velocity-tools-view-jsp-LICENSE-ASL.txt | 201 ---
solr/licenses/velocity-tools-view-jsp-NOTICE.txt | 12 -
solr/packaging/build.gradle | 1 -
.../conf/solrconfig.xml | 112 +-
.../conf/velocity/README.md | 116 --
.../conf/velocity/VM_global_library.vm | 186 ---
.../conf/velocity/browse.vm | 33 -
.../conf/velocity/cluster.vm | 19 -
.../conf/velocity/cluster_results.vm | 31 -
.../conf/velocity/debug.vm | 28 -
.../conf/velocity/did_you_mean.vm | 11 -
.../conf/velocity/error.vm | 11 -
.../conf/velocity/facet_fields.vm | 24 -
.../conf/velocity/facet_pivot.vm | 12 -
.../conf/velocity/facet_queries.vm | 12 -
.../conf/velocity/facet_ranges.vm | 23 -
.../conf/velocity/facets.vm | 10 -
.../conf/velocity/footer.vm | 43 -
.../conf/velocity/head.vm | 37 -
.../conf/velocity/header.vm | 7 -
.../conf/velocity/hit.vm | 25 -
.../conf/velocity/hit_grouped.vm | 43 -
.../conf/velocity/hit_plain.vm | 25 -
.../conf/velocity/join_doc.vm | 20 -
.../conf/velocity/jquery.autocomplete.css | 48 -
.../conf/velocity/jquery.autocomplete.js | 763 -----------
.../conf/velocity/layout.vm | 24 -
.../conf/velocity/main.css | 231 ----
.../conf/velocity/mime_type_lists.vm | 68 -
.../conf/velocity/pagination_bottom.vm | 22 -
.../conf/velocity/pagination_top.vm | 29 -
.../conf/velocity/product_doc.vm | 32 -
.../conf/velocity/query.vm | 42 -
.../conf/velocity/query_form.vm | 64 -
.../conf/velocity/query_group.vm | 43 -
.../conf/velocity/query_spatial.vm | 75 --
.../conf/velocity/results_list.vm | 22 -
.../conf/velocity/richtext_doc.vm | 153 ---
.../conf/velocity/suggest.vm | 8 -
.../conf/velocity/tabs.vm | 50 -
solr/solr-ref-guide/build.gradle | 3 -
solr/solr-ref-guide/src/_config.yml.template | 1 -
solr/solr-ref-guide/src/libs.adoc | 2 -
solr/solr-ref-guide/src/response-writers.adoc | 10 +-
solr/solr-ref-guide/src/searching.adoc | 2 -
.../src/velocity-response-writer.adoc | 120 --
solr/solr-ref-guide/src/velocity-search-ui.adoc | 26 -
.../client/solrj/request/CollectionApiMapping.java | 31 +-
.../solrj/request/beans/ClusterPropInfo.java | 72 +
.../solr/common/params/DefaultSolrParams.java | 2 +-
.../apache/solr/common/util/JsonSchemaCreator.java | 14 +-
.../java/org/apache/solr/common/util/Utils.java | 2 +-
.../src/resources/apispec/cluster.Commands.json | 146 --
.../apispec/cluster.commandstatus.delete.json | 10 -
.../resources/apispec/cluster.commandstatus.json | 20 -
solr/solrj/src/resources/apispec/cluster.json | 14 -
.../apache/solr/common/util/JsonValidatorTest.java | 8 -
versions.lock | 8 +-
versions.props | 2 -
286 files changed, 6832 insertions(+), 18454 deletions(-)
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
delete mode 100644 solr/contrib/velocity/src/java/org/apache/solr/response/package.html
delete mode 100644 solr/contrib/velocity/src/java/overview.html
delete mode 100644 solr/contrib/velocity/src/resources/VM_global_library.vm
delete mode 100644 solr/contrib/velocity/src/resources/_macros.vm
delete mode 100644 solr/contrib/velocity/src/resources/macros.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/_default.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/browse.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/error.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/facets.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/footer.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/head.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/hit.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/layout.vm
delete mode 100644 solr/contrib/velocity/src/resources/velocity/resources.properties
delete mode 100644 solr/contrib/velocity/src/resources/velocity/results_list.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/file.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity-init.properties
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/VM_global_library.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/encoding.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/layout.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/locale.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/locale_number.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/macros.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/numFound.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/outside_the_box.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/resource_get.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/sandbox_intersection.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/test_macro_legacy_support.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/test_macro_overridden.vm
delete mode 100644 solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/test_macro_visible.vm
delete mode 100644 solr/contrib/velocity/src/test/custom_tool.vm
delete mode 100644 solr/contrib/velocity/src/test/foreach.vm
delete mode 100644 solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
delete mode 100644 solr/contrib/velocity/src/test/velocity/resources.properties
delete mode 100644 solr/contrib/velocity/src/test/velocity/resources_en_UK.properties
create mode 100644 solr/core/src/java/org/apache/solr/cluster/Cluster.java
copy solr/{contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java => core/src/java/org/apache/solr/cluster/Node.java} (67%)
copy solr/{contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java => core/src/java/org/apache/solr/cluster/Replica.java} (56%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/Shard.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/SolrCollection.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/package-info.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/AttributeValues.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementException.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPlan.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPlanFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPlugin.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPluginConfig.java
copy solr/{contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java => core/src/java/org/apache/solr/cluster/placement/PlacementPluginFactory.java} (55%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementRequest.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/ReplicaPlacement.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeValuesImpl.java
copy solr/{contrib/velocity/build.gradle => core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanFactoryImpl.java} (51%)
copy solr/{contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java => core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanImpl.java} (53%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginAssignStrategy.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginConfigImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementRequestImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/ReplicaPlacementImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsImpl.java
rename solr/{contrib/velocity/build.gradle => core/src/java/org/apache/solr/cluster/placement/impl/package-info.java} (63%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/package-info.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginAffinityReplicaPlacement.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginMinimizeCores.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginRandomPlacement.java
rename solr/{contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java => core/src/java/org/apache/solr/cluster/placement/plugins/package-info.java} (67%)
create mode 100644 solr/core/src/java/org/apache/solr/handler/ClusterAPI.java
create mode 100644 solr/core/src/test-files/runtimecode/payload-component.jar.bin
delete mode 100644 solr/example/files/README.md
delete mode 100644 solr/example/files/browse-resources/velocity/resources.properties
delete mode 100644 solr/example/files/browse-resources/velocity/resources_de_DE.properties
delete mode 100644 solr/example/files/browse-resources/velocity/resources_fr_FR.properties
delete mode 100644 solr/example/files/conf/currency.xml
delete mode 100644 solr/example/files/conf/elevate.xml
delete mode 100644 solr/example/files/conf/email_url_types.txt
delete mode 100644 solr/example/files/conf/lang/contractions_ca.txt
delete mode 100644 solr/example/files/conf/lang/contractions_fr.txt
delete mode 100644 solr/example/files/conf/lang/contractions_ga.txt
delete mode 100644 solr/example/files/conf/lang/contractions_it.txt
delete mode 100644 solr/example/files/conf/lang/hyphenations_ga.txt
delete mode 100644 solr/example/files/conf/lang/stemdict_nl.txt
delete mode 100644 solr/example/files/conf/lang/stoptags_ja.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ar.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_bg.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ca.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_cz.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_da.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_de.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_el.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_en.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_es.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_eu.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_fa.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_fi.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_fr.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ga.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_gl.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_hi.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_hu.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_hy.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_id.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_it.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ja.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_lv.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_nl.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_no.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_pt.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ro.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_ru.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_sv.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_th.txt
delete mode 100644 solr/example/files/conf/lang/stopwords_tr.txt
delete mode 100644 solr/example/files/conf/lang/userdict_ja.txt
delete mode 100644 solr/example/files/conf/managed-schema
delete mode 100644 solr/example/files/conf/params.json
delete mode 100644 solr/example/files/conf/protwords.txt
delete mode 100644 solr/example/files/conf/solrconfig.xml
delete mode 100644 solr/example/files/conf/stopwords.txt
delete mode 100644 solr/example/files/conf/synonyms.txt
delete mode 100644 solr/example/files/conf/update-script.js
delete mode 100644 solr/example/files/conf/velocity/browse.vm
delete mode 100644 solr/example/files/conf/velocity/dropit.js
delete mode 100644 solr/example/files/conf/velocity/facet_doc_type.vm
delete mode 100644 solr/example/files/conf/velocity/facet_text_shingles.vm
delete mode 100644 solr/example/files/conf/velocity/facets.vm
delete mode 100644 solr/example/files/conf/velocity/footer.vm
delete mode 100644 solr/example/files/conf/velocity/head.vm
delete mode 100644 solr/example/files/conf/velocity/hit.vm
delete mode 100644 solr/example/files/conf/velocity/img/english_640.png
delete mode 100644 solr/example/files/conf/velocity/img/france_640.png
delete mode 100644 solr/example/files/conf/velocity/img/germany_640.png
delete mode 100644 solr/example/files/conf/velocity/img/globe_256.png
delete mode 100644 solr/example/files/conf/velocity/jquery.tx3-tag-cloud.js
delete mode 100644 solr/example/files/conf/velocity/js/dropit.js
delete mode 100644 solr/example/files/conf/velocity/js/jquery.autocomplete.js
delete mode 100644 solr/example/files/conf/velocity/js/jquery.tx3-tag-cloud.js
delete mode 100644 solr/example/files/conf/velocity/layout.vm
delete mode 100644 solr/example/files/conf/velocity/macros.vm
delete mode 100644 solr/example/files/conf/velocity/mime_type_lists.vm
delete mode 100644 solr/example/files/conf/velocity/results.vm
delete mode 100644 solr/example/files/conf/velocity/results_list.vm
delete mode 100644 solr/licenses/velocity-engine-core-2.0.jar.sha1
delete mode 100644 solr/licenses/velocity-engine-core-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-engine-core-NOTICE.txt
delete mode 100644 solr/licenses/velocity-tools-generic-3.0.jar.sha1
delete mode 100644 solr/licenses/velocity-tools-generic-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-tools-generic-NOTICE.txt
delete mode 100644 solr/licenses/velocity-tools-view-3.0.jar.sha1
delete mode 100644 solr/licenses/velocity-tools-view-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-tools-view-NOTICE.txt
delete mode 100644 solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1
delete mode 100644 solr/licenses/velocity-tools-view-jsp-LICENSE-ASL.txt
delete mode 100644 solr/licenses/velocity-tools-view-jsp-NOTICE.txt
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/README.md
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/browse.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster_results.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/debug.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/error.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_fields.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_pivot.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_queries.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facet_ranges.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/facets.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/hit.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/hit_grouped.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/hit_plain.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/join_doc.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.css
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.js
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/layout.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/pagination_bottom.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/pagination_top.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/product_doc.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query_form.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query_group.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/query_spatial.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/results_list.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/suggest.vm
delete mode 100644 solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/tabs.vm
delete mode 100644 solr/solr-ref-guide/src/velocity-response-writer.adoc
delete mode 100644 solr/solr-ref-guide/src/velocity-search-ui.adoc
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/ClusterPropInfo.java
delete mode 100644 solr/solrj/src/resources/apispec/cluster.Commands.json
delete mode 100644 solr/solrj/src/resources/apispec/cluster.commandstatus.delete.json
delete mode 100644 solr/solrj/src/resources/apispec/cluster.commandstatus.json
delete mode 100644 solr/solrj/src/resources/apispec/cluster.json