[med-svn] r7479 - in trunk/packages/biomaj-watcher/trunk/debian: . po

[olivier sallou]

Author: osallou-guest
Date: 2011-08-19 11:42:52 +0000 (Fri, 19 Aug 2011)
New Revision: 7479

Modified:
   trunk/packages/biomaj-watcher/trunk/debian/changelog
   trunk/packages/biomaj-watcher/trunk/debian/config
   trunk/packages/biomaj-watcher/trunk/debian/po/fr.po
   trunk/packages/biomaj-watcher/trunk/debian/po/templates.pot
   trunk/packages/biomaj-watcher/trunk/debian/postinst
   trunk/packages/biomaj-watcher/trunk/debian/postrm
   trunk/packages/biomaj-watcher/trunk/debian/templates
Log:
update to 1.1

Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/changelog	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/changelog	2011-08-19 11:42:52 UTC (rev 7479)
@@ -1,4 +1,4 @@
-biomaj-watcher (1.1.0-2) UNRELEASED; urgency=low
+biomaj-watcher (1.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release with new features (multi tenant, private banks...)
 

Modified: trunk/packages/biomaj-watcher/trunk/debian/config
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/config	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/config	2011-08-19 11:42:52 UTC (rev 7479)
@@ -8,8 +8,8 @@
 db_go
 
 # admin passwd
-db_input critical biomaj/password || true
-db_go
+#db_input critical biomaj/password || true
+#db_go
 
 # Configure LDAP ?
 db_input critical biomaj/ldap || true

Modified: trunk/packages/biomaj-watcher/trunk/debian/po/fr.po
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/po/fr.po	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/po/fr.po	2011-08-19 11:42:52 UTC (rev 7479)
@@ -23,8 +23,8 @@
 #. Type: password
 #. Description
 #: ../templates:3001
-msgid "Administration interface admin password:"
-msgstr "Mot de passe administrateur"
+#msgid "Administration interface admin password:"
+#msgstr "Mot de passe administrateur"
 
 #. Type: boolean
 #. Description

Modified: trunk/packages/biomaj-watcher/trunk/debian/po/templates.pot
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/po/templates.pot	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/po/templates.pot	2011-08-19 11:42:52 UTC (rev 7479)
@@ -25,8 +25,8 @@
 #. Type: password
 #. Description
 #: ../templates:3001
-msgid "Administration interface admin password:"
-msgstr "Mot de passe administrateur"
+#msgid "Administration interface admin password:"
+#msgstr "Mot de passe administrateur"
 
 #. Type: boolean
 #. Description

Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postinst	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/postinst	2011-08-19 11:42:52 UTC (rev 7479)
@@ -14,8 +14,6 @@
 
       db_get biomaj/login
       app_login="$RET"
-      db_get biomaj/password
-      app_passwd="$RET"
 
       db_get biomaj/ldap
       use_ldap="$RET"
@@ -26,7 +24,7 @@
       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
+      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
@@ -45,21 +43,25 @@
       ln -s /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
 
       #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
-      ln -s /usr/share/biomaj/lib/biomaj.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
+      rm -f /var/lib/tomcat6/shared/biomaj.jar
+      ln -s /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/biomaj.jar
 
 
       chown -R tomcat6 /etc/biomaj/db_properties
       chown -R tomcat6 /usr/share/java/webapps/biomaj-watcher
       chmod -R 775 /etc/biomaj/db_properties
       chown -R tomcat6 /var/log/biomaj
-      chmod -R 664 /var/log/biomaj
+      chmod -R 775 /var/log/biomaj
       chown -R tomcat6 /var/lib/biomaj
       chmod -R 775 /var/lib/biomaj
       chown -R tomcat6 /etc/biomaj-watcher
       # Update context
       java -cp $biomajwatcher_root/bin UpdateToBiomaj1_2 /usr/share/java/webapps/biomaj-watcher admin
-      cp /etc/biomaj-watcher/BmajWatcher*.xml /var/lib/tomcat6/conf/Catalina/localhost/
+      #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
 
       service tomcat6 restart
 

Modified: trunk/packages/biomaj-watcher/trunk/debian/postrm
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postrm	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/postrm	2011-08-19 11:42:52 UTC (rev 7479)
@@ -13,6 +13,9 @@
       if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then
         rm  /var/lib/tomcat6/shared/biomaj.jar
       fi
+      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml
+      rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
+      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/*.jar
     ;;
 
     *)

Modified: trunk/packages/biomaj-watcher/trunk/debian/templates
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/templates	2011-08-19 11:21:32 UTC (rev 7478)
+++ trunk/packages/biomaj-watcher/trunk/debian/templates	2011-08-19 11:42:52 UTC (rev 7479)
@@ -1,10 +1,11 @@
 Template: biomaj/login
 Type: string
+Default: admin
 _Description: Administration interface admin login:
 
-Template: biomaj/password
-Type: password
-_Description: Administration interface admin password:
+#Template: biomaj/password
+#Type: password
+#_Description: Administration interface admin password:
 
 Template: biomaj/ldap
 Type: boolean