perfsonar development work

Author: nordunet.behrmann
Date: 2012-08-17 09:47:17 +0100 (Fri, 17 Aug 2012)
New Revision: 5957

Added:
   
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/perfsonar-java-rrd-ma.xml
Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postinst
   trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postrm
Log:
perfsonar-java-rrd-ma-SQL_backend: Package for Tomcat 6 on Debian

Since Tomcat 5.5 is no longer available in any supported version of
Debian, this patch packages perfsonar-java-rrd-ma for Tomcat 6 on
Debian.

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control       
2012-08-17 08:47:16 UTC (rev 5956)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/control       
2012-08-17 08:47:17 UTC (rev 5957)
@@ -2,11 +2,11 @@
 Section: web
 Priority: extra
 Maintainer: Piotr Pikusa 
<>
-Build-Depends: debhelper (>= 5), maven2
+Build-Depends: debhelper (>= 5), maven | maven2
 Standards-Version: 3.7.2
 
 Package: perfsonar-java-rrd-ma
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, tomcat6, rrdtool, 
rrdjtool-debian5|rrdjtool
+Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, java6-runtime, 
tomcat6, rrdtool, rrdjtool-debian5|rrdjtool
 Description: perfSONAR Round Robin Database
 

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install       
2012-08-17 08:47:16 UTC (rev 5956)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/install       
2012-08-17 08:47:17 UTC (rev 5957)
@@ -1,7 +1,7 @@
 build/perfsonar-java-rrd-ma/* 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
 doc /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
 samples /usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF
+debian/perfsonar-java-rrd-ma.xml /etc/tomcat6/Catalina/localhost/
 
 
 
-

Added: 
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/perfsonar-java-rrd-ma.xml
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/perfsonar-java-rrd-ma.xml
                             (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/perfsonar-java-rrd-ma.xml
     2012-08-17 08:47:17 UTC (rev 5957)
@@ -0,0 +1 @@
+<Context path="/perfsonar-java-rrd-ma" 
docBase="/usr/lib/perfsonar/services/perfsonar-java-rrd-ma"/>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postinst
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postinst      
2012-08-17 08:47:16 UTC (rev 5956)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postinst      
2012-08-17 08:47:17 UTC (rev 5957)
@@ -35,7 +35,7 @@
 
     if [ -e /etc/$OLD_SERVICE_NAME ]; then
       rm -rf /etc/$OLD_SERVICE_NAME/*
-    fi    
+    fi
 
     if [ -e /var/log/$OLD_SERVICE_NAME ]; then
       rm -rf /var/log/$OLD_SERVICE_NAME
@@ -45,45 +45,32 @@
       rm -rf /usr/share/doc/$OLD_SERVICE_NAME
     fi
 
-    
-
     #Installing new service
-    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
-    then
-        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
-    fi
-    ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME 
|| true
-
-
     if [ -h /etc/$SERVICENAME ]
     then
         rm /etc/$SERVICENAME
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf 
/etc/$SERVICENAME || true
 
-
     if [ -h /var/log/$SERVICENAME ]
     then
         rm /var/log/$SERVICENAME
     fi
-
     mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
     ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME || 
true
 
-
     if [ -h /usr/share/doc/$SERVICENAME/spec ]
     then
         rm /usr/share/doc/$SERVICENAME/spec
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc 
/usr/share/doc/$SERVICENAME/spec || true
 
+    chown -R tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+    chown tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+    chown tomcat6 /var/run/$SERVICENAME
 
-    chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
-    chown tomcat55 /var/run/$SERVICENAME
-    chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+    service tomcat6 restart
 
-    /etc/init.d/tomcat5.5 restart
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postrm
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postrm        
2012-08-17 08:47:16 UTC (rev 5956)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/deb/postrm        
2012-08-17 08:47:17 UTC (rev 5957)
@@ -26,11 +26,6 @@
 case "$1" in
     purge)
 
-    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
-    then
-        rm -rf /var/lib/tomcat5.5/webapps/$SERVICENAME
-    fi
-
     if [ -h /etc/$SERVICENAME ]
     then
         rm -rf /etc/$SERVICENAME
@@ -49,19 +44,14 @@
 
     rm -rf $SERVICEPATH/$SERVICENAME
 
-    /etc/init.d/tomcat5.5 restart
+    service tomcat6 restart
     ;;
 
 
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
-    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
-    then
-        rm -rf /var/lib/tomcat5.5/webapps/$SERVICENAME
-    fi
-
-    /etc/init.d/tomcat5.5 restart
+    service tomcat6 restart
     ;;
 
     *)