[Debian-med-packaging] Bug#769348: biomaj-watcher: switch to tomcat8

[Emmanuel Bourg]

Control: tags -1 + patch
-------------- next part --------------
Index: debian/README.Debian
===================================================================
--- debian/README.Debian        (revision 18328)
+++ debian/README.Debian        (working copy)
@@ -10,4 +10,4 @@
  http://gwt-google-apis.googlecode.com/svn/tags/visualization/1.1.1


- Biomaj watcher updates the access rights of most of Biomaj directories to add write access to the user tomcat6. Indeed, all configuration and bank updates will be done via the Tomcat application. Those modifications are needed only while biomaj-watcher is installed.
+ Biomaj watcher updates the access rights of most of Biomaj directories to add write access to the user tomcat8. Indeed, all configuration and bank updates will be done via the Tomcat application. Those modifications are needed only while biomaj-watcher is installed.
Index: debian/control
===================================================================
--- debian/control      (revision 18328)
+++ debian/control      (working copy)
@@ -21,7 +21,7 @@

 Package: biomaj-watcher
 Architecture: all
-Depends: ${misc:Depends}, default-jdk, tomcat6 (>=6.0.32-3), biomaj (>= 1.2.1), debconf,
+Depends: ${misc:Depends}, default-jdk, tomcat8, biomaj (>= 1.2.1), debconf,
  liblog4j1.2-java, libjsch-java (>= 0.1.42),libjdom1-java (>= 1.1), libcommons-lang-java (>=2.4),
  libcommons-logging-java (>=1.1),libquartz-java(>=1.6),libxerces2-java, unzip, zip, libgnumail-java
 Description: biological data-bank updater - web interface
Index: debian/postinst
===================================================================
--- debian/postinst     (revision 18328)
+++ debian/postinst     (working copy)
@@ -48,9 +48,9 @@
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/gnumail.jar
       ln -s /usr/share/java/gnumail.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/gnumail.jar

-      #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
-      rm -f /var/lib/tomcat6/shared/biomaj.jar
-      cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/biomaj.jar
+      #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat8/shared/
+      rm -f /var/lib/tomcat8/shared/biomaj.jar
+      cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat8/shared/biomaj.jar
       # Install latest definition
       cp /usr/share/java/webapps/biomaj-watcher/jobs.xsd /etc/biomaj-watcher/jobs.xsd

@@ -62,24 +62,24 @@
       # Update logs
       set_perms /var/log/biomaj

-      #chown -R tomcat6 /etc/biomaj/db_properties
-      chown -R tomcat6 /usr/share/java/webapps/biomaj-watcher
+      #chown -R tomcat8 /etc/biomaj/db_properties
+      chown -R tomcat8 /usr/share/java/webapps/biomaj-watcher
       #chmod -R 775 /etc/biomaj/db_properties
-      #chown -R tomcat6 /var/log/biomaj
+      #chown -R tomcat8 /var/log/biomaj
       #chmod -R 775 /var/log/biomaj
-      #chown -R tomcat6 /var/lib/biomaj
+      #chown -R tomcat8 /var/lib/biomaj
       #chmod -R 775 /var/lib/biomaj
-      chown -R tomcat6 /etc/biomaj-watcher
+      chown -R tomcat8 /etc/biomaj-watcher
       # Update context
       java -cp $biomajwatcher_root/bin UpdateToBiomaj1_2 /usr/share/java/webapps/biomaj-watcher admin
-      chown -R tomcat6 /etc/biomaj-watcher
-      #cp /etc/biomaj-watcher/BmajWatcher*.xml /var/lib/tomcat6/conf/Catalina/localhost/
-      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml
-      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
-      ln -s /etc/biomaj-watcher/BmajWatcher.xml /etc/tomcat6/Catalina/localhost/BmajWatcher.xml
-      ln -s /etc/biomaj-watcher/BmajWatcher#logs.xml /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
+      chown -R tomcat8 /etc/biomaj-watcher
+      #cp /etc/biomaj-watcher/BmajWatcher*.xml /var/lib/tomcat8/conf/Catalina/localhost/
+      rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher.xml
+      rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher#logs.xml
+      ln -s /etc/biomaj-watcher/BmajWatcher.xml /etc/tomcat8/Catalina/localhost/BmajWatcher.xml
+      ln -s /etc/biomaj-watcher/BmajWatcher#logs.xml /etc/tomcat8/Catalina/localhost/BmajWatcher#logs.xml

-      invoke-rc.d tomcat6 restart
+      invoke-rc.d tomcat8 restart


     ;;
Index: debian/postrm
===================================================================
--- debian/postrm       (revision 18328)
+++ debian/postrm       (working copy)
@@ -14,20 +14,20 @@
     ;;
     remove|failed-upgrade|abort-install|abort-upgrade|disappear)

-      if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then
-        rm  /var/lib/tomcat6/shared/biomaj.jar
+      if [ -e /var/lib/tomcat8/shared/biomaj.jar ]; then
+        rm  /var/lib/tomcat8/shared/biomaj.jar
       fi
-      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml
-      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
+      rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher.xml
+      rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher#logs.xml
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/*.jar
     ;;

     purge)
-      if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then
-        rm  /var/lib/tomcat6/shared/biomaj.jar
+      if [ -e /var/lib/tomcat8/shared/biomaj.jar ]; then
+        rm  /var/lib/tomcat8/shared/biomaj.jar
       fi
-      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml
-      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
+      rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher.xml
+      rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher#logs.xml
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/*.jar
       rm -rf /etc/biomaj-watcher

Index: debian/setperms.sh
===================================================================
--- debian/setperms.sh  (revision 18328)
+++ debian/setperms.sh  (working copy)
@@ -2,8 +2,8 @@

 if ! dpkg-statoverride --list "$1" >/dev/null; then
   if [ "$1" == "/etc/biomaj/db_properties/global.properties" ]; then
-    dpkg-statoverride --update --add tomcat6 root 0660  $1
+    dpkg-statoverride --update --add tomcat8 root 0660  $1
   else
-    dpkg-statoverride --update --add tomcat6 root 0775  $1
+    dpkg-statoverride --update --add tomcat8 root 0775  $1
   fi
 fi