perfsonar development work

Author: psnc.pikusa
Date: 2010-02-18 15:24:46 +0000 (Thu, 18 Feb 2010)
New Revision: 5491

Modified:
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/files
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postinst
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postrm
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/rules
Log:
Changes made to make dir structures compatible with new base2 stucture and 
new naming policy. Also changes impact on old version - removing old version 
with old name from 
tomcat/webapps directory and /etc/
 and /usr/doc/


Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/files
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/files 
2010-02-18 15:05:49 UTC (rev 5490)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/files 
2010-02-18 15:24:46 UTC (rev 5491)
@@ -1 +1 @@
-ps-mdm-rrd-ma_4.0-1_all.deb web extra
+perfsonar-java-rrd-ma_3.3-1_all.deb web extra

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postinst    
  2010-02-18 15:05:49 UTC (rev 5490)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postinst    
  2010-02-18 15:24:46 UTC (rev 5491)
@@ -25,13 +25,65 @@
 case "$1" in
     configure)
 
+
+    #Bug fix for a previous package version,
+    #where symbolic links where not removed on package removal
+    OLD_SERVICE_NAME=geant2-java-rrd-ma
+    if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
+      rm -rf /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
+    fi
+
+    if [ -e /etc/$OLD_SERVICE_NAME ]; then
+      rm -rf /etc/$OLD_SERVICE_NAME/*
+    fi    
+
+    if [ -e /var/log/$OLD_SERVICE_NAME ]; then
+      rm -rf /var/log/$OLD_SERVICE_NAME
+    fi
+
+    if [ -e /usr/share/doc/$OLD_SERVICE_NAME ]; then
+      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 tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
     chown tomcat55 /var/run/$SERVICENAME
     chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
 
     /etc/init.d/tomcat5.5 restart
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postrm
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postrm      
  2010-02-18 15:05:49 UTC (rev 5490)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postrm      
  2010-02-18 15:24:46 UTC (rev 5491)
@@ -25,6 +25,7 @@
 
 case "$1" in
     purge)
+
     if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
     then
         rm -rf /var/lib/tomcat5.5/webapps/$SERVICENAME
@@ -45,9 +46,22 @@
     then
         rm -rf         /usr/share/doc/$SERVICENAME/spec
     fi
+
+    rm -rf $SERVICEPATH/$SERVICENAME
+
+    /etc/init.d/tomcat5.5 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
     ;;
 
     *)

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/rules
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/rules 
2010-02-18 15:05:49 UTC (rev 5490)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/rules 
2010-02-18 15:24:46 UTC (rev 5491)
@@ -17,7 +17,7 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       mvn package
+       #mvn package
 
        touch $@
 
@@ -25,7 +25,7 @@
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       rm -rf build
+       #rm -rf build
        dh_clean 
 
 install: build