From: Dennis Schafroth Date: Thu, 6 Mar 2014 08:12:37 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr X-Git-Tag: v0.8~8 X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=commitdiff_plain;h=1d2b5cf3ef6338cd28fae43a7a06b50d16ebb878;hp=a8c09bd06a96955482866a6790ab856a4ff22f63 Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr --- diff --git a/IDMETA b/IDMETA index 54884d0..96ad1da 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ NAME=masterkey-lui-solr -VERSION=0.6.1 +VERSION=0.6.2 DEBIAN_DIST="squeeze wheezy" UBUNTU_DIST="" diff --git a/conf/schema-minimal.xml b/conf/schema-minimal.xml new file mode 100644 index 0000000..97c7819 --- /dev/null +++ b/conf/schema-minimal.xml @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + text + + + + + + + + + diff --git a/conf/schema.xml b/conf/schema.xml index df61c5e..17a6ad2 100644 --- a/conf/schema.xml +++ b/conf/schema.xml @@ -499,7 +499,7 @@ - + @@ -529,7 +529,7 @@ - + diff --git a/conf/solrconfig-minimal.xml b/conf/solrconfig-minimal.xml new file mode 100644 index 0000000..bc18706 --- /dev/null +++ b/conf/solrconfig-minimal.xml @@ -0,0 +1,1813 @@ + + + + + + + + + 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/debian/changelog b/debian/changelog index b38b7e1..08abb67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +masterkey-lui-solr (0.6.2-1indexdata) unstable; urgency=low + + * Upstream + + -- Dennis Schafroth Thu, 02 Jan 2014 12:05:56 +0100 + masterkey-lui-solr (0.6.1-2indexdata) unstable; urgency=low * Upstream diff --git a/debian/control b/debian/control index 7999a8d..0ed2e25 100644 --- a/debian/control +++ b/debian/control @@ -14,38 +14,36 @@ Description: The Solr Web Application in war format. Package: masterkey-lui-solr4-master Architecture: all -Depends: masterkey-lui-solr4-common +Depends: masterkey-lui-solr4-common(= ${binary:Version}) 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-slave Architecture: all -Depends: masterkey-lui-solr4-common +Depends: masterkey-lui-solr4-common(= ${binary:Version}) 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-common-tomcat6 Architecture: all -Depends:tomcat6,masterkey-lui-solr4-common +Depends:tomcat6,masterkey-lui-solr4-common(= ${binary:Version}) 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,masterkey-lui-solr4-common-tomcat6 +Depends: tomcat6, masterkey-lui-solr4-master(= ${binary:Version}),masterkey-lui-solr4-common-tomcat6(= ${binary:Version}) 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,masterkey-lui-solr4-common-tomcat6 +Depends: tomcat6,masterkey-lui-solr4-slave(= ${binary:Version}),masterkey-lui-solr4-common-tomcat6(= ${binary:Version}) 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-zookeeper Architecture: all -Depends: masterkey-lui-solr4-common +Depends: masterkey-lui-solr4-common(= ${binary:Version}) Description: Local Unified Index (Solr) A stand-alone (jetty) ZooKeeper enabled Solr 4. Require 2 or more configurations running on multiple machines - - diff --git a/debian/rules b/debian/rules index 865a0fe..3c981b6 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE) LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat6 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT) CATALINA_HOME=/usr/share/tomcat6 -SOLR_VERSION=4.4.0 +SOLR_VERSION=4.6.0 LUI_SOLR_ZK = $(BASE)-zookeeper LUI_SOLR_ZK_ROOT = $(CURDIR)/debian/$(LUI_SOLR_ZK) diff --git a/etc/solr4-devl.xml b/etc/solr4-devl.xml index d546a3d..ae14da7 100644 --- a/etc/solr4-devl.xml +++ b/etc/solr4-devl.xml @@ -1,6 +1,6 @@ - + diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml index efe586d..aa5fa54 100644 --- a/etc/solr4-tomcat-context-master.xml +++ b/etc/solr4-tomcat-context-master.xml @@ -1,7 +1,7 @@ - + diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml index 01c1bd3..f68b8b4 100644 --- a/etc/solr4-tomcat-context-slave.xml +++ b/etc/solr4-tomcat-context-slave.xml @@ -1,7 +1,7 @@ - + diff --git a/zookeeper/webapps/solr.war b/zookeeper/webapps/solr.war index 6d98814..a7ed5bd 120000 --- a/zookeeper/webapps/solr.war +++ b/zookeeper/webapps/solr.war @@ -1 +1 @@ -../../dist/solr-4.4.0.war \ No newline at end of file +../../dist/solr-4.6.0.war \ No newline at end of file