[med-svn] r23863 - trunk/packages/biomaj-watcher/trunk/debian

[Olivier Sallou]

Author: osallou
Date: 2017-06-28 11:39:13 +0000 (Wed, 28 Jun 2017)
New Revision: 23863

Modified:
   trunk/packages/biomaj-watcher/trunk/debian/changelog
   trunk/packages/biomaj-watcher/trunk/debian/postinst
Log:
Closes 866066 on missing libs related to quartz

Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/changelog	2017-06-27 10:29:41 UTC (rev 23862)
+++ trunk/packages/biomaj-watcher/trunk/debian/changelog	2017-06-28 11:39:13 UTC (rev 23863)
@@ -1,3 +1,11 @@
+biomaj-watcher (1.2.2-5) unstable; urgency=medium
+
+  * Team upload.
+  * Add slf4j libraries required by libquartz-java to the webapp (Closes: #866066)
+    Thanks to tmancill at debian.org
+
+ -- Olivier Sallou <osallou at debian.org>  Wed, 28 Jun 2017 11:21:57 +0000
+
 biomaj-watcher (1.2.2-4) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postinst	2017-06-27 10:29:41 UTC (rev 23862)
+++ trunk/packages/biomaj-watcher/trunk/debian/postinst	2017-06-28 11:39:13 UTC (rev 23863)
@@ -30,24 +30,16 @@
 
       java -cp $biomajwatcher_root/bin WatcherConfigurator bmajroot:=$bmajroot bmajconf:=$bmajconf use_ldap:=$use_ldap ldap_host:=$ldap_host ldap_dn:=$ldap_dn opt_filter:=$opt_filter app_login:=$app_login
 
-      # Copy required libs
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/xercesImpl.jar
-      ln -s /usr/share/java/xercesImpl.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/xercesImpl.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-lang.jar 
-      ln -s /usr/share/java/commons-lang.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-lang.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-logging.jar
-      ln -s /usr/share/java/commons-logging.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-logging.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jdom1.jar
-      ln -s /usr/share/java/jdom1.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jdom1.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jsch.jar
-      ln -s /usr/share/java/jsch.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jsch.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/log4j-1.2.jar
-      ln -s /usr/share/java/log4j-1.2.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/log4j-1.2.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
-      ln -s /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
+      # clean-up any old references to mail implementations
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/*mail.jar
-      ln -s /usr/share/java/javax.mail.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/javax.mail.jar
 
+      # link/copy required libs
+      for library in xercesImpl commons-lang commons-logging jdom1 jsch log4j-1.2 quartz javax.mail slf4j-api slf4j-simple slf4j-log4j12
+      do
+          rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/${library}.jar
+          ln -s /usr/share/java/${library}.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/${library}.jar
+      done
+
       #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
       cp /usr/share/biomaj/lib/biomaj.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar