Add packages for jessie (java7/tomcat8)

diff --git a/IDMETA b/IDMETA
index dfe46b1..c055024 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 NAME=masterkey-lui-solr
-VERSION=0.7.snapshot
-DEBIAN_DIST="squeeze wheezy"
+VERSION=0.8
+DEBIAN_DIST="jessie squeeze wheezy"
 UBUNTU_DIST=""

diff --git a/debian/control b/debian/control
index 29d3cc1..d5023ee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: masterkey-lui-solr
 Section: misc
 Priority: extra
-Maintainer: dennis <dennis@indexdata.com>
-Build-Depends: debhelper (>= 5), openjdk-6-jdk, maven2, unzip
+Maintainer: Index Data ApS <info@indexdata.com>
+Build-Depends: debhelper (>= 5), openjdk-7-jdk, maven, unzip
 Standards-Version: 3.8.0
 Homepage: http://www.indexdata.dk/masterkey/harvester
 
@@ -42,6 +42,24 @@ Depends: tomcat6,masterkey-lui-solr4-slave(= ${binary:Version}),masterkey-lui-so
 Description: Local Unified Index Solr Tomcat 6 integration for a LUI slave
  The LUI is part of the MasterKey suite. This package provides Tomcat 6 integration.
 
+Package: masterkey-lui-solr4-common-tomcat8
+Architecture: all
+Depends:tomcat8, masterkey-lui-solr4-common(= ${binary:Version})
+Description: The Solr Web Application in war format.
+ The common logging library installed under tomcat8
+
+Package: masterkey-lui-solr4-master-tomcat8
+Architecture: all
+Depends: tomcat8, masterkey-lui-solr4-master(= ${binary:Version}),masterkey-lui-solr4-common-tomcat8(= ${binary:Version})
+Description: Local Unified Index Solr Tomcat 6 integration for a LUI master
+ The LUI is part of the MasterKey suite. This package provides Tomcat 8 integration.
+
+Package: masterkey-lui-solr4-slave-tomcat8
+Architecture: all
+Depends: tomcat8, masterkey-lui-solr4-slave(= ${binary:Version}), masterkey-lui-solr4-common-tomcat8(= ${binary:Version})
+Description: Local Unified Index Solr Tomcat 6 integration for a LUI slave
+ The LUI is part of the MasterKey suite. This package provides Tomcat 8 integration.
+
 Package: masterkey-lui-solr4-zookeeper
 Architecture: all
 Depends: masterkey-lui-solr4-common(= ${binary:Version})

diff --git a/debian/masterkey-lui-solr-master-tomcat6.postinst b/debian/masterkey-lui-solr-master-tomcat6.postinst
deleted file mode 100644 (file)
index 9b4ba0a..0000000
--- a/debian/masterkey-lui-solr-master-tomcat6.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-ln -sf /etc/masterkey/lui/lui-solr-master.xml /etc/tomcat6/Catalina/localhost/solr.xml
-chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/master

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

diff --git a/debian/masterkey-lui-solr-slave-tomcat6.postrm b/debian/masterkey-lui-solr-slave-tomcat6.postrm
deleted file mode 100644 (file)
index 2c4542a..0000000
--- a/debian/masterkey-lui-solr-slave-tomcat6.postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    purge|remove)
-       rm -f /etc/tomcat6/Catalina/localhost/solr-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/masterkey-lui-solr-slave.postinst b/debian/masterkey-lui-solr-slave.postinst
deleted file mode 100644 (file)
index fbd28f7..0000000
--- a/debian/masterkey-lui-solr-slave.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# alien added permissions fixup code
-#chown -R 'tomcat6:tomcat6' '/usr/share/masterkey/lui/solr/slave'

diff --git a/debian/masterkey-lui-solr-zookeeper.postinst b/debian/masterkey-lui-solr-zookeeper.postinst
deleted file mode 100644 (file)
index e1e8ad4..0000000
--- a/debian/masterkey-lui-solr-zookeeper.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/masterkey/lui/solr4/zookeeper
-./zookeeper.sh /var/lib/masterkey/lui/solr4/zk-first

diff --git a/debian/masterkey-lui-solr-zookeeper.postrm b/debian/masterkey-lui-solr-zookeeper.postrm
deleted file mode 100644 (file)
index f01669f..0000000
--- a/debian/masterkey-lui-solr-zookeeper.postrm
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    remove)
-       ;;
-    purge)
-       rm -rf /var/lib/masterkey/masterkey/lui/solr4/zk-first
-        ;;
-    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-master-tomcat8.postinst b/debian/masterkey-lui-solr4-master-tomcat8.postinst
new file mode 100644 (file)
index 0000000..aa0d98a
--- /dev/null
+++ b/debian/masterkey-lui-solr4-master-tomcat8.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -sf /etc/masterkey/lui/lui-solr4-master.xml /etc/tomcat8/Catalina/localhost/solr4.xml
+chown -R tomcat8:tomcat8 /var/lib/masterkey/lui/solr4/master

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

diff --git a/debian/masterkey-lui-solr4-slave-tomcat8.postrm b/debian/masterkey-lui-solr4-slave-tomcat8.postrm
new file mode 100644 (file)
index 0000000..392370a
--- /dev/null
+++ b/debian/masterkey-lui-solr4-slave-tomcat8.postrm
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+    purge|remove)
+       rm -f /etc/tomcat8/Catalina/localhost/solr4-slave.xml
+#      rm -f /etc/tomcat8/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 3c981b6..3042d52 100755 (executable)
--- 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