Author: osallou Date: 2014-12-15 09:41:55 +0000 (Mon, 15 Dec 2014) New Revision: 18537
Added: trunk/packages/biomaj-watcher/trunk/debian/patches/use_tomcat8 Modified: trunk/packages/biomaj-watcher/trunk/debian/README.Debian trunk/packages/biomaj-watcher/trunk/debian/changelog trunk/packages/biomaj-watcher/trunk/debian/control trunk/packages/biomaj-watcher/trunk/debian/patches/series trunk/packages/biomaj-watcher/trunk/debian/postinst trunk/packages/biomaj-watcher/trunk/debian/postrm trunk/packages/biomaj-watcher/trunk/debian/setperms.sh Log: fix 769348 to switch to tomcat8 Modified: trunk/packages/biomaj-watcher/trunk/debian/README.Debian =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/README.Debian 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/README.Debian 2014-12-15 09:41:55 UTC (rev 18537) @@ -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. Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/changelog 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/changelog 2014-12-15 09:41:55 UTC (rev 18537) @@ -1,3 +1,9 @@ +biomaj-watcher (1.2.2-2) unstable; urgency=medium + + * Switch to Tomcat 8 (Closes: #769348). + + -- Olivier Sallou <[email protected]> Mon, 15 Dec 2014 08:03:09 +0100 + biomaj-watcher (1.2.2-1) unstable; urgency=medium * New usptream release: Modified: trunk/packages/biomaj-watcher/trunk/debian/control =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/control 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/control 2014-12-15 09:41:55 UTC (rev 18537) @@ -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 Modified: trunk/packages/biomaj-watcher/trunk/debian/patches/series =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/patches/series 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/patches/series 2014-12-15 09:41:55 UTC (rev 18537) @@ -1 +1,2 @@ prevent_jobs_file_move +use_tomcat8 Added: trunk/packages/biomaj-watcher/trunk/debian/patches/use_tomcat8 =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/patches/use_tomcat8 (rev 0) +++ trunk/packages/biomaj-watcher/trunk/debian/patches/use_tomcat8 2014-12-15 09:41:55 UTC (rev 18537) @@ -0,0 +1,17 @@ +Subject: adapt xml for Tomcat8 +Description: use tomcat8, this impact the context descriptor +Author: Olivier Sallou <[email protected]> +Last-Updated: 2014-12-15 +Forwarded: No +--- a/usr/share/biomaj-watcher/bin/WatcherConfigurator.java ++++ b/usr/share/biomaj-watcher/bin/WatcherConfigurator.java +@@ -45,7 +45,8 @@ + PrintWriter pw = new PrintWriter(biomajConf + "/BmajWatcher.xml"); + + 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("<Context path=\"/BmajWatcher\" docBase=\"/usr/share/java/webapps/biomaj-watcher\" reloadable=\"false\" >"); ++ pw.println("<Resources allowLinking=\"true\"/>"); + + pw.println("<Parameter name=\"ADMIN_LOGIN\" value=\"" + params.get("app_login") + "\" override=\"false\"/>"); + Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/postinst 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/postinst 2014-12-15 09:41:55 UTC (rev 18537) @@ -49,8 +49,8 @@ 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 + #rm -f /var/lib/tomcat6/shared/biomaj.jar + #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/biomaj.jar # Install latest definition cp /usr/share/java/webapps/biomaj-watcher/jobs.xsd /etc/biomaj-watcher/jobs.xsd @@ -62,24 +62,17 @@ # Update logs set_perms /var/log/biomaj - #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 775 /var/log/biomaj - #chown -R tomcat6 /var/lib/biomaj - #chmod -R 775 /var/lib/biomaj - chown -R tomcat6 /etc/biomaj-watcher + chown -R tomcat8 /usr/share/java/webapps/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 + 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 ;; Modified: trunk/packages/biomaj-watcher/trunk/debian/postrm =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/postrm 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/postrm 2014-12-15 09:41:55 UTC (rev 18537) @@ -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 - fi - rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml - rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml + #if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then + # rm /var/lib/tomcat6/shared/biomaj.jar + #fi + 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 - fi - rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml - rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml + #if [ -e /var/lib/tomcat6/shared/biomaj.jar ]; then + # rm /var/lib/tomcat6/shared/biomaj.jar + #fi + 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 Modified: trunk/packages/biomaj-watcher/trunk/debian/setperms.sh =================================================================== --- trunk/packages/biomaj-watcher/trunk/debian/setperms.sh 2014-12-14 12:23:05 UTC (rev 18536) +++ trunk/packages/biomaj-watcher/trunk/debian/setperms.sh 2014-12-15 09:41:55 UTC (rev 18537) @@ -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 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
