From dbd01a6924b459410829a2d16e13e3a147492276 Mon Sep 17 00:00:00 2001 From: Wayne Schneider Date: Thu, 30 Jun 2016 15:34:16 -0500 Subject: [PATCH] Configuration cleanup for Solr 5 - mostly cleaning up solrconfig.xml --- conf/admin-extra.html | 17 +- conf/admin-extra.menu-bottom.html | 25 + conf/admin-extra.menu-top.html | 25 + conf/elevate.xml | 36 - conf/schema.xml | 8 +- conf/solrconfig-devl.xml | 1837 ------------------------------------ conf/solrconfig-master.xml | 1863 ------------------------------------- conf/solrconfig-minimal.xml | 1813 ------------------------------------ conf/solrconfig-slave.xml | 1838 ------------------------------------ conf/solrconfig.xml | 262 ++++++ conf/spellings.txt | 2 - conf/xslt/example.xsl | 132 --- conf/xslt/example_atom.xsl | 67 -- conf/xslt/example_rss.xsl | 66 -- conf/xslt/luke.xsl | 337 ------- 15 files changed, 320 insertions(+), 8008 deletions(-) create mode 100644 conf/admin-extra.menu-bottom.html create mode 100644 conf/admin-extra.menu-top.html delete mode 100644 conf/elevate.xml delete mode 100644 conf/solrconfig-devl.xml delete mode 100644 conf/solrconfig-master.xml delete mode 100644 conf/solrconfig-minimal.xml delete mode 100644 conf/solrconfig-slave.xml create mode 100644 conf/solrconfig.xml delete mode 100644 conf/spellings.txt delete mode 100644 conf/xslt/example.xsl delete mode 100644 conf/xslt/example_atom.xsl delete mode 100644 conf/xslt/example_rss.xsl delete mode 100644 conf/xslt/luke.xsl diff --git a/conf/admin-extra.html b/conf/admin-extra.html index aa739da..fecab20 100644 --- a/conf/admin-extra.html +++ b/conf/admin-extra.html @@ -15,17 +15,10 @@ limitations under the License. --> - diff --git a/conf/admin-extra.menu-bottom.html b/conf/admin-extra.menu-bottom.html new file mode 100644 index 0000000..3359a46 --- /dev/null +++ b/conf/admin-extra.menu-bottom.html @@ -0,0 +1,25 @@ + + + + diff --git a/conf/admin-extra.menu-top.html b/conf/admin-extra.menu-top.html new file mode 100644 index 0000000..0886cee --- /dev/null +++ b/conf/admin-extra.menu-top.html @@ -0,0 +1,25 @@ + + + + diff --git a/conf/elevate.xml b/conf/elevate.xml deleted file mode 100644 index 7630ebe..0000000 --- a/conf/elevate.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/conf/schema.xml b/conf/schema.xml index 3fb78e7..9253610 100644 --- a/conf/schema.xml +++ b/conf/schema.xml @@ -9,7 +9,7 @@ --> - + @@ -151,9 +151,8 @@ - + - @@ -234,7 +233,7 @@ - @@ -260,7 +259,6 @@ - id diff --git a/conf/solrconfig-devl.xml b/conf/solrconfig-devl.xml deleted file mode 100644 index 4c847be..0000000 --- a/conf/solrconfig-devl.xml +++ /dev/null @@ -1,1837 +0,0 @@ - - - - - - - - - 4.4 - - - - - - - - - - - - - - - - - - - - - ${solr.data.dir:lui-solr4/collection1/data} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.lock.type:native} - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - ${solr.ulog.dir:} - - - - - ${solr.autoCommit.maxTime:15000} - false - - - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - - - - - - - - - - - 1024 - - - - - - - - - - - - - - - - - - - - - - true - - - - - - 20 - - - 200 - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - false - - - 2 - - - - - - - - - - - - - - - - - - - - - - - explicit - 10 - text - *,score - - - - - - - - - - - - - - explicit - json - true - text - - - - - - - - true - json - true - - - - - - - - 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 - - - - - - - - - - - - - - application/json - - - - - application/csv - - - - - - - true - ignored_ - - - true - links - ignored_ - - - - - - - - - - - - - - - - - - - - - - solrpingquery - - - all - - - - - - - - - explicit - true - - - - - - - - - - - - - - - - text_general - - - - - - default - text - solr.DirectSolrSpellChecker - - internal - - 0.5 - - 2 - - 1 - - 5 - - 4 - - 0.01 - - - - - - wordbreak - solr.WordBreakSolrSpellChecker - name - true - true - 10 - - - - - - - - - - - - - - - - text - - default - wordbreak - on - true - 10 - 5 - 5 - true - true - 10 - 5 - - - spellcheck - - - - - - - - - - text - true - - - tvComponent - - - - - - - - - default - - - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - - - 20 - - - clustering/carrot2 - - - ENGLISH - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - *:* - 10 - *,score - - - clustering - - - - - - - - - - true - false - - - terms - - - - - - - - string - elevate.xml - - - - - - explicit - text - - - elevator - - - - - - - - - - - 100 - - - - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - ,]]> - ]]> - - - - - - 10 - .,!? - - - - - - - WORD - - - en - US - - - - - - - - - - - - - - - - - - - - - - text/plain; charset=UTF-8 - - - - - - - - - 5 - - - - - - - - - - - - - - - - - - *:* - - - diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml deleted file mode 100644 index 23caef4..0000000 --- a/conf/solrconfig-master.xml +++ /dev/null @@ -1,1863 +0,0 @@ - - - - - - - - - 5.5 - - - - - - - - - - ${solr.data.dir:/var/lib/masterkey/lui/solr5/master} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.lock.type:native} - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - ${solr.ulog.dir:} - - - - - ${solr.autoCommit.maxTime:15000} - false - - - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - - - - - - - - - - - 1024 - - - - - - - - - - - - - - - - - - - - - - true - - - - - - 20 - - - 200 - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - false - - - 2 - - - - - - - - - - - - - - - - - - - - - - - explicit - 10 - text - *,score - AND - - - - - - - - - - - - - - explicit - json - true - text - AND - - - - - - - - true - json - true - - - - - - - - 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 - - - - - - - - - - cloneFields - - - - - - - - - - true - ignored_ - - - true - links - ignored_ - cloneFields - - - - - - - - - - - - - - - - - - - - - - solrpingquery - - - all - - - - - - - - - explicit - true - - - - - - - - - - - - - - - - text_general - - - - - - default - text - solr.DirectSolrSpellChecker - - internal - - 0.5 - - 2 - - 1 - - 5 - - 4 - - 0.01 - - - - - - wordbreak - solr.WordBreakSolrSpellChecker - name - true - true - 10 - - - - - - - - - - - - - - - - text - - default - wordbreak - on - true - 10 - 5 - 5 - true - true - 10 - 5 - - - spellcheck - - - - - - - - - - text - true - - - tvComponent - - - - - - - - - default - - - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - - - 20 - - - clustering/carrot2 - - - ENGLISH - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - *:* - 10 - *,score - - - clustering - - - - - - - - - - true - false - - - terms - - - - - - - - string - elevate.xml - - - - - - explicit - text - - - elevator - - - - - - - - - - - 100 - - - - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - ,]]> - ]]> - - - - - - 10 - .,!? - - - - - - - WORD - - - en - US - - - - - - - - - - - - - - - - - - - .* - - .*_binary$ - - - text - - - - - - - - - - - - text/plain; charset=UTF-8 - - - - - - - - - 5 - - - - - - - - - - - - - - - - - - *:* - - - diff --git a/conf/solrconfig-minimal.xml b/conf/solrconfig-minimal.xml deleted file mode 100644 index bc18706..0000000 --- a/conf/solrconfig-minimal.xml +++ /dev/null @@ -1,1813 +0,0 @@ - - - - - - - - - LUCENE_CURRENT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.lock.type:native} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.ulog.dir:} - - - - - 15000 - false - - - - - - - - - - - - - - - - - - - - - 1024 - - - - - - - - - - - - - - - - - - - - - - true - - - - - - 20 - - - 200 - - - - - - - true - - - 10 - - - - - - - - - - - - - - - - - - - - - - - explicit - 10 - - text - - - - - - - - - - - - - - explicit - json - true - text - - - - - - - - true - json - true - - - - - - - - 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 - - - - - - - - - - - - - - application/json - - - - - application/csv - - - - - - - true - ignored_ - - - true - links - ignored_ - - - - - - - - - - - - - - - - - - - - - - solrpingquery - - - all - - - - - - - - - explicit - true - - - - - - - - - - - - - - - - text_general - - - - - - default - text - solr.DirectSolrSpellChecker - - internal - - 0.5 - - 2 - - 1 - - 5 - - 4 - - 0.01 - - - - - - wordbreak - solr.WordBreakSolrSpellChecker - name - true - true - 10 - - - - - - - - - - - - - - - - text - - default - wordbreak - on - true - 10 - 5 - 5 - true - true - 10 - 5 - - - spellcheck - - - - - - - - - - text - true - - - tvComponent - - - - - - - - - default - - - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - - - 20 - - - clustering/carrot2 - - - ENGLISH - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - *:* - 10 - *,score - - - clustering - - - - - - - - - - true - false - - - terms - - - - - - - - string - elevate.xml - - - - - - explicit - text - - - elevator - - - - - - - - - - - 100 - - - - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - ,]]> - ]]> - - - - - - 10 - .,!? - - - - - - - WORD - - - en - US - - - - - - - - - - - - - - - - - - - - - - text/plain; charset=UTF-8 - - - - - - - - - 5 - - - - - - - - - - - - - - - - - - *:* - - - diff --git a/conf/solrconfig-slave.xml b/conf/solrconfig-slave.xml deleted file mode 100644 index 22cde8b..0000000 --- a/conf/solrconfig-slave.xml +++ /dev/null @@ -1,1838 +0,0 @@ - - - - - - - - - 4.4 - - - - - - - - - - ${solr.data.dir:/var/lib/masterkey/lui/solr4/slave} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.lock.type:native} - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - ${solr.ulog.dir:} - - - - - ${solr.autoCommit.maxTime:15000} - false - - - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - - - - - - - - - - - 1024 - - - - - - - - - - - - - - - - - - - - - - true - - - - - - 20 - - - 200 - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - false - - - 2 - - - - - - - - - - - - - - - - - - - - - - - explicit - 10 - text - *,score - - - - - - - - - - - - - - explicit - json - true - text - - - - - - - - true - json - true - - - - - - - - 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 - - - - - - - - - - - - - - application/json - - - - - application/csv - - - - - - - true - ignored_ - - - true - links - ignored_ - - - - - - - - - - - - - - - - - - - - - - solrpingquery - - - all - - - - - - - - - explicit - true - - - - - - - - - - - - - - - - text_general - - - - - - default - text - solr.DirectSolrSpellChecker - - internal - - 0.5 - - 2 - - 1 - - 5 - - 4 - - 0.01 - - - - - - wordbreak - solr.WordBreakSolrSpellChecker - name - true - true - 10 - - - - - - - - - - - - - - - - text - - default - wordbreak - on - true - 10 - 5 - 5 - true - true - 10 - 5 - - - spellcheck - - - - - - - - - - text - true - - - tvComponent - - - - - - - - - default - - - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - - - 20 - - - clustering/carrot2 - - - ENGLISH - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - edismax - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - *:* - 10 - *,score - - - clustering - - - - - - - - - - true - false - - - terms - - - - - - - - string - elevate.xml - - - - - - explicit - text - - - elevator - - - - - - - - - - - 100 - - - - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - ,]]> - ]]> - - - - - - 10 - .,!? - - - - - - - WORD - - - en - US - - - - - - - - - - - - - - - - - - - - - - text/plain; charset=UTF-8 - - - - - - - - - 5 - - - - - - - - - - - - - - - - - - *:* - - - diff --git a/conf/solrconfig.xml b/conf/solrconfig.xml new file mode 100644 index 0000000..40af584 --- /dev/null +++ b/conf/solrconfig.xml @@ -0,0 +1,262 @@ + + + + + 5.5.1 + ${solr.data.dir:/var/lib/masterkey/lui/solr5/master} + + + + + + + + ${solr.lock.type:native} + + true + + + + + + + + + + + ${solr.ulog.dir:} + + + + ${solr.autoCommit.maxTime:15000} + false + + + + ${solr.autoSoftCommit.maxTime:-1} + + + + + + + + 1024 + + + + + + + + true + 20 + 200 + + + + + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + + + + + + + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + + + + + false + 2 + + + + + + + + + + + + + + + + explicit + 10 + text + *,score + AND + + + + + + explicit + json + true + text + *,score + AND + + + + + + true + json + true + + + + + + {!xport} + xsort + false + + + + query + + + + + + + + clone-fields + + + + + + + + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + solrpingquery + + + all + + + + + + + explicit + true + + + + + + + commit + startup + schema.xml,stopwords.txt + + + + + + + + + .* + + .*_binary$ + + + text + + + + + + + + + + text/plain; charset=UTF-8 + + + + + *:* + + + diff --git a/conf/spellings.txt b/conf/spellings.txt deleted file mode 100644 index d7ede6f..0000000 --- a/conf/spellings.txt +++ /dev/null @@ -1,2 +0,0 @@ -pizza -history \ No newline at end of file diff --git a/conf/xslt/example.xsl b/conf/xslt/example.xsl deleted file mode 100644 index 6832a1d..0000000 --- a/conf/xslt/example.xsl +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - <xsl:value-of select="$title"/> - - - -

-
- This has been formatted by the sample "example.xsl" transform - - use your own XSLT to get a nicer page -
- - - -
- - - -
- - - - -
-
-
- - - - - - - - - - - - - - javascript:toggle("");? -
- - exp - - - - - -
- - -
- - - - - - - -
    - -
  • -
    -
- - -
- - - - - - - - - - - - - - - - - - - - -
diff --git a/conf/xslt/example_atom.xsl b/conf/xslt/example_atom.xsl deleted file mode 100644 index e1c7d5a..0000000 --- a/conf/xslt/example_atom.xsl +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - Example Solr Atom 1.0 Feed - - This has been formatted by the sample "example_atom.xsl" transform - - use your own XSLT to get a nicer Atom feed. - - - Apache Solr - solr-user@lucene.apache.org - - - - - - tag:localhost,2007:example - - - - - - - - - <xsl:value-of select="str[@name='name']"/> - - tag:localhost,2007: - - - - - - diff --git a/conf/xslt/example_rss.xsl b/conf/xslt/example_rss.xsl deleted file mode 100644 index 3e09e65..0000000 --- a/conf/xslt/example_rss.xsl +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - Example Solr RSS 2.0 Feed - http://localhost:8983/solr - - This has been formatted by the sample "example_rss.xsl" transform - - use your own XSLT to get a nicer RSS feed. - - en-us - http://localhost:8983/solr - - - - - - - - - - - <xsl:value-of select="str[@name='name']"/> - - http://localhost:8983/solr/select?q=id: - - - - - - - http://localhost:8983/solr/select?q=id: - - - - diff --git a/conf/xslt/luke.xsl b/conf/xslt/luke.xsl deleted file mode 100644 index 6e9a064..0000000 --- a/conf/xslt/luke.xsl +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - - Solr Luke Request Handler Response - - - - - - - - - <xsl:value-of select="$title"/> - - - - - -

- -

-
- -
- -

Index Statistics

- -
- -

Field Statistics

- - - -

Document statistics

- - - - -
- - - - - -
- -
- - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - -
-

- -

- -
- -
-
-
- - -
- - 50 - 800 - 160 - blue - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- background-color: ; width: px; height: px; -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
  • - -
  • -
    -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-- 1.7.10.4