perfsonar development work

Author: psnc.trzaszczka
Date: 2010-02-02 15:03:45 +0000 (Tue, 02 Feb 2010)
New Revision: 5476

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst
Log:


Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control   
2010-02-02 13:21:35 UTC (rev 5475)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control   
2010-02-02 15:03:45 UTC (rev 5476)
@@ -1,7 +1,7 @@
 Source: perfsonar-java-xml-ls
 Section: web
 Priority: extra
-Maintainer: Maciej Glowiak 
<>
+Maintainer: Slawomir Trzaszczka 
<>
 Build-Depends: debhelper (>= 5), maven2
 Standards-Version: 3.7.2
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst  
2010-02-02 13:21:35 UTC (rev 5475)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst  
2010-02-02 15:03:45 UTC (rev 5476)
@@ -26,25 +26,25 @@
     configure)
     if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
     then
-        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
+        rm -rf /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
+        rm -rf /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
+        rm -rf /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
+        rm  -rf /usr/share/doc/$SERVICENAME/spec
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc 
/usr/share/doc/$SERVICENAME/spec || true
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst   
2010-02-02 13:21:35 UTC (rev 5475)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst   
2010-02-02 15:03:45 UTC (rev 5476)
@@ -13,11 +13,49 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+SERVICEPATH="/usr/lib/perfsonar/services"
+SERVICENAME="geant2-java-xml-ls"
 
+
+
 case "$1" in
     install|upgrade)
+       
+       /etc/init.d/tomcat5.5 stop
+       
+       echo START
+       
+       if [ -h $SERVICEPATH/$SERVICENAME ]
+    then
+        rm -rf $SERVICEPATH/$SERVICENAME
+    fi
+       
+       if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
+    then
+        rm -rf /var/lib/tomcat5.5/webapps/$SERVICENAME
+    fi
+       
+       if [ -h /usr/share/tomcat5.5/webapps/$SERVICENAME ]
+    then
+        rm -rf /usr/share/tomcat5.5/webapps/$SERVICENAME
+       fi
+       
+       if [ -h /etc/$SERVICENAME ]
+       then
+        rm -rf /etc/$SERVICENAME
+       fi
+
+       if [ -h /var/log/$SERVICENAME ]
+    then
+        rm -rf /var/log/$SERVICENAME
+       fi
+
+       if [ -h /usr/share/doc/$SERVICENAME/spec ]
+    then
+        rm -rf /usr/share/doc/$SERVICENAME/spec
+       fi
+    
     ;;
-
     abort-upgrade)
     ;;