Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr

diff --git a/IDMETA b/IDMETA
index 11363ee..dd2eca8 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 NAME=masterkey-lui-solr
-VERSION=0.3.1
+VERSION=0.4.2
 DEBIAN_DIST="squeeze wheezy"
 UBUNTU_DIST=""

diff --git a/conf/schema.xml b/conf/schema.xml
index fd85cfa..5317066 100644 (file)
--- a/conf/schema.xml
+++ b/conf/schema.xml
@@ -468,9 +468,10 @@
 <!-- 
 -->
    <field name="id" type="string" indexed="true" stored="true" required="true" /> 
+   <field name="_version_" type="long" indexed="true" stored="true"/>
 
-   <field name="author"       type="text"   indexed="true" stored="true"  multiValued="true" compressed="false" omitNorms="true"/>
-   <field name="author_exact" type="facet" indexed="true" stored="true"  multiValued="true" compressed="false" omitNorms="true"/>
+   <field name="author"       type="text"   indexed="true" stored="true"  multiValued="true"  omitNorms="true"/>
+   <field name="author_exact" type="facet" indexed="true" stored="true"  multiValued="true"  omitNorms="true"/>
    <field name="author-date"  type="text"   indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
    <field name="author-title" type="text"   indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
 
@@ -479,17 +480,17 @@
    <field name="corporate-name"     type="text" indexed="true" stored="true" omitNorms="true"/>
 
    <field name="callnumber" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="citation"   type="text" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
+   <field name="citation"   type="text" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
 
    <field name="date"        type="text"    indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="description" type="text_ws" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
+   <field name="description" type="text_ws" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
 
    <field name="edition" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="electronic-format-instruction" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
    <field name="electronic-format-type"        type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="electronic-note"               type="text" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
-   <field name="electronic-text"               type="text" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
+   <field name="electronic-note"               type="text" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
+   <field name="electronic-text"               type="text" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
    <field name="electronic-url"                type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="isbn" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
@@ -513,8 +514,8 @@
 
    <field name="tech-rep-nr" type="text" indexed="true" multiValued="true" stored="true"/>
 
-   <field name="title"                  type="text"   indexed="true" multiValued="true" compressed="false" stored="true"/>
-   <field name="title-complete"         type="text"   indexed="true" multiValued="true" compressed="true"  stored="true"/>
+   <field name="title"                  type="text"   indexed="true" multiValued="true" stored="true"/>
+   <field name="title-complete"         type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-dates"            type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-medium"           type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-number-section"   type="text"   indexed="true" multiValued="true" stored="true"/>
@@ -526,8 +527,8 @@
    <field name="title-uniform-partname" type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-uniform-parts"    type="text"   indexed="true" multiValued="true" stored="true"/>
 
-   <field name="journal-title"          type="text" indexed="true" multiValued="true" compressed="false" stored="true"/>
-   <field name="journal-title_exact"    type="text" indexed="true" multiValued="true" compressed="false" stored="true"/>
+   <field name="journal-title"          type="text" indexed="true" multiValued="true"  stored="true"/>
+   <field name="journal-title_exact"    type="text" indexed="true" multiValued="true"  stored="true"/>
 
    <field name="physical-accomp"     type="text" indexed="true" stored="true" multiValued="true" />
    <field name="physical-dimensions" type="text" indexed="true" stored="true" multiValued="true" />

diff --git a/conf/solrconfig-devl.xml b/conf/solrconfig-devl.xml
index c2f2566..22fa0bd 100644 (file)
--- a/conf/solrconfig-devl.xml
+++ b/conf/solrconfig-devl.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml
index a150e3e..cb497bf 100644 (file)
--- a/conf/solrconfig-master.xml
+++ b/conf/solrconfig-master.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/conf/solrconfig-prod.xml b/conf/solrconfig-prod.xml
index 00e4214..fc978e7 100644 (file)
--- a/conf/solrconfig-prod.xml
+++ b/conf/solrconfig-prod.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/conf/solrconfig-slave.xml b/conf/solrconfig-slave.xml
index 74db562..dfcf2fa 100644 (file)
--- a/conf/solrconfig-slave.xml
+++ b/conf/solrconfig-slave.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/debian/changelog b/debian/changelog
index d3a290b..b1ef286 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+masterkey-lui-solr (0.4.2-1indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- Dennis Schafroth <dennis@indexdata.com>  Fri, 28 Jun 2013 15:35:30 +0200
+
+masterkey-lui-solr4 (0.4.1-1indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- Dennis Schafroth <dennis@indexdata.com>  Fri, 28 Jun 2013 13:21:51 +0200
+
+masterkey-lui-solr (0.3.1-4indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- dennis <dennis@indexdata.com>  Tue, 29 Jan 2013 21:00:38 +0100
+
 masterkey-lui-solr (0.3.1-3indexdata) unstable; urgency=low
 
   * Upstream

diff --git a/debian/control b/debian/control
index b1b70d2..0fe08d5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,28 +12,58 @@ 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
 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-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
 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
+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/masterkey-lui-solr4-master-tomcat6.postinst b/debian/masterkey-lui-solr4-master-tomcat6.postinst
new file mode 100644 (file)
index 0000000..c8c84fb
--- /dev/null
+++ b/debian/masterkey-lui-solr4-master-tomcat6.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -sf /etc/masterkey/lui/lui-solr4-master.xml /etc/tomcat6/Catalina/localhost/solr4.xml
+chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr4/master

diff --git a/debian/masterkey-lui-solr4-master-tomcat6.postrm b/debian/masterkey-lui-solr4-master-tomcat6.postrm
new file mode 100644 (file)
index 0000000..d9015e2
--- /dev/null
+++ b/debian/masterkey-lui-solr4-master-tomcat6.postrm
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+    purge|remove)
+       rm -f /etc/tomcat6/Catalina/localhost/solr4.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-solr4-slave-tomcat6.postinst b/debian/masterkey-lui-solr4-slave-tomcat6.postinst
new file mode 100644 (file)
index 0000000..ea92d0e
--- /dev/null
+++ b/debian/masterkey-lui-solr4-slave-tomcat6.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -sf /etc/masterkey/lui/lui-solr4-slave.xml /etc/tomcat6/Catalina/localhost/solr4-slave.xml
+chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr4/slave

diff --git a/debian/masterkey-lui-solr4-slave-tomcat6.postrm b/debian/masterkey-lui-solr4-slave-tomcat6.postrm
new file mode 100644 (file)
index 0000000..086454d
--- /dev/null
+++ b/debian/masterkey-lui-solr4-slave-tomcat6.postrm
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+    purge|remove)
+       rm -f /etc/tomcat6/Catalina/localhost/solr4-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/rules b/debian/rules
index a46f443..e9e9fec 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,43 +2,79 @@
 # debian/rules for alien
 
 BASE=masterkey-lui-solr
-BASE_TOMCAT=$(BASE)-tomcat
+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
 
+CONF4_MASTER = $(SHARE4)/master
+CONF4_SLAVE  = $(SHARE4)/slave
+
 DATA = /var/lib/masterkey/lui/solr
 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_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat
 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_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat
+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_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-#LUI_SOLR_SHARE = $(LUI_SLAVE_TOMCAT_ROOT)/usr/share/masterkey/$(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
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -61,27 +97,49 @@ install-stamp: build
        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)
+
        # 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
+       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)/solrconfig.xml
+       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)
+
        # 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-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
 
        # 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
+
+       # 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
 
        touch $@
 

diff --git a/dist/apache-solr-4.3.1.war b/dist/apache-solr-4.3.1.war
new file mode 100644 (file)
index 0000000..dc796b8
Binary files /dev/null and b/dist/apache-solr-4.3.1.war differ

diff --git a/etc/solr4-devl.xml b/etc/solr4-devl.xml
new file mode 100644 (file)
index 0000000..cb8a3c5
--- /dev/null
+++ b/etc/solr4-devl.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Context 
+    docBase="/home/dennis/proj/lui-solr/dist/apache-solr-4.6.1.war" 
+    path="/solr4"
+>
+  <Environment name="solr/home" type="java.lang.String" value="/home/dennis/proj/lui-solr" override="true"/>
+</Context>

diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml
new file mode 100644 (file)
index 0000000..29e441c
--- /dev/null
+++ b/etc/solr4-tomcat-context-master.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Context 
+    docBase="/usr/share/masterkey/lui/solr/war/apache-solr-4.3.1.war" 
+    path="/solr4"
+>
+  <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/master" override="true"/>
+</Context>

diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml
new file mode 100644 (file)
index 0000000..1599bb4
--- /dev/null
+++ b/etc/solr4-tomcat-context-slave.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Context 
+    docBase="/usr/share/masterkey/lui/solr/war/apache-solr-4.3.1.war" 
+    path="/solr4-slave"
+>
+  <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/slave" override="true"/>
+</Context>