From: Dennis Schafroth Date: Tue, 3 Sep 2013 11:20:52 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr X-Git-Tag: v0.6.0~6^2~17 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=2fee50349ff12f1b3d87ef3e695a9473a0efc943;hp=f3acc85266e90c92efd6cadf3cf14524ac6877f7;p=lui-solr.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr --- diff --git a/IDMETA b/IDMETA index dd2eca8..e7a7247 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ NAME=masterkey-lui-solr -VERSION=0.4.2 +VERSION=0.5.0 DEBIAN_DIST="squeeze wheezy" UBUNTU_DIST="" diff --git a/commit_solr.sh b/commit_solr.sh deleted file mode 100644 index 0cb3a43..0000000 --- a/commit_solr.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ "$1" == "" ] ; then - echo "No database id given" - exit 1 ; -fi -HOST=localhost -PORT=8080 -curl http://$HOST:$PORT/solr/update -H "Content-Type: text/xml" --data-binary '' \ No newline at end of file diff --git a/conf/schema.xml b/conf/schema.xml index 5317066..8cac78f 100644 --- a/conf/schema.xml +++ b/conf/schema.xml @@ -465,13 +465,14 @@ when adding a document. --> - + + + - + @@ -497,8 +498,8 @@ - - + + @@ -507,7 +508,7 @@ - + @@ -527,8 +528,8 @@ - - + + @@ -557,9 +558,10 @@ - --> + + diff --git a/conf/solrconfig-devl.xml b/conf/solrconfig-devl.xml index 22fa0bd..a828f63 100644 --- a/conf/solrconfig-devl.xml +++ b/conf/solrconfig-devl.xml @@ -29,27 +29,15 @@ have your own custom plugins. --> - - ${solr.abortOnConfigurationError:true} - - LUCENE_43 + --> + 4.4 - - - - - - - - - - - - ${solr.data.dir:/home/dennis/proj/lui-solr/data} + ${solr.data.dir:lui-solr4/collection1/data} + - + class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/> + + + - + - WARNING: See also the section below for parameters - that overfor Solr's main Lucene index. + + + - - - false - - 10 - - 32 - + + + + + + + + + + + - 10000 - 1000 - 10000 - + + 10 + 10 + + --> + + + - + - native - - - - - - - - - false - 32 - 10 + ${solr.lock.type:native} + + + + + + - 1 + - 0 + + - false + true + - + + + ${solr.ulog.dir:} + + - + + ${solr.autoSoftCommit.maxTime:-1} + + + - + - + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + - static firstSearcher warming in solrconfig.xml + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database @@ -575,7 +670,7 @@ Recommend values of 1-2 for read-only slaves, higher for masters w/o cache warming. --> - 10 + 2 @@ -585,17 +680,21 @@ This section contains instructions for how the SolrDispatchFilter should behave when processing requests for this SolrCore. - handleSelect affects the behavior of requests such as /select?qt=XXX + handleSelect is a legacy option that affects the behavior of requests + such as /select?qt=XXX handleSelect="true" will cause the SolrDispatchFilter to process - the request and will result in consistent error handling and - formatting for all types of requests. + the request and dispatch the query to a handler specified by the + "qt" param, assuming "/select" isn't already registered. handleSelect="false" will cause the SolrDispatchFilter to - ignore "/select" requests and fallback to using the legacy - SolrServlet and it's Solr 1.1 style error formatting + ignore "/select" requests, resulting in a 404 unless a handler + is explicitly registered with the name "/select" + + handleSelect="true" is not recommended for new users, but is the default + for backwards compatibility --> - + + multipartUploadLimitInKB="2048000" + formdataUploadLimitInKB="2048" + addHttpRequestToContext="false"/> - - - explicit - text - - false - - true - - 5 - true - - - spellcheck - + + + + explicit + 10 + text + + + + + + + + + + + + + + explicit + json + true + text + - - + + + true + json + true + + + + + 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 + text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename 3 - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - + on cat manu_exact + content_type + author_s ipod GB 1 cat,inStock + after price 0 600 50 - after + popularity + 0 + 10 + 3 manufacturedate_dt NOW/YEAR-10YEARS NOW @@ -770,34 +963,59 @@ before after - on - text features name + 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 + + - text true ignored_ @@ -850,6 +1058,7 @@ + - - search + solrpingquery + + all + + @@ -956,27 +1172,37 @@ - + + + - + - text + text_general + + + - solr.IndexBasedSpellChecker - text - text - true - ./spellchecker - + internal + + 0.5 + + 2 + + 1 + + 5 + + 4 + + 0.01 + - + + + + wordbreak + solr.WordBreakSolrSpellChecker + name + true + true + 10 + @@ -1067,9 +1319,8 @@ freq lowerfilt - spellcheckerFreq + solr.DirectSolrSpellChecker freq - true --> @@ -1099,9 +1350,22 @@ --> - false - false - 1 + text + + default + wordbreak + on + true + 10 + 5 + 5 + true + true + 10 + 5 spellcheck @@ -1121,8 +1385,9 @@ In reality you will likely want to add the component to your already specified request handlers. --> - + + text true @@ -1134,14 +1399,13 @@ http://wiki.apache.org/solr/ClusteringComponent - This relies on third party jars which are notincluded in the - release. To use this component (and the "/clustering" handler) - Those jars will need to be downloaded, and you'll need to set - the solr.cluster.enabled system property when running solr... + You'll need to set the solr.clustering.enabled system property + when running solr to run with clustering enabled: + + java -Dsolr.clustering.enabled=true -jar start.jar - java -Dsolr.clustering.enabled=true -jar start.jar --> - @@ -1149,8 +1413,8 @@ default - 20 - + @@ -1228,7 +1492,7 @@ edismax - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 *:* 10 @@ -1252,6 +1516,7 @@ true + false terms @@ -1277,6 +1542,7 @@ explicit + text elevator @@ -1330,13 +1596,17 @@ - + - + + + + ]]> + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + @@ -1395,7 +1686,47 @@ --> + + + + + + + + + + text/plain; charset=UTF-8 + + - + + + + + + + *:* - - - diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml index cb497bf..bb59a2c 100644 --- a/conf/solrconfig-master.xml +++ b/conf/solrconfig-master.xml @@ -29,27 +29,15 @@ have your own custom plugins. --> - - ${solr.abortOnConfigurationError:true} - - LUCENE_43 + --> + 4.4 - - - - - - - - - - - + - ${solr.data.dir:/var/lib/masterkey/lui/solr/master} + ${solr.data.dir:/var/lib/masterkey/lui/solr4/master} + - + class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/> + + + - + - WARNING: See also the section below for parameters - that overfor Solr's main Lucene index. + + + - - - false - - 10 - - 32 - + + + + + + + + + + + - 10000 - 1000 - 10000 - + + 10 + 10 + + --> + + + - + - native - - - - - - - - - false - 32 - 10 + ${solr.lock.type:native} + + + + + + - 1 + - 0 + + - false + true + - + + + ${solr.ulog.dir:} + + - + + ${solr.autoSoftCommit.maxTime:-1} + + + - + - + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + - static firstSearcher warming in solrconfig.xml + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database @@ -585,17 +681,21 @@ This section contains instructions for how the SolrDispatchFilter should behave when processing requests for this SolrCore. - handleSelect affects the behavior of requests such as /select?qt=XXX + handleSelect is a legacy option that affects the behavior of requests + such as /select?qt=XXX handleSelect="true" will cause the SolrDispatchFilter to process - the request and will result in consistent error handling and - formatting for all types of requests. + the request and dispatch the query to a handler specified by the + "qt" param, assuming "/select" isn't already registered. handleSelect="false" will cause the SolrDispatchFilter to - ignore "/select" requests and fallback to using the legacy - SolrServlet and it's Solr 1.1 style error formatting + ignore "/select" requests, resulting in a 404 unless a handler + is explicitly registered with the name "/select" + + handleSelect="true" is not recommended for new users, but is the default + for backwards compatibility --> - + + multipartUploadLimitInKB="2048000" + formdataUploadLimitInKB="2048" + addHttpRequestToContext="false"/> - - - explicit - text - - false - - true - - 5 - true - - - spellcheck - + + + + explicit + 10 + text + + + + + + + + + + + + + + explicit + json + true + text + - - + + + true + json + true + + + + + 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 + text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename 3 - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - + on cat manu_exact + content_type + author_s ipod GB 1 cat,inStock + after price 0 600 50 - after + popularity + 0 + 10 + 3 manufacturedate_dt NOW/YEAR-10YEARS NOW @@ -770,34 +964,59 @@ before after - on - text features name + 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 + + - text true ignored_ @@ -850,6 +1059,7 @@ + - - search + solrpingquery + + all + + @@ -956,30 +1173,37 @@ - + It is also necessary for SolrCloud to function (in Cloud mode, the + replication handler is used to bulk transfer segments when nodes + are added or need to recover). + https://wiki.apache.org/solr/SolrCloud/ + --> + + + - - - + --> + - + - text + text_general + + + - solr.IndexBasedSpellChecker - text - text - true - ./spellchecker - + internal + + 0.5 + + 2 + + 1 + + 5 + + 4 + + 0.01 + - + + + + wordbreak + solr.WordBreakSolrSpellChecker + name + true + true + 10 + @@ -1070,9 +1320,8 @@ freq lowerfilt - spellcheckerFreq + solr.DirectSolrSpellChecker freq - true --> @@ -1102,9 +1351,22 @@ --> - false - false - 1 + text + + default + wordbreak + on + true + 10 + 5 + 5 + true + true + 10 + 5 spellcheck @@ -1124,8 +1386,9 @@ In reality you will likely want to add the component to your already specified request handlers. --> - + + text true @@ -1137,14 +1400,13 @@ http://wiki.apache.org/solr/ClusteringComponent - This relies on third party jars which are notincluded in the - release. To use this component (and the "/clustering" handler) - Those jars will need to be downloaded, and you'll need to set - the solr.cluster.enabled system property when running solr... + You'll need to set the solr.clustering.enabled system property + when running solr to run with clustering enabled: + + java -Dsolr.clustering.enabled=true -jar start.jar - java -Dsolr.clustering.enabled=true -jar start.jar --> - @@ -1152,8 +1414,8 @@ default - 20 - + @@ -1231,7 +1493,7 @@ edismax - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 *:* 10 @@ -1255,6 +1517,7 @@ true + false terms @@ -1280,6 +1543,7 @@ explicit + text elevator @@ -1333,13 +1597,17 @@ - + - + + + + ]]> + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + @@ -1398,7 +1687,47 @@ --> + + + + + + + + + + + text/plain; charset=UTF-8 + + - + + + + + + + *:* - - - diff --git a/conf/solrconfig-prod.xml b/conf/solrconfig-prod.xml deleted file mode 100644 index fc978e7..0000000 --- a/conf/solrconfig-prod.xml +++ /dev/null @@ -1,1478 +0,0 @@ - - - - - - - - - ${solr.abortOnConfigurationError:true} - - - LUCENE_43 - - - - - - - - - - - - - - - - - ${solr.data.dir:/var/lib/masterkey/lui/solr/data} - - - - - - - - - false - - 10 - - 32 - - - - 10000 - 1000 - 10000 - - - - - - - - - native - - - - - - - - - false - 32 - 10 - - - false - - - true - - - - - 1 - - 0 - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1024 - - - - - - - - - - - - - - - - - - - - - - true - - - - - - 20 - - - 200 - - - - - - - - - - - - static firstSearcher warming in solrconfig.xml - - - - - - false - - - 2 - - - - - - - - - - - - - - - - - - - - - - explicit - text - - false - - true - - 5 - true - - - spellcheck - - - - - - - explicit - - - velocity - - browse - layout - Solritas - - edismax - *:* - 10 - *,score - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - text,features,name,sku,id,manu,cat - 3 - - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - - on - cat - manu_exact - ipod - GB - 1 - cat,inStock - price - 0 - 600 - 50 - after - manufacturedate_dt - NOW/YEAR-10YEARS - NOW - +1YEAR - before - after - - - - on - text features name - 0 - name - - - spellcheck - - - - - - - - - - - - - - - - - - - - - - - text - true - ignored_ - - - true - links - ignored_ - - - - - - - - - - - - - - - - - - - - - search - solrpingquery - all - - - - - - - explicit - true - - - - - - - - - - - - text - - - solr.IndexBasedSpellChecker - text - text - true - ./spellchecker - - - - - - - - - - - - - - - - - - false - false - 1 - - - spellcheck - - - - - - - - - - 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 - - - terms - - - - - - - - string - elevate.xml - - - - - - explicit - - - elevator - - - - - - - - - - - 100 - - - - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - ,]]> - ]]> - - - - - - - - - - - - - - - - - - 5 - - - - - - - - - - - - - *:* - - - - - - diff --git a/conf/solrconfig-slave.xml b/conf/solrconfig-slave.xml index dfcf2fa..2616aed 100644 --- a/conf/solrconfig-slave.xml +++ b/conf/solrconfig-slave.xml @@ -29,27 +29,15 @@ have your own custom plugins. --> - - ${solr.abortOnConfigurationError:true} - - LUCENE_43 + --> + 4.4 - - - - - - - - - - - + - ${solr.data.dir:/var/lib/masterkey/lui/solr/slave} + ${solr.data.dir:/var/lib/masterkey/lui/solr4/slave} + - + class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/> + + + - + - WARNING: See also the section below for parameters - that overfor Solr's main Lucene index. + + + - - - false - - 10 - - 32 - + + + + + + + + + + + - 10000 - 1000 - 10000 - + + 10 + 10 + + --> + + + - + - native - - - - - - - - - false - 32 - 10 + ${solr.lock.type:native} + + + + + + - 1 + - 0 + + - false + true + - + + + ${solr.ulog.dir:} + + - + + ${solr.autoSoftCommit.maxTime:-1} + + + - + - + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + - static firstSearcher warming in solrconfig.xml + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database @@ -585,17 +681,21 @@ This section contains instructions for how the SolrDispatchFilter should behave when processing requests for this SolrCore. - handleSelect affects the behavior of requests such as /select?qt=XXX + handleSelect is a legacy option that affects the behavior of requests + such as /select?qt=XXX handleSelect="true" will cause the SolrDispatchFilter to process - the request and will result in consistent error handling and - formatting for all types of requests. + the request and dispatch the query to a handler specified by the + "qt" param, assuming "/select" isn't already registered. handleSelect="false" will cause the SolrDispatchFilter to - ignore "/select" requests and fallback to using the legacy - SolrServlet and it's Solr 1.1 style error formatting + ignore "/select" requests, resulting in a 404 unless a handler + is explicitly registered with the name "/select" + + handleSelect="true" is not recommended for new users, but is the default + for backwards compatibility --> - + + multipartUploadLimitInKB="2048000" + formdataUploadLimitInKB="2048" + addHttpRequestToContext="false"/> - - - explicit - text - - false - - true - - 5 - true - - - spellcheck - + + + + explicit + 10 + text + + + + + + + + + + + + + + explicit + json + true + text + + + + + + + + true + json + true + - - 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 + text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename 3 - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - + on cat manu_exact + content_type + author_s ipod GB 1 cat,inStock + after price 0 600 50 - after + popularity + 0 + 10 + 3 manufacturedate_dt NOW/YEAR-10YEARS NOW @@ -770,34 +964,59 @@ before after - on - text features name + 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 + + - text true ignored_ @@ -850,6 +1059,7 @@ + - - search + solrpingquery + + all + + @@ -956,29 +1173,37 @@ + It is also necessary for SolrCloud to function (in Cloud mode, the + replication handler is used to bulk transfer segments when nodes + are added or need to recover). - - + + + + --> + + - + - text + text_general + + + - solr.IndexBasedSpellChecker - text - text - true - ./spellchecker - + internal + + 0.5 + + 2 + + 1 + + 5 + + 4 + + 0.01 + - + + + + wordbreak + solr.WordBreakSolrSpellChecker + name + true + true + 10 + @@ -1069,9 +1320,8 @@ freq lowerfilt - spellcheckerFreq + solr.DirectSolrSpellChecker freq - true --> @@ -1101,9 +1351,22 @@ --> - false - false - 1 + text + + default + wordbreak + on + true + 10 + 5 + 5 + true + true + 10 + 5 spellcheck @@ -1123,8 +1386,9 @@ In reality you will likely want to add the component to your already specified request handlers. --> - + + text true @@ -1136,14 +1400,13 @@ http://wiki.apache.org/solr/ClusteringComponent - This relies on third party jars which are notincluded in the - release. To use this component (and the "/clustering" handler) - Those jars will need to be downloaded, and you'll need to set - the solr.cluster.enabled system property when running solr... + You'll need to set the solr.clustering.enabled system property + when running solr to run with clustering enabled: + + java -Dsolr.clustering.enabled=true -jar start.jar - java -Dsolr.clustering.enabled=true -jar start.jar --> - @@ -1151,8 +1414,8 @@ default - 20 - + @@ -1230,7 +1493,7 @@ edismax - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 *:* 10 @@ -1254,6 +1517,7 @@ true + false terms @@ -1279,6 +1543,7 @@ explicit + text elevator @@ -1332,13 +1597,17 @@ - + - + + + + ]]> + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + @@ -1397,7 +1687,47 @@ --> + + + + + + + + + + + text/plain; charset=UTF-8 + + - + + + + + + + *:* - - - diff --git a/conf/solrconfig.xml b/conf/solrconfig.xml deleted file mode 120000 index 4ef2084..0000000 --- a/conf/solrconfig.xml +++ /dev/null @@ -1 +0,0 @@ -solrconfig-devl.xml \ No newline at end of file diff --git a/conf3/mapping-ISOLatin1Accent.txt b/conf3/mapping-ISOLatin1Accent.txt new file mode 100644 index 0000000..ede7742 --- /dev/null +++ b/conf3/mapping-ISOLatin1Accent.txt @@ -0,0 +1,246 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Syntax: +# "source" => "target" +# "source".length() > 0 (source cannot be empty.) +# "target".length() >= 0 (target can be empty.) + +# example: +# "À" => "A" +# "\u00C0" => "A" +# "\u00C0" => "\u0041" +# "ß" => "ss" +# "\t" => " " +# "\n" => "" + +# À => A +"\u00C0" => "A" + +# Á => A +"\u00C1" => "A" + +#  => A +"\u00C2" => "A" + +# à => A +"\u00C3" => "A" + +# Ä => A +"\u00C4" => "A" + +# Å => A +"\u00C5" => "A" + +# Æ => AE +"\u00C6" => "AE" + +# Ç => C +"\u00C7" => "C" + +# È => E +"\u00C8" => "E" + +# É => E +"\u00C9" => "E" + +# Ê => E +"\u00CA" => "E" + +# Ë => E +"\u00CB" => "E" + +# Ì => I +"\u00CC" => "I" + +# Í => I +"\u00CD" => "I" + +# Î => I +"\u00CE" => "I" + +# Ï => I +"\u00CF" => "I" + +# IJ => IJ +"\u0132" => "IJ" + +# Ð => D +"\u00D0" => "D" + +# Ñ => N +"\u00D1" => "N" + +# Ò => O +"\u00D2" => "O" + +# Ó => O +"\u00D3" => "O" + +# Ô => O +"\u00D4" => "O" + +# Õ => O +"\u00D5" => "O" + +# Ö => O +"\u00D6" => "O" + +# Ø => O +"\u00D8" => "O" + +# Œ => OE +"\u0152" => "OE" + +# Þ +"\u00DE" => "TH" + +# Ù => U +"\u00D9" => "U" + +# Ú => U +"\u00DA" => "U" + +# Û => U +"\u00DB" => "U" + +# Ü => U +"\u00DC" => "U" + +# Ý => Y +"\u00DD" => "Y" + +# Ÿ => Y +"\u0178" => "Y" + +# à => a +"\u00E0" => "a" + +# á => a +"\u00E1" => "a" + +# â => a +"\u00E2" => "a" + +# ã => a +"\u00E3" => "a" + +# ä => a +"\u00E4" => "a" + +# å => a +"\u00E5" => "a" + +# æ => ae +"\u00E6" => "ae" + +# ç => c +"\u00E7" => "c" + +# è => e +"\u00E8" => "e" + +# é => e +"\u00E9" => "e" + +# ê => e +"\u00EA" => "e" + +# ë => e +"\u00EB" => "e" + +# ì => i +"\u00EC" => "i" + +# í => i +"\u00ED" => "i" + +# î => i +"\u00EE" => "i" + +# ï => i +"\u00EF" => "i" + +# ij => ij +"\u0133" => "ij" + +# ð => d +"\u00F0" => "d" + +# ñ => n +"\u00F1" => "n" + +# ò => o +"\u00F2" => "o" + +# ó => o +"\u00F3" => "o" + +# ô => o +"\u00F4" => "o" + +# õ => o +"\u00F5" => "o" + +# ö => o +"\u00F6" => "o" + +# ø => o +"\u00F8" => "o" + +# œ => oe +"\u0153" => "oe" + +# ß => ss +"\u00DF" => "ss" + +# þ => th +"\u00FE" => "th" + +# ù => u +"\u00F9" => "u" + +# ú => u +"\u00FA" => "u" + +# û => u +"\u00FB" => "u" + +# ü => u +"\u00FC" => "u" + +# ý => y +"\u00FD" => "y" + +# ÿ => y +"\u00FF" => "y" + +# ff => ff +"\uFB00" => "ff" + +# fi => fi +"\uFB01" => "fi" + +# fl => fl +"\uFB02" => "fl" + +# ffi => ffi +"\uFB03" => "ffi" + +# ffl => ffl +"\uFB04" => "ffl" + +# ſt => ft +"\uFB05" => "ft" + +# st => st +"\uFB06" => "st" diff --git a/conf3/protwords.txt b/conf3/protwords.txt new file mode 100644 index 0000000..1dfc0ab --- /dev/null +++ b/conf3/protwords.txt @@ -0,0 +1,21 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# Use a protected word file to protect against the stemmer reducing two +# unrelated words to the same base word. + +# Some non-words that normally won't be encountered, +# just to test that they won't be stemmed. +dontstems +zwhacky + diff --git a/conf3/schema.xml b/conf3/schema.xml new file mode 100644 index 0000000..fd85cfa --- /dev/null +++ b/conf3/schema.xml @@ -0,0 +1,663 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + text + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf3/solrconfig-devl.xml b/conf3/solrconfig-devl.xml new file mode 100644 index 0000000..c2f2566 --- /dev/null +++ b/conf3/solrconfig-devl.xml @@ -0,0 +1,1478 @@ + + + + + + + + + ${solr.abortOnConfigurationError:true} + + + LUCENE_33 + + + + + + + + + + + + + + + + + ${solr.data.dir:/home/dennis/proj/lui-solr/data} + + + + + + + + + false + + 10 + + 32 + + + + 10000 + 1000 + 10000 + + + + + + + + + native + + + + + + + + + false + 32 + 10 + + + false + + + true + + + + + 1 + + 0 + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + 10 + + + + + + + + + + + + + + + + + + + + + + explicit + text + + false + + true + + 5 + true + + + spellcheck + + + + + + + explicit + + + velocity + + browse + layout + Solritas + + edismax + *:* + 10 + *,score + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + text,features,name,sku,id,manu,cat + 3 + + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + + on + cat + manu_exact + ipod + GB + 1 + cat,inStock + price + 0 + 600 + 50 + after + manufacturedate_dt + NOW/YEAR-10YEARS + NOW + +1YEAR + before + after + + + + on + text features name + 0 + name + + + spellcheck + + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + + + + + search + solrpingquery + all + + + + + + + explicit + true + + + + + + + + + + + + text + + + solr.IndexBasedSpellChecker + text + text + true + ./spellchecker + + + + + + + + + + + + + + + + + + false + false + 1 + + + spellcheck + + + + + + + + + + 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 + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + *:* + + + + + + diff --git a/conf3/solrconfig-master.xml b/conf3/solrconfig-master.xml new file mode 100644 index 0000000..a150e3e --- /dev/null +++ b/conf3/solrconfig-master.xml @@ -0,0 +1,1481 @@ + + + + + + + + + ${solr.abortOnConfigurationError:true} + + + LUCENE_33 + + + + + + + + + + + + + + + + + ${solr.data.dir:/var/lib/masterkey/lui/solr/master} + + + + + + + + + false + + 10 + + 32 + + + + 10000 + 1000 + 10000 + + + + + + + + + native + + + + + + + + + false + 32 + 10 + + + false + + + true + + + + + 1 + + 0 + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + 2 + + + + + + + + + + + + + + + + + + + + + + explicit + text + + false + + true + + 5 + true + + + spellcheck + + + + + + + explicit + + + velocity + + browse + layout + Solritas + + edismax + *:* + 10 + *,score + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + text,features,name,sku,id,manu,cat + 3 + + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + + on + cat + manu_exact + ipod + GB + 1 + cat,inStock + price + 0 + 600 + 50 + after + manufacturedate_dt + NOW/YEAR-10YEARS + NOW + +1YEAR + before + after + + + + on + text features name + 0 + name + + + spellcheck + + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + + + + + search + solrpingquery + all + + + + + + + explicit + true + + + + + + + + commit + startup + schema.xml,stopwords.txt + + + + + + + + + + + + text + + + solr.IndexBasedSpellChecker + text + text + true + ./spellchecker + + + + + + + + + + + + + + + + + + false + false + 1 + + + spellcheck + + + + + + + + + + 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 + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + *:* + + + + + + diff --git a/conf3/solrconfig-prod.xml b/conf3/solrconfig-prod.xml new file mode 100644 index 0000000..00e4214 --- /dev/null +++ b/conf3/solrconfig-prod.xml @@ -0,0 +1,1478 @@ + + + + + + + + + ${solr.abortOnConfigurationError:true} + + + LUCENE_33 + + + + + + + + + + + + + + + + + ${solr.data.dir:/var/lib/masterkey/lui/solr/data} + + + + + + + + + false + + 10 + + 32 + + + + 10000 + 1000 + 10000 + + + + + + + + + native + + + + + + + + + false + 32 + 10 + + + false + + + true + + + + + 1 + + 0 + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + 2 + + + + + + + + + + + + + + + + + + + + + + explicit + text + + false + + true + + 5 + true + + + spellcheck + + + + + + + explicit + + + velocity + + browse + layout + Solritas + + edismax + *:* + 10 + *,score + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + text,features,name,sku,id,manu,cat + 3 + + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + + on + cat + manu_exact + ipod + GB + 1 + cat,inStock + price + 0 + 600 + 50 + after + manufacturedate_dt + NOW/YEAR-10YEARS + NOW + +1YEAR + before + after + + + + on + text features name + 0 + name + + + spellcheck + + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + + + + + search + solrpingquery + all + + + + + + + explicit + true + + + + + + + + + + + + text + + + solr.IndexBasedSpellChecker + text + text + true + ./spellchecker + + + + + + + + + + + + + + + + + + false + false + 1 + + + spellcheck + + + + + + + + + + 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 + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + *:* + + + + + + diff --git a/conf3/solrconfig-slave.xml b/conf3/solrconfig-slave.xml new file mode 100644 index 0000000..74db562 --- /dev/null +++ b/conf3/solrconfig-slave.xml @@ -0,0 +1,1480 @@ + + + + + + + + + ${solr.abortOnConfigurationError:true} + + + LUCENE_33 + + + + + + + + + + + + + + + + + ${solr.data.dir:/var/lib/masterkey/lui/solr/slave} + + + + + + + + + false + + 10 + + 32 + + + + 10000 + 1000 + 10000 + + + + + + + + + native + + + + + + + + + false + 32 + 10 + + + false + + + true + + + + + 1 + + 0 + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + 2 + + + + + + + + + + + + + + + + + + + + + + explicit + text + + false + + true + + 5 + true + + + spellcheck + + + + + + + explicit + + + velocity + + browse + layout + Solritas + + edismax + *:* + 10 + *,score + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + text,features,name,sku,id,manu,cat + 3 + + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + + on + cat + manu_exact + ipod + GB + 1 + cat,inStock + price + 0 + 600 + 50 + after + manufacturedate_dt + NOW/YEAR-10YEARS + NOW + +1YEAR + before + after + + + + on + text features name + 0 + name + + + spellcheck + + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + + + + + search + solrpingquery + all + + + + + + + explicit + true + + + + + + + + + http://localhost:8983/solr/replication + 00:00:60 + + + + + + + + + + text + + + solr.IndexBasedSpellChecker + text + text + true + ./spellchecker + + + + + + + + + + + + + + + + + + false + false + 1 + + + spellcheck + + + + + + + + + + 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 + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + *:* + + + + + + diff --git a/conf3/spellings.txt b/conf3/spellings.txt new file mode 100644 index 0000000..d7ede6f --- /dev/null +++ b/conf3/spellings.txt @@ -0,0 +1,2 @@ +pizza +history \ No newline at end of file diff --git a/conf3/stopwords.txt b/conf3/stopwords.txt new file mode 100644 index 0000000..b5824da --- /dev/null +++ b/conf3/stopwords.txt @@ -0,0 +1,58 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# a couple of test stopwords to test that the words are really being +# configured from this file: +stopworda +stopwordb + +#Standard english stop words taken from Lucene's StopAnalyzer +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with + diff --git a/conf3/synonyms.txt b/conf3/synonyms.txt new file mode 100644 index 0000000..b0e31cb --- /dev/null +++ b/conf3/synonyms.txt @@ -0,0 +1,31 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +#some test synonym mappings unlikely to appear in real input text +aaa => aaaa +bbb => bbbb1 bbbb2 +ccc => cccc1,cccc2 +a\=>a => b\=>b +a\,a => b\,b +fooaaa,baraaa,bazaaa + +# Some synonym groups specific to this example +GB,gib,gigabyte,gigabytes +MB,mib,megabyte,megabytes +Television, Televisions, TV, TVs +#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming +#after us won't split it into two words. + +# Synonym mappings can be used for spelling correction too +pixima => pixma + diff --git a/debian/changelog b/debian/changelog index b1ef286..93f27e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,63 @@ +masterkey-lui-solr (0.5.0-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Tue, 20 Aug 2013 16:13:02 +0200 + +masterkey-lui-solr (0.4.11-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Mon, 19 Aug 2013 13:26:40 +0200 + +masterkey-lui-solr (0.4.10-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Mon, 19 Aug 2013 12:51:14 +0200 + +masterkey-lui-solr (0.4.9-indexdata1) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Thu, 15 Aug 2013 23:45:05 +0200 + +masterkey-lui-solr (0.4.8-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Thu, 15 Aug 2013 18:17:57 +0200 + +masterkey-lui-solr (0.4.7-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Thu, 15 Aug 2013 13:19:23 +0200 + +masterkey-lui-solr (0.4.6-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Wed, 17 Jul 2013 15:07:41 +0200 + +masterkey-lui-solr (0.4.5-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Wed, 03 Jul 2013 08:44:52 +0200 + +masterkey-lui-solr (0.4.4-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Wed, 03 Jul 2013 00:13:10 +0200 + +masterkey-lui-solr (0.4.3-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Tue, 02 Jul 2013 21:51:02 +0200 + masterkey-lui-solr (0.4.2-1indexdata) unstable; urgency=low * Upstream diff --git a/debian/control b/debian/control index 0fe08d5..a2ea578 100644 --- a/debian/control +++ b/debian/control @@ -2,67 +2,43 @@ Source: masterkey-lui-solr Section: misc Priority: extra Maintainer: dennis -Build-Depends: debhelper (>= 5), default-jdk, maven2, unzip +Build-Depends: debhelper (>= 5), openjdk-6-jdk, maven2, unzip Standards-Version: 3.8.0 Homepage: http://www.indexdata.dk/masterkey/harvester -Package: masterkey-lui-solr-common -Architecture: all -Depends: -Description: The Solr Web Application in war format. - The Solr Web Application is a Web service for indexing. - Package: masterkey-lui-solr4-common Architecture: all Depends: Description: The Solr Web Application in war format. The Solr 4 Web Application is a Web service for indexing. -Package: masterkey-lui-solr-master -Architecture: all -Depends: masterkey-lui-solr-common -Description: Local Unified Index (Solr) - The Local Unified Index is a index that contains multiple logical indexes (subdatabases). The underlying index is a Solr/lucene index configured to use a specific LUI schema. - Package: masterkey-lui-solr4-master Architecture: all Depends: masterkey-lui-solr4-common Description: Local Unified Index (Solr) The Local Unified Index is a index that contains multiple logical indexes (subdatabases). The underlying index is a Solr/lucene index configured to use a specific LUI schema. -Package: masterkey-lui-solr-slave -Architecture: all -Depends: masterkey-lui-solr-common -Description: Local Unified Index (Solr) - The Local Unified Index is a index that contains multiple logical indexes (subdatabases). The underlying index is a Solr/lucene index configured to use a specific LUI schema. This has configuration for being a slave replicated for a master - Package: masterkey-lui-solr4-slave Architecture: all Depends: masterkey-lui-solr4-common Description: Local Unified Index (Solr) The Local Unified Index is a index that contains multiple logical indexes (subdatabases). The underlying index is a Solr/lucene index configured to use a specific LUI schema. This has configuration for being a slave replicated for a master -Package: masterkey-lui-solr-master-tomcat6 +Package: masterkey-lui-solr4-common-tomcat6 Architecture: all -Depends: tomcat6, masterkey-lui-solr-master -Description: Local Unified Index Solr Tomcat 6 integration for a LUI master - The LUI is part of the MasterKey suite. This package provides Tomcat 6 integration. +Depends:tomcat6,masterkey-lui-solr4-common +Description: The Solr Web Application in war format. + The common logging library installed under tomcat6 Package: masterkey-lui-solr4-master-tomcat6 Architecture: all -Depends: tomcat6, masterkey-lui-solr4-master -Description: Local Unified Index Solr Tomcat 6 integration for a LUI master - The LUI is part of the MasterKey suite. This package provides Tomcat 6 integration. - -Package: masterkey-lui-solr-slave-tomcat6 -Architecture: all -Depends: tomcat6,masterkey-lui-solr-slave +Depends: tomcat6, masterkey-lui-solr4-master,masterkey-lui-solr4-common-tomcat6 Description: Local Unified Index Solr Tomcat 6 integration for a LUI master The LUI is part of the MasterKey suite. This package provides Tomcat 6 integration. Package: masterkey-lui-solr4-slave-tomcat6 Architecture: all -Depends: tomcat6,masterkey-lui-solr4-slave +Depends: tomcat6,masterkey-lui-solr4-slave,masterkey-lui-solr4-common-tomcat6 Description: Local Unified Index Solr Tomcat 6 integration for a LUI master The LUI is part of the MasterKey suite. This package provides Tomcat 6 integration. diff --git a/debian/rules b/debian/rules index e9e9fec..4c7d85d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,80 +1,48 @@ #!/usr/bin/make -f # debian/rules for alien -BASE=masterkey-lui-solr +BASE=masterkey-lui-solr4 BASE_MASTER=$(BASE)-master BASE_MASTER_TOMCAT=$(BASE_MASTER)-tomcat BASE_SLAVE=$(BASE)-slave BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat -BASE4=$(BASE)4 -BASE4_TOMCAT=$(BASE4)-tomcat -BASE4_SLAVE=$(BASE4)-slave -BASE4_SLAVE_TOMCAT=$(BASE4_SLAVE)-tomcat - DOC = /usr/share/doc/masterkey LOG = /var/log/masterkey -SHARE = /usr/share/masterkey/lui/solr -SHARE4 = /usr/share/masterkey/lui/solr4 - -CONF_MASTER = $(SHARE)/master -CONF_SLAVE = $(SHARE)/slave +SHARE = /usr/share/masterkey/lui/solr4 -CONF4_MASTER = $(SHARE4)/master -CONF4_SLAVE = $(SHARE4)/slave +CONF_MASTER = $(SHARE)/master/collection1/ +CONF_SLAVE = $(SHARE)/slave/collection1/ -DATA = /var/lib/masterkey/lui/solr +DATA = /var/lib/masterkey/lui/solr4 DATA_MASTER = $(DATA)/master DATA_SLAVE = $(DATA)/slave -DATA4 = /var/lib/masterkey/lui/solr4 -DATA4_MASTER = $(DATA4)/master -DATA4_SLAVE = $(DATA4)/slave - LUI_SOLR_COMMON = $(BASE)-common LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON) LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war -LUI_SOLR4_COMMON = $(BASE4)-common -LUI_SOLR4_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_COMMON) -LUI_SOLR4_COMMON_DIR = $(LUI_SOLR4_COMMON_ROOT)$(SHARE)/war - LUI_SOLR_MASTER = $(BASE)-master LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER) LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER) LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER) -LUI_SOLR4_MASTER = $(BASE4)-master -LUI_SOLR4_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_MASTER) -LUI_SOLR4_MASTER_SHARE_DIR = $(LUI_SOLR4_MASTER_ROOT)$(CONF4_MASTER) -LUI_SOLR4_MASTER_LIB_DIR = $(LUI_SOLR4_MASTER_ROOT)$(DATA4_MASTER) +LUI_SOLR_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-tomcat6 +LUI_SOLR_COMMON_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT) - -LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat +LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat6 LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT) -LUI_SOLR4_MASTER_TOMCAT = $(LUI_SOLR4_MASTER)-tomcat -LUI_SOLR4_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_MASTER_TOMCAT) - LUI_SOLR_SLAVE = $(BASE)-slave LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_SLAVE) LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE) LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE) -LUI_SOLR4_SLAVE = $(BASE4)-slave -LUI_SOLR4_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_SLAVE) -LUI_SOLR4_SLAVE_SHARE_DIR = $(LUI_SOLR4_SLAVE_ROOT)$(CONF4_SLAVE) -LUI_SOLR4_SLAVE_LIB_DIR = $(LUI_SOLR4_SLAVE_ROOT)$(DATA4_SLAVE) - -LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat +LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat6 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT) - -LUI_SOLR4_SLAVE_TOMCAT = $(LUI_SOLR4_SLAVE)-tomcat -LUI_SOLR4_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT) - -SOLR_VERSION=3.6.1 -SOLR4_VERSION=4.3.1 +CATALINA_HOME=/usr/share/tomcat6 +SOLR_VERSION=4.4.0 PACKAGE=$(shell dh_listpackages) @@ -95,11 +63,8 @@ install-stamp: build # lui-solr-common. Install a Solr WAR. mkdir -p $(LUI_SOLR_COMMON_DIR) - cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR) - - # lui-solr4-common. Install a Solr WAR. - mkdir -p $(LUI_SOLR4_COMMON_DIR) - cp dist/apache-solr-$(SOLR4_VERSION).war -d $(LUI_SOLR4_COMMON_DIR) + cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR) + cp -rp scripts $(LUI_SOLR_COMMON_DIR) # lui-solr-master mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR) @@ -107,39 +72,25 @@ install-stamp: build ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/solrconfig.xml mkdir -p $(LUI_SOLR_MASTER_LIB_DIR) - # lui-solr4-master - mkdir -p $(LUI_SOLR4_MASTER_SHARE_DIR) - cp -rp conf $(LUI_SOLR4_MASTER_SHARE_DIR) - ln -sf solrconfig-master.xml $(LUI_SOLR4_MASTER_SHARE_DIR)/solrconfig.xml - mkdir -p $(LUI_SOLR4_MASTER_LIB_DIR) - # lui-solr-slave Slave configuration mkdir -p $(LUI_SOLR_SLAVE_SHARE_DIR) cp -rp conf $(LUI_SOLR_SLAVE_SHARE_DIR) ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR) - # lui-solr4-slave Slave configuration - mkdir -p $(LUI_SOLR4_SLAVE_SHARE_DIR) - cp -rp conf $(LUI_SOLR4_SLAVE_SHARE_DIR) - ln -sf solrconfig-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/solrconfig.xml - mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR) + # Common lui-solr4-tomcat: Logging Libraries installed under tomcat6. + # Harvester Utilities. Stylesheet used in includes needs to be in CATALINA_HOME + mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib + cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME) + ls -la $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib/ # lui-solr-master plumbing for Tomcat 6. mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui - cp etc/solr-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml - - # lui-solr4-master plumbing for Tomcat 6. - mkdir -p $(LUI_SOLR4_MASTER_ROOT)/etc/masterkey/lui - cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR4_MASTER_ROOT)/etc/masterkey/lui/lui-solr4-master.xml + cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr4-master.xml # lui-solr-slave plumbing for Tomcat 6 mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui - cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml - - # lui-solr4-slave plumbing for Tomcat 6 - mkdir -p $(LUI_SOLR4_SLAVE_ROOT)/etc/masterkey/lui - cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml + cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml touch $@ diff --git a/delete_solr.sh b/delete_solr.sh deleted file mode 100755 index 2b91d65..0000000 --- a/delete_solr.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -if [ "$1" == "" ] ; then - echo "$0 databaseid [HOST:PORT] " - exit 1 ; -fi -HOSTPORT="localhost:8080" - -if [ "$2" != "" ] ; then - HOSTPORT="$2" -fi - -curl http://${HOSTPORT}/solr/update -H "Content-Type: text/xml" --data-binary "database:$1" -curl http://${HOSTPORT}/solr/update -H "Content-Type: text/xml" --data-binary '' diff --git a/dist/apache-solr-3.3.0.war b/dist/apache-solr-3.3.0.war deleted file mode 100644 index 6a3d291..0000000 Binary files a/dist/apache-solr-3.3.0.war and /dev/null differ diff --git a/dist/apache-solr-3.6.1.war b/dist/apache-solr-3.6.1.war deleted file mode 100644 index 2ee6bbe..0000000 Binary files a/dist/apache-solr-3.6.1.war and /dev/null differ diff --git a/dist/solr-4.4.0.war b/dist/solr-4.4.0.war new file mode 100644 index 0000000..15ceec5 Binary files /dev/null and b/dist/solr-4.4.0.war differ diff --git a/etc/solr-devl.xml b/etc/solr-devl.xml deleted file mode 100644 index 3f3c297..0000000 --- a/etc/solr-devl.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/etc/solr-tomcat-context-master.xml b/etc/solr-tomcat-context-master.xml deleted file mode 100644 index c161dbf..0000000 --- a/etc/solr-tomcat-context-master.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/etc/solr-tomcat-context-slave.xml b/etc/solr-tomcat-context-slave.xml deleted file mode 100644 index d8c3f7b..0000000 --- a/etc/solr-tomcat-context-slave.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/etc/solr-tomcat-context.xml b/etc/solr-tomcat-context.xml deleted file mode 100644 index d009dd3..0000000 --- a/etc/solr-tomcat-context.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/etc/solr4-devl.xml b/etc/solr4-devl.xml index cb8a3c5..d546a3d 100644 --- a/etc/solr4-devl.xml +++ b/etc/solr4-devl.xml @@ -1,7 +1,6 @@ - + diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml index 29e441c..c2b52f3 100644 --- a/etc/solr4-tomcat-context-master.xml +++ b/etc/solr4-tomcat-context-master.xml @@ -1,6 +1,6 @@ diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml index 1599bb4..de2b171 100644 --- a/etc/solr4-tomcat-context-slave.xml +++ b/etc/solr4-tomcat-context-slave.xml @@ -1,6 +1,6 @@ diff --git a/lib/jcl-over-slf4j-1.6.6.jar b/lib/jcl-over-slf4j-1.6.6.jar new file mode 100644 index 0000000..ab898c0 Binary files /dev/null and b/lib/jcl-over-slf4j-1.6.6.jar differ diff --git a/lib/jul-to-slf4j-1.6.6.jar b/lib/jul-to-slf4j-1.6.6.jar new file mode 100644 index 0000000..fa8640f Binary files /dev/null and b/lib/jul-to-slf4j-1.6.6.jar differ diff --git a/lib/log4j-1.2.16.jar b/lib/log4j-1.2.16.jar new file mode 100644 index 0000000..5429a90 Binary files /dev/null and b/lib/log4j-1.2.16.jar differ diff --git a/lib/log4j.properties b/lib/log4j.properties new file mode 100644 index 0000000..93dc62a --- /dev/null +++ b/lib/log4j.properties @@ -0,0 +1,19 @@ +# Logging level +log4j.rootLogger=INFO, file, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender + +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x \u2013 %m%n + +#- size rotation with log cleanup. +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.MaxFileSize=4MB +log4j.appender.file.MaxBackupIndex=9 + +#- File to log to and log format +log4j.appender.file.File=logs/solr.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n + +log4j.logger.org.apache.zookeeper=WARN \ No newline at end of file diff --git a/lib/slf4j-api-1.6.6.jar b/lib/slf4j-api-1.6.6.jar new file mode 100644 index 0000000..4c03fa6 Binary files /dev/null and b/lib/slf4j-api-1.6.6.jar differ diff --git a/lib/slf4j-log4j12-1.6.6.jar b/lib/slf4j-log4j12-1.6.6.jar new file mode 100644 index 0000000..e72c2d6 Binary files /dev/null and b/lib/slf4j-log4j12-1.6.6.jar differ diff --git a/optimize_solr.sh b/optimize_solr.sh deleted file mode 100755 index 90d9a26..0000000 --- a/optimize_solr.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ "$1" != "YES" ] ; then - echo "No confirmation given" - exit 1 ; -fi -HOST=localhost -PORT=8080 -curl http://$HOST:$PORT/solr/update -H "Content-Type: text/xml" --data-binary '' \ No newline at end of file diff --git a/scripts/commit_solr.sh b/scripts/commit_solr.sh new file mode 100644 index 0000000..df587ab --- /dev/null +++ b/scripts/commit_solr.sh @@ -0,0 +1,17 @@ +#!/bin/bash +HOST_PORT=localhost:8080 + +if [ "$2" != "" ] ; then + HOST_PORT="$2" +fi + +SOLR_PATH=solr4 +if [ "$2" != "" ] ; then + SOLR_PATH="$2" +fi + +if [ "$1" == "-h" ] ; then + echo "$0 [[HOST:PORT] SOLR_PATH] (default $HOST_PORT/$SOLR_PATH)" +fi + +curl http://$HOST:$PORT/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '' \ No newline at end of file diff --git a/scripts/delete_solr.sh b/scripts/delete_solr.sh new file mode 100755 index 0000000..6c51408 --- /dev/null +++ b/scripts/delete_solr.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +HOST_PORT="localhost:8080" + +if [ "$2" != "" ] ; then + HOST_PORT="$2" +fi + +SOLR_PATH=solr4 +if [ "$3" != "" ] ; then + SOLR_PATH="$3" +fi + +if [ "$1" == "" ] ; then + echo "$0 databaseid [[HOST:PORT] PATH] (default $HOST_PORT/$PATH)" + exit 1 ; +fi + +curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary "database:$1" +curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '' diff --git a/scripts/optimize_solr.sh b/scripts/optimize_solr.sh new file mode 100755 index 0000000..83e4219 --- /dev/null +++ b/scripts/optimize_solr.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +HOST_PORT=localhost:8080 + +if [ "$2" != "" ] ; then + HOST_PORT="$2" +fi + +SOLR_PATH=solr4 +if [ "$3" != "" ] ; then + SOLR_PATH="$3" +fi + +if [ "$1" != "YES" ] ; then + echo "$0 YES [[HOST:PORT] SOLR_PATH] (default $HOST_PORT/$SOLR_PATH)" + exit 1 ; +fi + + +curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '' diff --git a/scripts/zookeeper.sh b/scripts/zookeeper.sh new file mode 100644 index 0000000..36ea6bb --- /dev/null +++ b/scripts/zookeeper.sh @@ -0,0 +1,8 @@ +cd example +java -Dbootstrap_confdir=./solr/collection1/conf -Dcollection.configName=myconf -DzkRun -DzkHost=localhost:9983,localhost:8574,localhost:9900 -DnumShards=2 -jar start.jar > solr.log & +cd ../example2 +java -Djetty.port=7574 -DzkRun -DzkHost=localhost:9983,localhost:8574,localhost:9900 -jar start.jar > solr.log & +cd ../exampleB +java -Djetty.port=8900 -DzkRun -DzkHost=localhost:9983,localhost:8574,localhost:9900 -jar start.jar > solr.log & +cd ../example2B +java -Djetty.port=7500 -DzkHost=localhost:9983,localhost:8574,localhost:9900 -jar start.jar > solr.log & \ No newline at end of file