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

diff --git a/debian/control b/debian/control
index 0fe08d5..c9cb458 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,63 +6,39 @@ 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-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 5eb27c0..029f76e 100755 (executable)
--- 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
+SHARE = /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 = /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)-tomcat
+LUI_SOLR_COMMON_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT)
 
 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_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_SOLR4_SLAVE_TOMCAT = $(LUI_SOLR4_SLAVE)-tomcat
-LUI_SOLR4_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-
-SOLR_VERSION=3.6.2
-SOLR4_VERSION=4.3.1
+SOLR_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -97,10 +65,6 @@ 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 conf3 $(LUI_SOLR_MASTER_SHARE_DIR)
@@ -108,12 +72,6 @@ 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)/conf/solrconfig.xml
-       mkdir -p $(LUI_SOLR4_MASTER_LIB_DIR)
-
        # lui-solr-slave Slave configuration
        mkdir -p    $(LUI_SOLR_SLAVE_SHARE_DIR)
        cp -rp conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)
@@ -121,28 +79,19 @@ install-stamp: build
        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 solrconfig4-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/conf/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 -r lib/ $(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
-
        # 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/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
-
        touch $@
 
 binary: build install

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

diff --git a/lib/jcl-over-slf4j-1.6.6.jar b/lib/jcl-over-slf4j-1.6.6.jar
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index 0000000..e72c2d6
Binary files /dev/null and b/lib/slf4j-log4j12-1.6.6.jar differ