From 0ff1e75b74e8dfca57137049c91768d73246bcf9 Mon Sep 17 00:00:00 2001 From: Erik Hatcher Date: Tue, 30 Dec 2014 00:50:57 +0000 Subject: [PATCH] SOLR-6779 (fix /browse on schemaless example) and several other related fixes and cleanups including remove /browse from test configs where it isn't needed, adjusting /browse definition to be valid and not an inappropriate copy of techproducts, fixed /update/extract indexing with data_driven_schema_configs configset, and fixed indexing of solr(-to-solr) example DIH indexing git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1648456 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 + .../solr/collection1/conf/solrconfig.xml | 98 --- .../solr/minimr/conf/solrconfig.xml | 99 --- .../solr/mrunit/conf/solrconfig.xml | 98 --- .../collection1/conf/solrconfig.xml | 98 --- .../solr/solrcloud/conf/solrconfig.xml | 97 --- .../resources/velocity/VM_global_library.vm | 2 +- .../collection1/conf/solrconfig-paramset.xml | 2 +- .../example-DIH/solr/db/conf/solrconfig.xml | 108 +-- .../solr/db/conf/velocity/README.txt | 101 --- .../db/conf/velocity/VM_global_library.vm | 175 ---- .../solr/db/conf/velocity/browse.vm | 33 - .../solr/db/conf/velocity/cluster.vm | 19 - .../solr/db/conf/velocity/cluster_results.vm | 31 - .../solr/db/conf/velocity/debug.vm | 28 - .../solr/db/conf/velocity/did_you_mean.vm | 9 - .../solr/db/conf/velocity/error.vm | 11 - .../solr/db/conf/velocity/facet_fields.vm | 23 - .../solr/db/conf/velocity/facet_pivot.vm | 12 - .../solr/db/conf/velocity/facet_queries.vm | 12 - .../solr/db/conf/velocity/facet_ranges.vm | 23 - .../solr/db/conf/velocity/facets.vm | 10 - .../solr/db/conf/velocity/footer.vm | 43 - .../example-DIH/solr/db/conf/velocity/head.vm | 37 - .../solr/db/conf/velocity/header.vm | 7 - .../example-DIH/solr/db/conf/velocity/hit.vm | 25 - .../solr/db/conf/velocity/hit_grouped.vm | 43 - .../solr/db/conf/velocity/hit_plain.vm | 25 - .../solr/db/conf/velocity/join_doc.vm | 20 - .../db/conf/velocity/jquery.autocomplete.css | 48 -- .../db/conf/velocity/jquery.autocomplete.js | 763 ------------------ .../solr/db/conf/velocity/layout.vm | 24 - .../solr/db/conf/velocity/main.css | 231 ------ .../solr/db/conf/velocity/mime_type_lists.vm | 68 -- .../db/conf/velocity/pagination_bottom.vm | 22 - .../solr/db/conf/velocity/pagination_top.vm | 29 - .../solr/db/conf/velocity/product_doc.vm | 32 - .../solr/db/conf/velocity/query.vm | 42 - .../solr/db/conf/velocity/query_form.vm | 64 -- .../solr/db/conf/velocity/query_group.vm | 43 - .../solr/db/conf/velocity/query_spatial.vm | 75 -- .../solr/db/conf/velocity/results_list.vm | 22 - .../solr/db/conf/velocity/richtext_doc.vm | 153 ---- .../solr/db/conf/velocity/suggest.vm | 8 - .../example-DIH/solr/db/conf/velocity/tabs.vm | 50 -- .../example-DIH/solr/mail/conf/solrconfig.xml | 109 +-- .../solr/mail/conf/velocity/README.txt | 101 --- .../mail/conf/velocity/VM_global_library.vm | 175 ---- .../solr/mail/conf/velocity/browse.vm | 33 - .../solr/mail/conf/velocity/cluster.vm | 19 - .../mail/conf/velocity/cluster_results.vm | 31 - .../solr/mail/conf/velocity/debug.vm | 28 - .../solr/mail/conf/velocity/did_you_mean.vm | 9 - .../solr/mail/conf/velocity/error.vm | 11 - .../solr/mail/conf/velocity/facet_fields.vm | 23 - .../solr/mail/conf/velocity/facet_pivot.vm | 12 - .../solr/mail/conf/velocity/facet_queries.vm | 12 - .../solr/mail/conf/velocity/facet_ranges.vm | 23 - .../solr/mail/conf/velocity/facets.vm | 10 - .../solr/mail/conf/velocity/footer.vm | 43 - .../solr/mail/conf/velocity/head.vm | 37 - .../solr/mail/conf/velocity/header.vm | 7 - .../solr/mail/conf/velocity/hit.vm | 25 - .../solr/mail/conf/velocity/hit_grouped.vm | 43 - .../solr/mail/conf/velocity/hit_plain.vm | 25 - .../solr/mail/conf/velocity/join_doc.vm | 20 - .../conf/velocity/jquery.autocomplete.css | 48 -- .../mail/conf/velocity/jquery.autocomplete.js | 763 ------------------ .../solr/mail/conf/velocity/layout.vm | 24 - .../solr/mail/conf/velocity/main.css | 231 ------ .../mail/conf/velocity/mime_type_lists.vm | 68 -- .../mail/conf/velocity/pagination_bottom.vm | 22 - .../solr/mail/conf/velocity/pagination_top.vm | 29 - .../solr/mail/conf/velocity/product_doc.vm | 32 - .../solr/mail/conf/velocity/query.vm | 42 - .../solr/mail/conf/velocity/query_form.vm | 64 -- .../solr/mail/conf/velocity/query_group.vm | 43 - .../solr/mail/conf/velocity/query_spatial.vm | 75 -- .../solr/mail/conf/velocity/results_list.vm | 22 - .../solr/mail/conf/velocity/richtext_doc.vm | 153 ---- .../solr/mail/conf/velocity/suggest.vm | 8 - .../solr/mail/conf/velocity/tabs.vm | 50 -- .../example-DIH/solr/rss/conf/solrconfig.xml | 108 +-- .../solr/rss/conf/velocity/README.txt | 101 --- .../rss/conf/velocity/VM_global_library.vm | 175 ---- .../solr/rss/conf/velocity/browse.vm | 33 - .../solr/rss/conf/velocity/cluster.vm | 19 - .../solr/rss/conf/velocity/cluster_results.vm | 31 - .../solr/rss/conf/velocity/debug.vm | 28 - .../solr/rss/conf/velocity/did_you_mean.vm | 9 - .../solr/rss/conf/velocity/error.vm | 11 - .../solr/rss/conf/velocity/facet_fields.vm | 23 - .../solr/rss/conf/velocity/facet_pivot.vm | 12 - .../solr/rss/conf/velocity/facet_queries.vm | 12 - .../solr/rss/conf/velocity/facet_ranges.vm | 23 - .../solr/rss/conf/velocity/facets.vm | 10 - .../solr/rss/conf/velocity/footer.vm | 43 - .../solr/rss/conf/velocity/head.vm | 37 - .../solr/rss/conf/velocity/header.vm | 7 - .../example-DIH/solr/rss/conf/velocity/hit.vm | 25 - .../solr/rss/conf/velocity/hit_grouped.vm | 43 - .../solr/rss/conf/velocity/hit_plain.vm | 25 - .../solr/rss/conf/velocity/join_doc.vm | 20 - .../rss/conf/velocity/jquery.autocomplete.css | 48 -- .../rss/conf/velocity/jquery.autocomplete.js | 763 ------------------ .../solr/rss/conf/velocity/layout.vm | 24 - .../solr/rss/conf/velocity/main.css | 231 ------ .../solr/rss/conf/velocity/mime_type_lists.vm | 68 -- .../rss/conf/velocity/pagination_bottom.vm | 22 - .../solr/rss/conf/velocity/pagination_top.vm | 29 - .../solr/rss/conf/velocity/product_doc.vm | 32 - .../solr/rss/conf/velocity/query.vm | 42 - .../solr/rss/conf/velocity/query_form.vm | 64 -- .../solr/rss/conf/velocity/query_group.vm | 43 - .../solr/rss/conf/velocity/query_spatial.vm | 75 -- .../solr/rss/conf/velocity/results_list.vm | 22 - .../solr/rss/conf/velocity/richtext_doc.vm | 153 ---- .../solr/rss/conf/velocity/suggest.vm | 8 - .../solr/rss/conf/velocity/tabs.vm | 50 -- .../solr/solr/conf/solr-data-config.xml | 2 +- .../example-DIH/solr/solr/conf/solrconfig.xml | 111 +-- .../solr/solr/conf/velocity/README.txt | 101 --- .../solr/conf/velocity/VM_global_library.vm | 175 ---- .../solr/solr/conf/velocity/browse.vm | 33 - .../solr/solr/conf/velocity/cluster.vm | 19 - .../solr/conf/velocity/cluster_results.vm | 31 - .../solr/solr/conf/velocity/debug.vm | 28 - .../solr/solr/conf/velocity/did_you_mean.vm | 9 - .../solr/solr/conf/velocity/error.vm | 11 - .../solr/solr/conf/velocity/facet_fields.vm | 23 - .../solr/solr/conf/velocity/facet_pivot.vm | 12 - .../solr/solr/conf/velocity/facet_queries.vm | 12 - .../solr/solr/conf/velocity/facet_ranges.vm | 23 - .../solr/solr/conf/velocity/facets.vm | 10 - .../solr/solr/conf/velocity/footer.vm | 43 - .../solr/solr/conf/velocity/head.vm | 37 - .../solr/solr/conf/velocity/header.vm | 7 - .../solr/solr/conf/velocity/hit.vm | 25 - .../solr/solr/conf/velocity/hit_grouped.vm | 43 - .../solr/solr/conf/velocity/hit_plain.vm | 25 - .../solr/solr/conf/velocity/join_doc.vm | 20 - .../conf/velocity/jquery.autocomplete.css | 48 -- .../solr/conf/velocity/jquery.autocomplete.js | 763 ------------------ .../solr/solr/conf/velocity/layout.vm | 24 - .../solr/solr/conf/velocity/main.css | 231 ------ .../solr/conf/velocity/mime_type_lists.vm | 68 -- .../solr/conf/velocity/pagination_bottom.vm | 22 - .../solr/solr/conf/velocity/pagination_top.vm | 29 - .../solr/solr/conf/velocity/product_doc.vm | 32 - .../solr/solr/conf/velocity/query.vm | 42 - .../solr/solr/conf/velocity/query_form.vm | 64 -- .../solr/solr/conf/velocity/query_group.vm | 43 - .../solr/solr/conf/velocity/query_spatial.vm | 75 -- .../solr/solr/conf/velocity/results_list.vm | 22 - .../solr/solr/conf/velocity/richtext_doc.vm | 153 ---- .../solr/solr/conf/velocity/suggest.vm | 8 - .../solr/solr/conf/velocity/tabs.vm | 50 -- .../example-DIH/solr/tika/conf/schema.xml | 3 - .../example-DIH/solr/tika/conf/solrconfig.xml | 102 +-- .../basic_configs/conf/solrconfig.xml | 19 +- .../conf/schema.xml | 1 + .../conf/solrconfig.xml | 10 +- 162 files changed, 125 insertions(+), 10388 deletions(-) delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/README.txt delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/VM_global_library.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/browse.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/cluster.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/cluster_results.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/debug.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/did_you_mean.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/error.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/facet_fields.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/facet_pivot.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/facet_queries.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/facet_ranges.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/facets.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/footer.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/head.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/header.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/hit.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/hit_grouped.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/hit_plain.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/join_doc.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/jquery.autocomplete.css delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/jquery.autocomplete.js delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/layout.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/main.css delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/mime_type_lists.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/pagination_bottom.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/pagination_top.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/product_doc.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/query.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/query_form.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/query_group.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/query_spatial.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/results_list.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/richtext_doc.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/suggest.vm delete mode 100644 solr/example/example-DIH/solr/db/conf/velocity/tabs.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/README.txt delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/VM_global_library.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/browse.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/cluster.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/cluster_results.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/debug.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/did_you_mean.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/error.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/facet_fields.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/facet_pivot.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/facet_queries.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/facet_ranges.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/facets.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/footer.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/head.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/header.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/hit.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/hit_grouped.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/hit_plain.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/join_doc.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/jquery.autocomplete.css delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/jquery.autocomplete.js delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/layout.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/main.css delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/mime_type_lists.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/pagination_bottom.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/pagination_top.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/product_doc.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/query.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/query_form.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/query_group.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/query_spatial.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/results_list.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/richtext_doc.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/suggest.vm delete mode 100644 solr/example/example-DIH/solr/mail/conf/velocity/tabs.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/README.txt delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/VM_global_library.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/browse.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/cluster.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/cluster_results.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/debug.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/did_you_mean.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/error.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/facet_fields.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/facet_pivot.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/facet_queries.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/facet_ranges.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/facets.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/footer.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/head.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/header.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/hit.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/hit_grouped.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/hit_plain.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/join_doc.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/jquery.autocomplete.css delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/jquery.autocomplete.js delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/layout.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/main.css delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/mime_type_lists.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/pagination_bottom.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/pagination_top.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/product_doc.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/query.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/query_form.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/query_group.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/query_spatial.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/results_list.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/richtext_doc.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/suggest.vm delete mode 100644 solr/example/example-DIH/solr/rss/conf/velocity/tabs.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/README.txt delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/VM_global_library.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/browse.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/cluster.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/cluster_results.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/debug.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/did_you_mean.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/error.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/facet_fields.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/facet_pivot.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/facet_queries.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/facet_ranges.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/facets.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/footer.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/head.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/header.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/hit.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/hit_grouped.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/hit_plain.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/join_doc.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/jquery.autocomplete.css delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/jquery.autocomplete.js delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/layout.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/main.css delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/mime_type_lists.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/pagination_bottom.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/pagination_top.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/product_doc.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/query.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/query_form.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/query_group.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/query_spatial.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/results_list.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/richtext_doc.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/suggest.vm delete mode 100644 solr/example/example-DIH/solr/solr/conf/velocity/tabs.vm diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 47d1ded2f5f..31120ebbcef 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -49,6 +49,8 @@ Other Changes * SOLR-6435: Add bin/post script to simplify posting content to Solr (ehatcher) +* SOLR-6779: fix /browse for schemaless example (ehatcher) + ================== 5.0.0 ================== diff --git a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml index 97933f4db3d..f1b03ebc92f 100644 --- a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml @@ -844,104 +844,6 @@ - - - - explicit - - - velocity - browse - layout - Solritas - - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score - - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - - - - - - - explicit - - - velocity - browse - layout - Solritas - - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score - - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - - - - - - - explicit - - - velocity - browse - layout - Solritas - - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score - - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - - - - - - explicit - - - velocity - browse - layout - Solritas - - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score - - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - - - - - - explicit - - - velocity - browse - layout - Solritas - - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score - - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - - - - explicit + + explicit - - velocity - browse - layout - Solritas + + velocity + browse + layout - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score + + edismax + *:* + 10 + *,score - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - + + on + 1 + + + + text + + - - explicit + + explicit - - velocity - browse - layout - Solritas + + velocity + browse + layout - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score + + edismax + *:* + 10 + *,score - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - + + on + 1 + + + + content + + + - - explicit + + explicit - - velocity - browse - layout - Solritas + + velocity + browse + layout - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score + + edismax + *:* + 10 + *,score - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - + + on + 1 + + + + text + + - - explicit + + explicit - - velocity - browse - layout - Solritas + + velocity + browse + layout - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score + + edismax + *:* + 10 + *,score - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - + + on + 1 + - diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml index 3be1ebc862b..d9219e821cc 100755 --- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml @@ -928,93 +928,31 @@ names (and different init parameters) --> - - explicit + + explicit - - velocity - browse - layout - Solritas + + velocity + browse + layout - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text - 100% - *:* - 10 - *,score + + edismax + *:* + 10 + *,score - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0 - - text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename - 3 - - - on - cat - manu_exact - content_type - author_s - ipod - GB - 1 - cat,inStock - after - price - 0 - 600 - 50 - popularity - 0 - 10 - 3 - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - on - content features title name - html - <b> - </b> - 0 - title - 0 - name - 3 - 200 - content - 750 - - - on - false - 5 - 2 - 5 - true - true - 5 - 3 - - - - - spellcheck - + + on + 1 + + + + text + + - + text diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/schema.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/schema.xml index 34e1b9939e7..adf31360078 100755 --- a/solr/server/solr/configsets/data_driven_schema_configs/conf/schema.xml +++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/schema.xml @@ -243,6 +243,7 @@ single-valued and either required or have a default value. --> + diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml index 7ac258669a5..6b22e715085 100755 --- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml +++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml @@ -912,12 +912,8 @@ class="solr.extraction.ExtractingRequestHandler" > true - ignored_ - - - true - links - ignored_ + ignored_ + _text @@ -1431,7 +1427,7 @@ - text_general + strings java.lang.Boolean booleans