X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=debian%2Frules;fp=debian%2Frules;h=3042d5243430e6e49387d2f2833260811542f899;hp=3c981b655edca52c9e51b77c400e709cbd569e4c;hb=e21cbf11953d1d1df240906b9dd428d9b7bc6393;hpb=204d56e206c8d9a1f4309b742bce1e2adde84e29

diff --git a/debian/rules b/debian/rules
index 3c981b6..3042d52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,8 @@
 # debian/rules for alien
 
 BASE=masterkey-lui-solr4
-BASE_MASTER=$(BASE)-master
-BASE_MASTER_TOMCAT=$(BASE_MASTER)-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/solr4
 
 CONF_MASTER = $(SHARE)/master/collection1/
@@ -30,20 +24,37 @@ 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_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-tomcat6
-LUI_SOLR_COMMON_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT)
+LUI_SOLR_COMMON_TOMCAT6 = $(LUI_SOLR_COMMON)-tomcat6
+LUI_SOLR_COMMON_TOMCAT6_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT6)
 
-LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat6
-LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
+LUI_SOLR_MASTER_TOMCAT6 = $(LUI_SOLR_MASTER)-tomcat6
+LUI_SOLR_MASTER_TOMCAT6_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT6)
 
 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_SOLR_SLAVE)-tomcat6
-LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-CATALINA_HOME=/usr/share/tomcat6
+LUI_SOLR_SLAVE_TOMCAT6 = $(LUI_SOLR_SLAVE)-tomcat6
+LUI_SOLR_SLAVE_TOMCAT6_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT6)
+CATALINA6_HOME=/usr/share/tomcat6
+
+LUI_SOLR_COMMON_TOMCAT8 = $(LUI_SOLR_COMMON)-tomcat8
+LUI_SOLR_COMMON_TOMCAT8_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT8)
+
+LUI_SOLR_MASTER_TOMCAT8 = $(LUI_SOLR_MASTER)-tomcat8
+LUI_SOLR_MASTER_TOMCAT8_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT8)
+
+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_TOMCAT8 = $(LUI_SOLR_SLAVE)-tomcat8
+LUI_SOLR_SLAVE_TOMCAT8_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT8)
+CATALINA8_HOME=/usr/share/tomcat8
+
+
 SOLR_VERSION=4.6.0
 
 LUI_SOLR_ZK = $(BASE)-zookeeper
@@ -88,10 +99,24 @@ install-stamp: build
 	mkdir -p $(LUI_SOLR_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 -rp lib/ $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)
-	ls -la $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib/
+	# Harvester Utilities. Stylesheet used in includes needs to be in CATALINA6_HOME
+	mkdir -p $(LUI_SOLR_COMMON_TOMCAT6_ROOT)$(CATALINA6_HOME)/lib
+	cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT6_ROOT)$(CATALINA6_HOME)
+	ls -la $(LUI_SOLR_COMMON_TOMCAT6_ROOT)$(CATALINA6_HOME)/lib/
+
+	# lui-solr-master plumbing for Tomcat 6. 
+	mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
+	cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR_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/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
+
+	# Common lui-solr4-tomcat: Logging Libraries installed under tomcat8. 
+	# Harvester Utilities. Stylesheet used in includes needs to be in CATALINA8_HOME
+	mkdir -p $(LUI_SOLR_COMMON_TOMCAT8_ROOT)$(CATALINA8_HOME)/lib
+	cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT8_ROOT)$(CATALINA8_HOME)
+	ls -la $(LUI_SOLR_COMMON_TOMCAT8_ROOT)$(CATALINA8_HOME)/lib/
 
 	# lui-solr-master plumbing for Tomcat 6. 
 	mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui