X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=debian%2Frules;h=0ed525461e9915381bf688a9dbb4ba25591674c6;hp=bdd61c065c1a336891ee4cbfdf618b5506bb85ff;hb=b04b7c15bcb7d35a161f01505421e8e8a1b5a158;hpb=3c636ee18c9e156a024e870576c726c6a0663609

diff --git a/debian/rules b/debian/rules
index bdd61c0..0ed5254 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,21 @@
 #!/usr/bin/make -f
 # debian/rules for alien
 
-BASE=masterkey-lui-solr
-BASE_TOMCAT=$(BASE)-tomcat
+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/solr
+
+SHARE = /usr/share/masterkey/lui/solr4
 
 CONF_MASTER = $(SHARE)/master
 CONF_SLAVE  = $(SHARE)/slave
 
-DATA = /var/lib/masterkey/lui/solr
+DATA = /var/lib/masterkey/lui/solr4
 DATA_MASTER = $(DATA)/master
 DATA_SLAVE  = $(DATA)/slave
 
@@ -26,6 +28,9 @@ 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)-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)
 
@@ -34,11 +39,10 @@ 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 = $(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)
-
-SOLR_VERSION=3.6.1
+CATALINA_HOME=/usr/share/tomcat6
+SOLR_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -63,25 +67,30 @@ install-stamp: build
 
 	# lui-solr-master
 	mkdir -p    $(LUI_SOLR_MASTER_SHARE_DIR)
-	cp -rp conf $(LUI_SOLR_MASTER_SHARE_DIR)
+	cp -rp conf3 $(LUI_SOLR_MASTER_SHARE_DIR)
+	mv $(LUI_SOLR_MASTER_SHARE_DIR)/conf3 $(LUI_SOLR_MASTER_SHARE_DIR)/conf
 	ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/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)
+	cp -rp conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)
+	mv $(LUI_SOLR_SLAVE_SHARE_DIR)/conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)/conf
 	ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
 	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 -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
-#	mkdir -p $(TOMCAT6ROOT)/var/log/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/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
-#	mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui
+	cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
 
 	touch $@