[med-svn] r7897 - in trunk/packages/biomaj-watcher/trunk/debian: . patches

[olivier sallou]

Author: osallou-guest
Date: 2011-09-22 13:33:35 +0000 (Thu, 22 Sep 2011)
New Revision: 7897

Added:
   trunk/packages/biomaj-watcher/trunk/debian/patches/
   trunk/packages/biomaj-watcher/trunk/debian/patches/fix_config_load
   trunk/packages/biomaj-watcher/trunk/debian/patches/series
Modified:
   trunk/packages/biomaj-watcher/trunk/debian/changelog
Log:
fix context.xml param loading

Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/changelog	2011-09-20 20:58:57 UTC (rev 7896)
+++ trunk/packages/biomaj-watcher/trunk/debian/changelog	2011-09-22 13:33:35 UTC (rev 7897)
@@ -1,3 +1,9 @@
+biomaj-watcher (1.2.0-2) unstable; urgency=low
+
+  * Fix patch, login and jobs locaiton not taken into account in context xml.
+
+ -- Olivier Sallou <olivier.sallou at irisa.fr>  Fri, 16 Sep 2011 10:32:04 +0200
+
 biomaj-watcher (1.2.0-1) unstable; urgency=low
 
   * New upstream release with new features (multi tenant, private banks...)

Added: trunk/packages/biomaj-watcher/trunk/debian/patches/fix_config_load
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/patches/fix_config_load	                        (rev 0)
+++ trunk/packages/biomaj-watcher/trunk/debian/patches/fix_config_load	2011-09-22 13:33:35 UTC (rev 7897)
@@ -0,0 +1,18 @@
+Author: Olivier Sallou <olivier.sallou at irisa.fr>
+Last-Update: 22-09-2011
+Subject: some context.xml params does not contain override attribute
+Applied-Upstream: 1.2.1
+--- a/usr/share/biomaj-watcher/bin/WatcherConfigurator.java
++++ b/usr/share/biomaj-watcher/bin/WatcherConfigurator.java
+@@ -47,9 +47,9 @@
+ 			pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ 			pw.println("<Context path=\"/BmajWatcher\" docBase=\"/usr/share/java/webapps/biomaj-watcher\"  reloadable=\"false\" allowLinking=\"true\">");
+ 
+-			pw.println("<Parameter name=\"ADMIN_LOGIN\" value=\"" + params.get("app_login") + "\"/>");
++			pw.println("<Parameter name=\"ADMIN_LOGIN\" value=\"" + params.get("app_login") + "\" override=\"false\"/>");
+ 			
+-			pw.println("<Parameter name=\"JOBS_LOCATION\" value=\"/etc/biomaj-watcher\"/>");
++			pw.println("<Parameter name=\"JOBS_LOCATION\" value=\"/etc/biomaj-watcher\" override=\"false\"/>");
+ 			
+ 			pw.println("<!-- ENV VARIABLES -->");
+ 			pw.println("<Parameter name=\"BIOMAJ_ROOT\" value=\"" + biomajRoot + "\" override=\"false\"/>");

Added: trunk/packages/biomaj-watcher/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/biomaj-watcher/trunk/debian/patches/series	2011-09-22 13:33:35 UTC (rev 7897)
@@ -0,0 +1 @@
+fix_config_load