perfsonar development work

Author: psnc.pikusa
Date: 2010-02-17 13:14:14 +0000 (Wed, 17 Feb 2010)
New Revision: 5487

Modified:
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/control
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/dirs
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/install
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postinst
   branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postrm
Log:
Update files to prepare release and package of perfsonar-java-rrd-ma v 3.3 
with new base2. 


Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/control
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/control     
  2010-02-17 12:38:23 UTC (rev 5486)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/control     
  2010-02-17 13:14:14 UTC (rev 5487)
@@ -1,12 +1,12 @@
-Source: ps-mdm-rrd-ma
+Source: perfsonar-java-rrd-ma
 Section: web
 Priority: extra
-Maintainer: Roman Lapacz 
<>
+Maintainer: Piotr Pikusa 
<>
 Build-Depends: debhelper (>= 5), maven2
 Standards-Version: 3.7.2
 
-Package: ps-mdm-rrd-ma
+Package: perfsonar-java-rrd-ma
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5-exist, rrdjtool
+Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5-exist, rrdjtool, 
rrdtool, java6-runtime
 Description: perfSONAR Round Robin Database
 

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/dirs
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/dirs  
2010-02-17 12:38:23 UTC (rev 5486)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/dirs  
2010-02-17 13:14:14 UTC (rev 5487)
@@ -1,2 +1,2 @@
-/usr/lib/perfsonar/services/ps-mdm-rrd-ma
-/var/run/ps-mdm-rrd-ma
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+/var/run/perfsonar-java-rrd-ma

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/install
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/install     
  2010-02-17 12:38:23 UTC (rev 5486)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/install     
  2010-02-17 13:14:14 UTC (rev 5487)
@@ -1,6 +1,7 @@
-build/ps-mdm-rrd-ma/* /usr/lib/perfsonar/services/ps-mdm-rrd-ma
-doc /usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF
-samples /usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF
+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
 
 
 
+

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-17 12:38:23 UTC (rev 5486)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postinst    
  2010-02-17 13:14:14 UTC (rev 5487)
@@ -17,35 +17,14 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-SERVICENAME="ps-mdm-rrd-ma"
+SERVICENAME="perfsonar-java-rrd-ma"
 SERVICEPATH="/usr/lib/perfsonar/services"
 
 
 
 case "$1" in
     configure)
-    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

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-17 12:38:23 UTC (rev 5486)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/deb/postrm      
  2010-02-17 13:14:14 UTC (rev 5487)
@@ -19,7 +19,7 @@
 # the debian-policy package
 
 
-SERVICENAME="ps-mdm-rrd-ma"
+SERVICENAME="perfsonar-java-rrd-ma"
 SERVICEPATH="/usr/lib/perfsonar/services"
 
 
@@ -27,23 +27,23 @@
     purge)
     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
 
     if [ -h /etc/$SERVICENAME ]
     then
-        rm /etc/$SERVICENAME
+        rm -rf /etc/$SERVICENAME
     fi
 
     if [ -h /var/log/$SERVICENAME ]
     then
-        rm /var/log/$SERVICENAME
+        rm -rf /var/log/$SERVICENAME
     fi
     rm -fr $SERVICEPATH/$SERVICENAME/WEB-INF/log
 
     if [ -h /usr/share/doc/$SERVICENAME/spec ]
     then
-        rm /usr/share/doc/$SERVICENAME/spec
+        rm -rf         /usr/share/doc/$SERVICENAME/spec
     fi
     ;;