From: Dennis Schafroth Date: Mon, 25 Feb 2013 18:22:11 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr X-Git-Tag: v0.6.0~6^2~20 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=581fa1bf47a3c3e8b5c1ed34968bcb71d1263fed;hp=0ca85e3f1b0d3abe9b899478902f75770c655e9a;p=lui-solr.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr --- diff --git a/.gitignore b/.gitignore index 91d1e48..4939ae9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ data +install-stamp \ No newline at end of file diff --git a/IDMETA b/IDMETA index 9a3b05e..11363ee 100644 --- a/IDMETA +++ b/IDMETA @@ -1,3 +1,4 @@ NAME=masterkey-lui-solr -VERSION=0.2.2 - +VERSION=0.3.1 +DEBIAN_DIST="squeeze wheezy" +UBUNTU_DIST="" diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..d275d1b --- /dev/null +++ b/NEWS @@ -0,0 +1,15 @@ +LUI Solr +========================== +A Local Unified Index based on Solr. + +The following is a repackaging of Solr with a specific schema used in the +Library domain. The schema follows the pazpar2 data model used in many +library configuration and should be able to contain both MARC and Dublin Core +data. + +The LUI model extends the pazpar2 data model with concept of sub-database (or set), by +adding field database (and possible database_name) to the data. Data must not use these +fields for data. At some point it should be possible to configure which fields to use. + +In addition the field name "id" is defined as unique key to a record in the Solr index. +Adding a new record with the same id mean override the old record with new data. diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml new file mode 100644 index 0000000..a150e3e --- /dev/null +++ b/conf/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/conf/solrconfig-slave.xml b/conf/solrconfig-slave.xml new file mode 100644 index 0000000..74db562 --- /dev/null +++ b/conf/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/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..e437d9f --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,4 @@ +files +masterkey-*/ +*.substvars +*.log diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d3a290b --- /dev/null +++ b/debian/changelog @@ -0,0 +1,59 @@ +masterkey-lui-solr (0.3.1-3indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 21:00:38 +0100 + +masterkey-lui-solr (0.3.1-2indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 21:00:38 +0100 + +masterkey-lui-solr (0.3.1-1indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 16:57:38 +0100 + +masterkey-lui-solr (0.3.0-7indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 15:58:38 +0100 + +masterkey-lui-solr (0.3.0-6indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 15:58:38 +0100 + +masterkey-lui-solr (0.3.0-5indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 15:43:38 +0100 + +masterkey-lui-solr (0.3.0-4indexdata) unstable; urgency=low + + * Upstream + + -- dennis Tue, 29 Jan 2013 15:22:38 +0100 + +masterkey-lui-solr (0.3.0-3indexdata) unstable; urgency=low + + * Third version of debian packages, now squeeze spelled correctly + + -- dennis Tue, 29 Jan 2013 14:35:38 +0100 + +masterkey-lui-solr (0.3.0-2indexdata) unstable; urgency=low + + * Second version of debian packages, both squeeze and wheezy + + -- dennis Tue, 29 Jan 2013 13:03:38 +0100 + +masterkey-lui-solr (0.3.0-1indexdata) unstable; urgency=low + + * First version of debian packages + + -- dennis Tue, 29 Jan 2013 15:03:38 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b1b70d2 --- /dev/null +++ b/debian/control @@ -0,0 +1,39 @@ +Source: masterkey-lui-solr +Section: misc +Priority: extra +Maintainer: dennis +Build-Depends: debhelper (>= 5), default-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-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-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-solr-master-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. + +Package: masterkey-lui-solr-slave-tomcat6 +Architecture: all +Depends: tomcat6,masterkey-lui-solr-slave +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/copyright b/debian/copyright new file mode 100644 index 0000000..b5fb090 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by the alien program by converting +a binary .rpm package on Tue, 29 Jan 2013 15:03:38 +0100 + +Copyright: IndexData + +Information from the binary package: +Name : masterkey-lui-solr +Version : 0.2.2 +Release : 1.indexdata +Architecture: noarch +Install Date: (not installed) +Group : Applications/Internet +Size : 7603954 +License : IndexData +Signature : DSA/SHA1, Wed 02 Nov 2011 03:39:39 PM CET, Key ID 38e53a727f1d2347 +Source RPM : masterkey-lui-solr-0.2.2-1.indexdata.src.rpm +Build Date : Wed 02 Nov 2011 03:35:41 PM CET +Build Host : centos5.index +Relocations : (not relocatable) +Packager : Dennis Schafroth +Vendor : Index Data ApS +URL : http://www.indexdata.dk/masterkey +Summary : Local Unified Index (Solr) +Description : +The Local Unified Index is a index that contains multiple logical indexes. The underlying index is a Solr/lucene index configured to use a specific LUI schema. + diff --git a/debian/masterkey-lui-solr-master-tomcat6.postinst b/debian/masterkey-lui-solr-master-tomcat6.postinst new file mode 100644 index 0000000..9b4ba0a --- /dev/null +++ b/debian/masterkey-lui-solr-master-tomcat6.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +ln -sf /etc/masterkey/lui/lui-solr-master.xml /etc/tomcat6/Catalina/localhost/solr.xml +chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/master diff --git a/debian/masterkey-lui-solr-master-tomcat6.postrm b/debian/masterkey-lui-solr-master-tomcat6.postrm new file mode 100644 index 0000000..8b3502e --- /dev/null +++ b/debian/masterkey-lui-solr-master-tomcat6.postrm @@ -0,0 +1,18 @@ +#!/bin/sh -e + +case "$1" in + purge|remove) + rm -f /etc/tomcat6/Catalina/localhost/solr.xml +# rm -f /etc/tomcat6/policy.d/05harvester.policy + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/masterkey-lui-solr-slave-tomcat6.postinst b/debian/masterkey-lui-solr-slave-tomcat6.postinst new file mode 100644 index 0000000..a647647 --- /dev/null +++ b/debian/masterkey-lui-solr-slave-tomcat6.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +ln -sf /etc/masterkey/lui/lui-solr-slave.xml /etc/tomcat6/Catalina/localhost/solr-slave.xml +chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/slave diff --git a/debian/masterkey-lui-solr-slave-tomcat6.postrm b/debian/masterkey-lui-solr-slave-tomcat6.postrm new file mode 100644 index 0000000..2c4542a --- /dev/null +++ b/debian/masterkey-lui-solr-slave-tomcat6.postrm @@ -0,0 +1,18 @@ +#!/bin/sh -e + +case "$1" in + purge|remove) + rm -f /etc/tomcat6/Catalina/localhost/solr-slave.xml +# rm -f /etc/tomcat6/policy.d/05harvester.policy + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/masterkey-lui-solr-slave.postinst b/debian/masterkey-lui-solr-slave.postinst new file mode 100644 index 0000000..fbd28f7 --- /dev/null +++ b/debian/masterkey-lui-solr-slave.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +# alien added permissions fixup code +#chown -R 'tomcat6:tomcat6' '/usr/share/masterkey/lui/solr/slave' diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a46f443 --- /dev/null +++ b/debian/rules @@ -0,0 +1,109 @@ +#!/usr/bin/make -f +# debian/rules for alien + +BASE=masterkey-lui-solr +BASE_TOMCAT=$(BASE)-tomcat +BASE_SLAVE=$(BASE)-slave +BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat + +DOC = /usr/share/doc/masterkey +LOG = /var/log/masterkey +SHARE = /usr/share/masterkey/lui/solr + +CONF_MASTER = $(SHARE)/master +CONF_SLAVE = $(SHARE)/slave + +DATA = /var/lib/masterkey/lui/solr +DATA_MASTER = $(DATA)/master +DATA_SLAVE = $(DATA)/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_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_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat +LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_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_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat +LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT) +#LUI_SOLR_SHARE = $(LUI_SLAVE_TOMCAT_ROOT)/usr/share/masterkey/$(LUI_SLAVE_TOMCAT) + +SOLR_VERSION=3.6.1 + +PACKAGE=$(shell dh_listpackages) + +build: + dh_testdir + +clean: + dh_testdir + dh_testroot + dh_clean -d + + +install: install-stamp +install-stamp: build + dh_testdir + dh_testroot + dh_prep + + # 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-solr-master + mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR) + cp -rp conf $(LUI_SOLR_MASTER_SHARE_DIR) + ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/solrconfig.xml + mkdir -p $(LUI_SOLR_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)/solrconfig.xml + mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR) + + # 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 +# mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui + + # 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 +# mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui + + touch $@ + +binary: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Copy the packages's files. +# find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \ +# xargs -0 -r -i cp -a {} debian/$(PACKAGE) +# +# +# If you need to move files around in debian/$(PACKAGE) or do some +# binary patching, do it here +# + +.PHONY: build clean binary-indep binary-arch binary diff --git a/dist/apache-solr-3.6.1.war b/dist/apache-solr-3.6.1.war new file mode 100644 index 0000000..2ee6bbe Binary files /dev/null and b/dist/apache-solr-3.6.1.war differ diff --git a/dist/apache-solr-4.0.0.war b/dist/apache-solr-4.0.0.war new file mode 100644 index 0000000..40ef8ed Binary files /dev/null and b/dist/apache-solr-4.0.0.war differ diff --git a/etc/solr-tomcat-context-master.xml b/etc/solr-tomcat-context-master.xml new file mode 100644 index 0000000..c161dbf --- /dev/null +++ b/etc/solr-tomcat-context-master.xml @@ -0,0 +1,7 @@ + + + + diff --git a/etc/solr-tomcat-context-slave.xml b/etc/solr-tomcat-context-slave.xml new file mode 100644 index 0000000..d8c3f7b --- /dev/null +++ b/etc/solr-tomcat-context-slave.xml @@ -0,0 +1,7 @@ + + + + diff --git a/etc/solr-tomcat-context.xml b/etc/solr-tomcat-context.xml index 0cc1f12..d009dd3 100644 --- a/etc/solr-tomcat-context.xml +++ b/etc/solr-tomcat-context.xml @@ -1,6 +1,6 @@ diff --git a/lui-solr.spec b/lui-solr.spec index 0b0460f..b78551c 100644 --- a/lui-solr.spec +++ b/lui-solr.spec @@ -1,6 +1,6 @@ Summary: Local Unified Index (Solr) Name: masterkey-lui-solr -Version: 0.2.2 +Version: 0.3.0 Release: 1.indexdata License: IndexData Group: Applications/Internet