Merge tag 'v0.4.11'

diff --git a/conf/schema.xml b/conf/schema.xml
index 5317066..3048c58 100644 (file)
--- a/conf/schema.xml
+++ b/conf/schema.xml
@@ -471,7 +471,7 @@
    <field name="_version_" type="long" indexed="true" stored="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_exact" type="facet"  indexed="true" stored="false" 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"/>
 
@@ -497,8 +497,8 @@
    <field name="issn" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
    <field name="lccn" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
-   <field name="medium"       type="text"   indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="medium_exact" type="facet" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
+   <field name="medium"       type="text"  indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
+   <field name="medium_exact" type="facet" indexed="true" stored="false" multiValued="true" omitNorms="true"/>
 
    <field name="meeting-date"     type="text" indexed="true" stored="true" omitNorms="true"/>
    <field name="meeting-location" type="text" indexed="true" stored="true" omitNorms="true"/>
@@ -507,7 +507,7 @@
    <field name="series-title" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="subject"       type="text_ws" indexed="true" stored="true"  multiValued="true" omitNorms="true" />
-   <field name="subject_exact" type="facet" indexed="true" stored="true"  multiValued="true" omitNorms="true" />
+   <field name="subject_exact" type="facet"   indexed="true" stored="false" multiValued="true" omitNorms="true" />
    <field name="subject-long"  type="text_ws" indexed="true" stored="true"  multiValued="true" omitNorms="true" />
 
    <field name="system-control-nr" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
@@ -527,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"  stored="true"/>
-   <field name="journal-title_exact"    type="text" indexed="true" multiValued="true"  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="false"/>
 
    <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/debian/rules b/debian/rules
index 140f88c..86f0ca1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,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.3.1
+SOLR_VERSION=4.4.0
 
 PACKAGE=$(shell dh_listpackages)
 

diff --git a/dist/apache-solr-3.3.0.war b/dist/apache-solr-3.3.0.war
deleted file mode 100644 (file)
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 (file)
index 2ee6bbe..0000000
Binary files a/dist/apache-solr-3.6.1.war and /dev/null differ

diff --git a/dist/apache-solr-3.6.2.war b/dist/apache-solr-3.6.2.war
deleted file mode 100644 (file)
index 8144c41..0000000
Binary files a/dist/apache-solr-3.6.2.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 (file)
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 (file)
index c57b7fe..0000000
--- a/etc/solr-devl.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Context 
-    docBase="/home/dennis/proj/lui-solr/dist/apache-solr-3.6.2.war" 
-    path="/solr"
->
-  <Environment name="solr/home" type="java.lang.String" value="/home/dennis/proj/lui-solr" override="true"/>
-</Context>

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

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

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

diff --git a/etc/solr4-devl.xml b/etc/solr4-devl.xml
index 27575b0..69e678d 100644 (file)
--- a/etc/solr4-devl.xml
+++ b/etc/solr4-devl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/home/dennis/proj/lui-solr4/dist/apache-solr-4.3.1.war" 
+    docBase="/home/dennis/proj/lui-solr4/dist/apache-solr-4.4.0.war" 
 >
   <Environment name="solr/home" type="java.lang.String" value="/home/dennis/proj/lui-solr4" override="true"/>
 </Context>

diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml
index f53b3ad..3dc86c6 100644 (file)
--- a/etc/solr4-tomcat-context-master.xml
+++ b/etc/solr4-tomcat-context-master.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/usr/share/masterkey/lui/solr4/war/apache-solr-4.3.1.war" 
+    docBase="/usr/share/masterkey/lui/solr4/war/apache-solr-4.4.0.war" 
     path="/solr4"
 >
   <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/master" override="true"/>

diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml
index 0771f5c..ba25984 100644 (file)
--- a/etc/solr4-tomcat-context-slave.xml
+++ b/etc/solr4-tomcat-context-slave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/usr/share/masterkey/lui/solr4/war/apache-solr-4.3.1.war" 
+    docBase="/usr/share/masterkey/lui/solr4/war/apache-solr-4.4.0.war" 
     path="/solr4-slave"
 >
   <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/slave" override="true"/>