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

olivier sallou osallou-guest at alioth.debian.org
Wed Apr 27 12:16:37 UTC 2011


Author: osallou-guest
Date: 2011-04-27 12:16:27 +0000 (Wed, 27 Apr 2011)
New Revision: 6674

Modified:
   trunk/packages/biomaj-watcher/trunk/debian/postinst
   trunk/packages/biomaj-watcher/trunk/debian/postrm
   trunk/packages/biomaj-watcher/trunk/debian/prerm
Log:
remove war creation, add cosmetic spaces

Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postinst	2011-04-27 11:44:27 UTC (rev 6673)
+++ trunk/packages/biomaj-watcher/trunk/debian/postinst	2011-04-27 12:16:27 UTC (rev 6674)
@@ -8,64 +8,52 @@
 case "$1" in
     configure)
 
-biomajwatcher_root="/usr/share/biomaj-watcher"
+      biomajwatcher_root="/usr/share/biomaj-watcher"
+      bmajconf="/etc/biomaj-watcher"
+      bmajroot="/usr/share/biomaj"
 
-bmajconf="/etc/biomaj-watcher"
+      db_get biomaj/login
+      app_login="$RET"
+      db_get biomaj/password
+      app_passwd="$RET"
 
-bmajroot="/usr/share/biomaj"
+      db_get biomaj/ldap
+      use_ldap="$RET"
+      db_get biomaj/ldap_server
+      ldap_host="$RET"
+      db_get biomaj/ldap_dn
+      ldap_dn="$RET"
+      db_get biomaj/ldap_filter
+      opt_filer="$RET"
 
-db_get biomaj/login
-app_login="$RET"
-db_get biomaj/password
-app_passwd="$RET"
+      javac -d $biomajwatcher_root/bin $biomajwatcher_root/bin/WatcherConfigurator.java
 
-db_get biomaj/ldap
-use_ldap="$RET"
-db_get biomaj/ldap_server
-ldap_host="$RET"
-db_get biomaj/ldap_dn
-ldap_dn="$RET"
-db_get biomaj/ldap_filter
-opt_filer="$RET"
+      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 app_passwd:=$app_passwd
 
-# Link general.conf
-cd $biomajwatcher_root
+      # Copy required libs
+      mkdir -p /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib
+      cp /usr/share/java/xercesImpl.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      cp /usr/share/java/commons-lang.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      cp /usr/share/java/commons-logging.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      cp /usr/share/java/jdom1.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      cp /usr/share/java/jsch.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      cp /usr/share/java/log4j-1.2.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      cp /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
 
-javac -d $biomajwatcher_root/bin $biomajwatcher_root/bin/WatcherConfigurator.java
+      cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
 
-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 app_passwd:=$app_passwd
 
-# Copy required libs
-mkdir -p /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib
-cp /usr/share/java/xercesImpl.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
-cp /usr/share/java/commons-lang.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
-cp /usr/share/java/commons-logging.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
-cp /usr/share/java/jdom1.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
-cp /usr/share/java/jsch.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
-cp /usr/share/java/log4j-1.2.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
-cp /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+      chown -R tomcat6 /etc/biomaj/db_properties
+      chmod -R 775 /etc/biomaj/db_properties
+      chown -R tomcat6 /var/log/biomaj
+      chmod -R 775 /var/log/biomaj
+      chown -R tomcat6 /var/lib/biomaj
+      chmod -R 775 /var/lib/biomaj
+      # Update context
+      cp /etc/biomaj-watcher/BmajWatcher*.xml /var/lib/tomcat6/conf/Catalina/localhost/
 
-cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
+      echo "WARNING: tomcat server may need a restart"
 
-cp /etc/biomaj-watcher/BmajWatcher*.xml /var/lib/tomcat6/conf/Catalina/localhost/
-
-TMPZIP=`mktemp -t biomaj-watcher.1.XXXXXX`
-rm $TMPZIP
-cd /usr/share/java/webapps/biomaj-watcher
-zip -r $TMPZIP *
-mv $TMPZIP /var/lib/tomcat6/webapps/BmajWatcher.war
-
-chown -R tomcat6 /etc/biomaj/db_properties
-chmod -R 775 /etc/biomaj/db_properties
-
-chown -R tomcat6 /var/log/biomaj
-chmod -R 775 /var/log/biomaj
-
-chown -R tomcat6 /var/lib/biomaj
-chmod -R 775 /var/lib/biomaj
-
-echo "WARNING: tomcat server may need a restart"
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/packages/biomaj-watcher/trunk/debian/postrm
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postrm	2011-04-27 11:44:27 UTC (rev 6673)
+++ trunk/packages/biomaj-watcher/trunk/debian/postrm	2011-04-27 12:16:27 UTC (rev 6674)
@@ -6,15 +6,13 @@
 . /usr/share/debconf/confmodule
 
 case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-# Remove all
-if [ -e /var/lib/tomcat6/webapps/BmajWatcher.war ]; then
-    rm  /var/lib/tomcat6/webapps/BmajWatcher.war
-fi
+    upgrade)
+    ;;
+    purge|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
 
-if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then
-    rm  /var/lib/tomcat6/shared/biomaj.jar
-fi
+      if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then
+        rm  /var/lib/tomcat6/shared/biomaj.jar
+      fi
     ;;
 
     *)

Modified: trunk/packages/biomaj-watcher/trunk/debian/prerm
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/prerm	2011-04-27 11:44:27 UTC (rev 6673)
+++ trunk/packages/biomaj-watcher/trunk/debian/prerm	2011-04-27 12:16:27 UTC (rev 6674)
@@ -7,26 +7,20 @@
 
 
 case "$1" in
+    upgrade)
+    ;;
     remove|upgrade|deconfigure)
-# Remove post installation created files
+      # Remove post installation created files
 
-# Remove admin credentials
-if [ -e /usr/share/biomaj/.bmajwatcherpasswd ]; then
-    rm /usr/share/biomaj/.bmajwatcherpasswd
-fi
+      # Remove admin credentials
+      if [ -e /usr/share/biomaj/.bmajwatcherpasswd ]; then
+         rm /usr/share/biomaj/.bmajwatcherpasswd
+      fi
 
-if [ -e /var/lib/tomcat6/conf/Catalina/localhost/BmajWatcher.xml ]; then
-    rm /var/lib/tomcat6/conf/Catalina/localhost/BmajWatcher.xml
-fi
+      if [ -e /usr/share/biomaj-watcher/bin/WatcherConfigurator.class ]; then
+         rm /usr/share/biomaj-watcher/bin/WatcherConfigurator.class
+      fi
 
-if [ -e /var/lib/tomcat6/conf/Catalina/localhost/BmajWatcher#logs.xml ]; then
-    rm /var/lib/tomcat6/conf/Catalina/localhost/BmajWatcher#logs.xml
-fi
-
-if [ -e /usr/share/biomaj-watcher/bin/WatcherConfigurator.class ]; then
-    rm /usr/share/biomaj-watcher/bin/WatcherConfigurator.class
-fi
-
     ;;
 
     failed-upgrade)




More information about the debian-med-commit mailing list