perfsonar development work

Author: psnc.pietrzak
Date: 2010-08-17 18:00:16 +0100 (Tue, 17 Aug 2010)
New Revision: 5723

Added:
   trunk/geant2_java-sshtelnet-mp/packaging/deb/preinst
   trunk/geant2_java-sshtelnet-mp/packaging/deb/prerm
Modified:
   trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
   trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles
   trunk/geant2_java-sshtelnet-mp/packaging/deb/control
   trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/install
   trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
   trunk/geant2_java-sshtelnet-mp/packaging/deb/postrm
   trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
   
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
Log:
Refactored package scripts

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2010-08-17 
16:14:48 UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2010-08-17 
17:00:16 UTC (rev 5723)
@@ -1,3 +1,28 @@
+perfsonar-java-sshtelnet-mp (1.4-0RC3) stable; urgency=low
+
+  * ps-base2 version: 1.0.2
+  * web-admin version: 2.0
+  * Changed to ps-base2 1.0.2
+  * Changed dependency to JRE 1.6
+  * Changed dependency to exist
+           
+ -- Blazej Pietrzak 
<>
  Thu, 3 Feb 2010 17:00:00 +0100
+
+perfsonar-java-sshtelnet-mp (1.4-0RC2) stable; urgency=low
+
+  * ps-base version: 2.0
+  * web-admin version: 2.0
+  * Bug fix
+  * Updated contact information in documentation files
+  * Removed Components.Properties Configuration Files for SSHTelnet 1.0.doc
+  * Removed Service.Properties Configuration Files for SSHTelnet 1.0.doc
+  * Removed Installation Actions for SSHTelnet 1.0.doc
+  * Changed to ps-base 2.0
+  * Changed to web-admin 2.0
+  * Migrated to Maven 2
+           
+ -- Blazej Pietrzak 
<>
  Thu, 3 Feb 2010 17:00:00 +0100
+
 perfsonar-java-sshtelnet-mp (1.3.4.2) stable; urgency=low
 
   * ps-base version: 1.0.20080902

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles      2010-08-17 
16:14:48 UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles      2010-08-17 
17:00:16 UTC (rev 5723)
@@ -1,6 +1,3 @@
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/components.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/service.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/servlet.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/wizard.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/web.xml
+/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/configuration.xml
+/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp/WEB-INF/classes/log4j.xml

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/control
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/control        2010-08-17 
16:14:48 UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/control        2010-08-17 
17:00:16 UTC (rev 5723)
@@ -2,14 +2,14 @@
 Section: web
 Priority: extra
 Maintainer: Blazej Pietrzak 
<>
-Build-Depends: debhelper (>= 5), sun-java5-jdk | sun-java6-jdk
+Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 
 Package: perfsonar-java-sshtelnet-mp
 Architecture: all
 Conflicts: ps-mdm-sshtelnet-mp
 Replaces: ps-mdm-sshtelnet-mp
-Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, tomcat5.5-exist, 
java5-runtime | java6-runtime | java-virtual-machine
+Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, exist, java6-runtime
 Description: The purpose of and the desired functionality expected from the 
perfSONAR SSH/Telnet MP is that it 
  should be able to contact underlying hardware devices, and execute 
show-like commands on. It should primarily serve 
  NOC's, whom would be able to use a Looking Glass-style client to request 
real-time configuration information about 

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs   2010-08-17 16:14:48 
UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs   2010-08-17 17:00:16 
UTC (rev 5723)
@@ -1,2 +1 @@
-/etc/ps-mdm-sshtelnet-mp
-/var/lib/ps-mdm-sshtelnet-mp
+/etc/perfsonar-java-sshtelnet-mp
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2010-08-17 16:14:48 
UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2010-08-17 17:00:16 
UTC (rev 5723)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4.2/doc/*
\ No newline at end of file
+perfsonar-java-sshtelnet-mp-1.4/doc/*
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/install
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2010-08-17 
16:14:48 UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2010-08-17 
17:00:16 UTC (rev 5723)
@@ -1 +1,2 @@
-geant2_java-sshtelnet-mp/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+perfsonar-java-sshtelnet-mp/* 
/usr/lib/perfsonar/services/perfsonar-java-sshtelnet-mp
+ps-mdm-sshtelnet-mp/* /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2010-08-17 
16:14:48 UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2010-08-17 
17:00:16 UTC (rev 5723)
@@ -20,12 +20,56 @@
 
 case "$1" in
     configure)
-    ln -sf /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5.5/webapps/ps-mdm-sshtelnet-mp
-    ln -sf 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
 /etc/ps-mdm-sshtelnet-mp || true
-    ln -sf /var/log/tomcat5.5 /var/log/ps-mdm-sshtelnet-mp 
-    chown tomcat55 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
-    chown tomcat55 -R 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/
-    /etc/init.d/tomcat5.5 restart
+    
+    sleep 10
+    #Bug fix for a previous package version,
+    #where symbolic links where not removed on package removal
+    OLD_SERVICE_NAME=ps-mdm-sshtelnet-mp
+    if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
+      rm -f /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
+    fi
+    #if [ -e /etc/$OLD_SERVICE_NAME ]; then
+    #  rm -f /etc/$OLD_SERVICE_NAME/*
+    #fi    
+    #if [ -e /var/log/$OLD_SERVICE_NAME ]; then
+    #  rm -rf /var/log/$OLD_SERVICE_NAME
+    #fi
+    
+    SERVICE_NAME=perfsonar-java-sshtelnet-mp
+    
+    # Deploy webapp in Tomcat
+    ln -sf /usr/lib/perfsonar/services/$SERVICE_NAME 
/var/lib/tomcat5.5/webapps/$SERVICE_NAME
+    ln -sf /usr/lib/perfsonar/services/$OLD_SERVICE_NAME 
/var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
+
+    # If the package was removed but not purged configuration files can exist
+    if [ ! -e /etc/$SERVICE_NAME/configuration.xml ]; then
+      ln -sf 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/perfsonar/conf/configuration.xml
 /etc/$SERVICE_NAME/configuration.xml
+    fi
+    if [ ! -e /etc/$SERVICE_NAME/sshtelnetmetadata.xml ]; then
+      ln -sf 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 /etc/$SERVICE_NAME/sshtelnetmetadata.xml
+    fi
+    if [ ! -e /etc/$SERVICE_NAME/log4j.xml ]; then
+      ln -sf 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/log4j.xml 
/etc/$SERVICE_NAME/log4j.xml
+    fi
+    
+    if [ ! -e /var/log/$SERVICE_NAME ]; then
+      mkdir /var/log/$SERVICE_NAME
+    fi
+    
+    chown tomcat55 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/perfsonar/conf/configuration.xml
+    chown tomcat55 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+    chown tomcat55 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+    chown tomcat55 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/log4j.xml
+    
+    chown tomcat55 -R 
/usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF/classes/perfsonar/
+    chown tomcat55 /usr/lib/perfsonar/services/$SERVICE_NAME/WEB-INF
+    chown tomcat55 -R /var/log/$SERVICE_NAME
+
+    /etc/init.d/tomcat5.5 restart    
+    while [ -n "`sudo /etc/init.d/tomcat5.5 status | grep "not running"`" ]; 
do
+       sleep 1
+    done
+    sleep 1
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/postrm
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/postrm 2010-08-17 16:14:48 
UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/postrm 2010-08-17 17:00:16 
UTC (rev 5723)
@@ -18,14 +18,25 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+SERVICE_NAME=perfsonar-java-sshtelnet-mp
+OLD_SERVICE_NAME=ps-mdm-sshtelnet-mp
 
 case "$1" in
-    purge)
-    rm -rf /var/lib/ps-mdm-sshtelnet-mp/*
-    rm -rf /etc/ps-mdm-sshtelnet-mp
+    purge)    
+    rm -rf /var/lib/$SERVICE_NAME/*
+    rm -rf /etc/$SERVICE_NAME
+    rm -rf /var/log/$SERVICE_NAME
     ;;
     
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    
+    # Undeploy webapp in Tomcat
+    if [ -e /var/lib/tomcat5.5/webapps/$SERVICE_NAME ]; then
+      rm -f /var/lib/tomcat5.5/webapps/$SERVICE_NAME
+    fi
+    if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
+      rm -f /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
+    fi    
     ;;
 
     *)

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/preinst
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/preinst                      
          (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/preinst        2010-08-17 
17:00:16 UTC (rev 5723)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# preinst script for geant2-java-xml-ls
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    install|upgrade)   
+    
+    # if Tomcat is running stop it
+    if [ -z "`sudo /etc/init.d/tomcat5.5 status | grep "not running"`" ]; 
then
+        sudo /etc/init.d/tomcat5.5 stop
+       # Just in case, because start-stop-daemon is synchronous
+        while [ -z "`sudo /etc/init.d/tomcat5.5 status | grep "not 
running"`" ]; do
+           sleep 1
+       done
+    fi
+    ;;
+    
+    abort-upgrade)
+    ;;
+    
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+#DEBHELPER#
+exit 0

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb/prerm
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/prerm                        
  (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/prerm  2010-08-17 17:00:16 
UTC (rev 5723)
@@ -0,0 +1,47 @@
+#!/bin/sh
+# prerm script for geant2-java-xml-ls
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+     # if Tomcat is running stop it
+     if [ -z "`sudo /etc/init.d/tomcat5.5 status | grep "not running"`" ]; 
then
+        sudo /etc/init.d/tomcat5.5 stop
+        # Just in case, because start-stop-daemon is synchronous
+        while [ -z "`sudo /etc/init.d/tomcat5.5 status | grep "not 
running"`" ]; do
+            sleep 1
+        done
+    fi
+    ;;
+       
+    failed-upgrade)
+    ;;
+               
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+                                       
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+                                       
+#DEBHELPER#
+                                       
+exit 0
+                                       
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2010-08-17 16:14:48 
UTC (rev 5722)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2010-08-17 17:00:16 
UTC (rev 5723)
@@ -17,11 +17,10 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       ant -f geant2_java-sshtelnet-mp/ant/build.xml webapp-package-create
-
        touch $@
 
 clean: clean-patched unpatch
+
 clean-patched:
        dh_testdir
        dh_testroot

Modified: 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
      2010-08-17 16:14:48 UTC (rev 5722)
+++ 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
      2010-08-17 17:00:16 UTC (rev 5723)
@@ -1,245 +1,310 @@
-
-# This is where all tomcat stuff will be installed
-%define prefix /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
-
-# The full name of your package.
-Name: perfsonar-java-sshtelnet-mp
-
-# Version of the microrelease
-Version: 1.3.4.2
-License: Modified BSD License 
-
-# Package version. Increment if you create a new package of same microrelease
-Release: 1
-
-# short description of the package
-Summary: perfSONAR SSH/Telnet Measurement Point
-
-# The name of the source tarbal
-Source0: %{name}-%{version}.tar.gz
-
-# what should be used for buildpath, you don't need to change this
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-
-# in what RPM group will the RPM be installed, don't need to change
-Group: Network/Web service
-
-# YOU
-packager: Blazej Pietrzak 
<>
-
-# What is the location of the source package
-URL: http://www.perfsonar.org
-
-# Forces to remove the renamed package
-Conflicts: ps-mdm-sshtelnet-mp
-Obsoletes: ps-mdm-sshtelnet-mp
-
-# on what packages should the resulting package depend
-Requires: tomcat5
-Requires: tomcat5-exist
-
-# For what architecture is this package meant
-BuildArch: noarch
-
-# What RPM packages are needed during build
-#BuildRequires: maven2
-
-
-#describe your package here
-%description
-The purpose of and the desired functionality expected from the perfSONAR 
SSH/Telnet MP is that it should be able to contact underlying hardware 
devices, and execute show-like commands on. It should primarily serve NOC's, 
whom would be able to use a Looking Glass-style client to request real-time 
configuration information about those devices.
-
-
-
-%prep
-%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
-%setup -q
-
-
-
-%build
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/ant
-    ant webapp-package-create
-popd
-
-
-
-%install
-# make the directory
-rm -rf $RPM_BUILD_ROOT
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/ps-mdm-sshtelnet-mp
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp
-%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp/schema
-%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp/samples
-%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp/samples/responses
-%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp/samples/requests
-
-# copy the service content to the tomcat webapps directory
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/tmp-webapps/webapps
-    %{__cp} -a  ps-mdm-sshtelnet-mp/* ${RPM_BUILD_ROOT}%{prefix}
-popd
-
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp
-popd
-
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/samples
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/ps-mdm-sshtelnet-mp/samples
-popd
-
-
-
-%post
-## make symlink for easy access to conf
-ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*.properties
 /etc/ps-mdm-sshtelnet-mp
-ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
 /etc/ps-mdm-sshtelnet-mp
-ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*.xml
 /etc/ps-mdm-sshtelnet-mp
-ln -s /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5/webapps/ps-mdm-sshtelnet-mp
-ln -s /var/log/tomcat5 /var/log/ps-mdm-sshtelnet-mp
-## restart tomcat
-/sbin/service tomcat5 restart
-chown tomcat:tomcat -R 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/
-
-
-%preun
-## remove symlink
-%{__rm} -rf %{_sysconfdir}/ps-mdm-sshtelnet-mp/*.properties
-%{__rm} -rf %{_sysconfdir}/ps-mdm-sshtelnet-mp/objects.config
-%{__rm} -rf %{_sysconfdir}/ps-mdm-sshtelnet-mp/*.xml
-%{__rm} -rf %{_var}/log/ps-mdm-sshtelnet-mp
-
-
-%postun
-## restart tomcat
-/sbin/service tomcat5 restart
-
-
-
-%clean
-# clean up the durt
-rm -rf $RPM_BUILD_ROOT
-
-
-
-%files
-%defattr(0644,root,tomcat,0755)
-%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
-%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
-%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
-%{prefix}
-%{_sysconfdir}/ps-mdm-sshtelnet-mp
-/usr/share/doc/ps-mdm-sshtelnet-mp
-/usr/share/doc/ps-mdm-sshtelnet-mp/schema
-/usr/share/doc/ps-mdm-sshtelnet-mp/samples
-/usr/share/doc/ps-mdm-sshtelnet-mp/samples/responses
-/usr/share/doc/ps-mdm-sshtelnet-mp/samples/requests
-
-%changelog
-* Tue Jul 3 2009 Blazej Pietrzak 
<>
 1.3.4.2
-- ps-base version: 1.0.200800902
-- web-admin version: 0.9.3c
-- Removed perfsonar-MDM-3.1 Admin Guide 1.0.pdf from the package
-- Renamed the package from ps-mdm-sshtelnet-mp to perfsonar-java-sshtelnet-mp
-
-* Tue Jan 13 2009 Stijn Melis 
<>
 1.3.4.1
-- ps-base version: 1.0.200800902
-- web-admin version: 0.9.3c
-- Fixed problem with StrictHostKeyChecking
-- Fixed LS registration problem
-- Fixed bug when no devices are configured
-
-* Tue Jan 13 2009 Stijn Melis 
<>
 1.3.4
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.3c
-
-* Fri Dec 19 2008 Stijn Melis 
<>
 1.3.4RC8
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.3c
-- Updated WebAdmin to use 0.9.3c
-- Made sure that the directory for the temporary token files for the MP is 
writeable by the tomcat user
-
-* Thu Nov 27 2008 Stijn Melis 
<>
 1.3.4RC7
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.1c
-- Updated WebAdmin to use 0.9.1c
-- Fixed bug about the test page in the web admin
-- Fixed small issue regarding logging information when a telnet session 
isn't successfully established
-
-* Tue Oct 28 2008 Stijn Melis 
<>
 1.3.4RC6
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.0c
-- Updated WebAdmin to use 0.9.0c
-
-* Wed Oct 22 2008 Stijn Melis 
<>
 1.3.4RC5
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.7b
-- Fixed paths for logging when using deb file
-- Updated WebAdmin to use 0.9.7b
-
-* Wed Oct 15 2008 Stijn Melis 
<>
 1.3.4RC4
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.6b
-- Fixed some descriptions in the WebAdmin
-
-* Mon Oct 13 2008 Stijn Melis 
<>
 1.3.4RC3
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.6b
-- Changed LS registration rating to 90000ms
-- Fixed paths for logging
-- Fixed bug in self-test
-
-* Tue Sep 30 2008 Stijn Melis 
<>
 1.3.4RC2
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.6b
-
-* Wed Sep 17 2008 Stijn Melis 
<>
 1.3.4RC1
-- ps-base version: 1.0.20080902
-- web-admin version: 0.9.3b
-- added selftest and syslogging
-- updated webadmin
-
-* Wed Jun 18 2008 Stijn Melis 
<>
 1.3.3
-- ps-base version: 1.0.20080310
-- web-admin version: 0.8.3b
-- fixed the design flaw which was related to the command parameters (had to 
update the list of commands for this)
-- added a parameter to the service.properties file, which defines a 
directory to put the temporary token files
-
-* Fri Jun 06 2008 Stijn Melis 
<>
 1.3.2
-- ps-base version: 1.0.20080310
-- web-admin version: 0.8.3b
-- fixed the bug which prevented the SSHTELNET MP from registering to the LS
-
-* Wed May 28 2008 Stijn Melis 
<>
 1.3.1
-- ps-base version: 1.0.20080310
-- web-admin version: 0.8.3b
-- fixed the bug in the service.properties and wizard.properties files which 
prevented the Authentication to work properly
-- removed some unnecessary logging entries in some classes (too much 
printlns which don't really add anything useful)
-
-* Mon May 05 2008 Stijn Melis 
<>
 1.3
-- ps-base version: 1.0.20080310
-- web-admin version: 0.8.3b
-- fixed the bug which prevented the MP from connecting to the eXist database
-- fixed the bug which removed the groups in the webadmin once it was used 
once 
-
-* Thu Mar 27 2008 Stijn Melis 
<>
 1.3RC4
-- ps-base version: 1.0.20080310
-- web-admin version: 0.8b
-- no further fixes
-
-* Thu Mar 06 2008 Stijn Melis 
<>
 1.3RC3
-- fixed timeout bug in the telnet side of the SSHTELNET MP
-
-* Mon Mar 03 2008 Stijn Melis 
<>
 1.3RC2
-- fixed bug in the service.properties file
-
-* Wed Feb 06 2008 Stijn Melis 
<>
 1.3RC1
-- added Authentication
-- changed eventTypes to be URL based
-- changed metadata configuration to XML (now uses eXist database)
-- added timeout parameter
-- added maximum number of users parameter
-- added web admin interface
-- installation is now rpm based
-- updated command list
- 
+# This is where all tomcat stuff will be installed
+%define prefix /usr/lib/perfsonar/services
+%define old_service_name ps-mdm-sshtelnet-mp
+%define webapps_path /var/lib/tomcat5/webapps
+
+%define stop_tomcat()\
+if [ -n "`/sbin/service tomcat5 status|grep running`" ]; then\
+    /sbin/service tomcat5 stop\
+fi\
+while [ -n "`/sbin/service tomcat5 status|grep running`" ]; do\
+    sleep 1\
+done
+
+%define restart_tomcat()\
+/sbin/service tomcat5 restart
+
+%define is_post_upgrade $1 -gt 1
+
+%define deploy_webapp %{__ln_s} -f %{prefix}/%{name} %{webapps_path}/%{name}
+
+%define wait_until_webapp_undeployed while [ -e %{webapps_path}/%{name} ]; 
do sleep 1; done
+
+%define if_upgrade_deploy_webapp()\
+if [ %{is_post_upgrade} ]; then\
+    (%{wait_until_webapp_undeployed}; %{deploy_webapp}) &\
+fi
+
+# The full name of your package.
+Name: perfsonar-java-sshtelnet-mp
+
+# Version of the microrelease
+Version: 1.4
+License: Modified BSD License 
+
+# Package version. Increment if you create a new package of same microrelease
+Release: 3rc2
+
+# short description of the package
+Summary: perfSONAR SSH/Telnet Measurement Point
+
+# The name of the source tarbal
+Source0: %{name}-%{version}.war
+Source1: %{old_service_name}-%{version}.war
+
+# what should be used for buildpath, you don't need to change this
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
+
+# in what RPM group will the RPM be installed, don't need to change
+Group: Network/Web service
+
+# YOU
+packager: Blazej Pietrzak 
<>
+
+# What is the location of the source package
+URL: http://www.perfsonar.org
+
+# Forces to remove the renamed package
+Conflicts: ps-mdm-sshtelnet-mp
+Obsoletes: ps-mdm-sshtelnet-mp
+
+# on what packages should the resulting package depend
+Requires: jre >= 1.6
+Requires: tomcat5
+Requires: exist
+
+# For what architecture is this package meant
+BuildArch: noarch
+
+# What RPM packages are needed during build
+#BuildRequires: maven2
+
+
+#describe your package here
+%description
+The purpose of and the desired functionality expected from the perfSONAR 
SSH/Telnet MP is that it should be able to contact underlying hardware 
devices, and execute show-like commands on. It should primarily serve NOC's, 
whom would be able to use a Looking Glass-style client to request real-time 
configuration information about those devices.
+
+
+%prep
+#if [ -e ${RPM_BUILD_DIR}/%{name}-%{version} ]; then
+#  %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+#fi
+#mkdir ${RPM_BUILD_DIR}/%{name}-%{version}
+#pushd ${RPM_BUILD_DIR}/%{name}-%{version}
+#  gzip -d ${RPM_SOURCE_DIR}/%{name}-%{version}.war
+#popd
+#%setup -q
+
+
+%build
+# pushd ${RPM_BUILD_DIR}/%{name}-%{version}/ant
+#    ant webapp-package-create
+# popd
+
+
+%install
+# make the directory structure and set attributes (chmod)
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/%{old_service_name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples
+%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/responses
+%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/requests
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{webapps_path}
+
+# copy the service content to the tomcat webapps directory
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}-%{release}
+    %{__cp} -a * ${RPM_BUILD_ROOT}%{prefix}/%{name}
+popd
+
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}-%{release}/WEB-INF/doc
+    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+popd
+
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}-%{release}/WEB-INF/samples
+    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples
+popd
+                                                                             
   
+# redirector servlet
+pushd ${RPM_BUILD_DIR}/%{old_service_name}-%{version}-%{release}
+    %{__cp} -a * ${RPM_BUILD_ROOT}/%{prefix}/%{old_service_name}
+popd
+
+# create symlinks for config files
+pushd ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
+    %{__ln_s} -f 
%{prefix}/%{name}/WEB-INF/classes/perfsonar/conf/configuration.xml 
configuration.xml
+    %{__ln_s} -f 
%{prefix}/%{name}/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml 
sshtelnetmetadata.xml
+    %{__ln_s} -f %{prefix}/%{name}/WEB-INF/classes/log4j.xml log4j.xml
+popd
+
+# deploy webapp
+%{__ln_s} -f %{prefix}/%{name} ${RPM_BUILD_ROOT}%{webapps_path}/%{name}
+%{__ln_s} -f %{prefix}/%{old_service_name} 
${RPM_BUILD_ROOT}%{webapps_path}/%{old_service_name}
+
+# create log dir
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/log/%{name}
+
+
+
+%pre
+%{stop_tomcat}
+
+
+%post
+%{if_upgrade_deploy_webapp}
+%{restart_tomcat}
+
+
+%preun
+%{stop_tomcat}
+
+
+%postun
+%{restart_tomcat}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(0644,root,tomcat,0755)
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/%{name}/WEB-INF/classes/perfsonar/conf/configuration.xml
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/%{name}/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/%{name}/WEB-INF/classes/log4j.xml
+%attr(640,tomcat,tomcat) 
%{prefix}/%{name}/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+#%attr(740,tomcat,tomcat) %{prefix}/%{name}/WEB-INF/classes/perfsonar
+%{prefix}/%{name}
+%{prefix}/%{old_service_name}
+/usr/share/doc/%{name}
+/usr/share/doc/%{name}/schema
+/usr/share/doc/%{name}/samples
+/usr/share/doc/%{name}/samples/responses
+/usr/share/doc/%{name}/samples/requests
+%attr(-,tomcat,tomcat) /var/log/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/configuration.xml
+%config(noreplace) %{_sysconfdir}/%{name}/sshtelnetmetadata.xml
+%config(noreplace) %{_sysconfdir}/%{name}/log4j.xml
+%{webapps_path}/%{name}
+%{webapps_path}/%{old_service_name}
+
+
+%changelog
+* Thu Feb 3 2010 Blazej Pietrzak 
<>
 1.4-3rc2
+- ps-base2 version: 1.0.2
+- web-admin2 version: 0.1
+- Changed dependency to JRE 1.6
+- Changed dependency to exist
+
+* Thu Feb 3 2010 Blazej Pietrzak 
<>
 1.4
+- ps-base2 version: 0.0.3
+- web-admin2 version: 0.1
+- Bug fix
+- Updated contact information in documentation files
+- Removed Components.Properties Configuration Files for SSHTelnet 1.0.doc
+- Removed Service.Properties Configuration Files for SSHTelnet 1.0.doc
+- Removed Installation Actions for SSHTelnet 1.0.doc
+- Changed to ps-base2
+- Changed to web-admin2
+- Migrated to Maven 2
+
+* Tue Jul 3 2009 Blazej Pietrzak 
<>
 1.3.4.2
+- ps-base version: 1.0.200800902
+- web-admin version: 0.9.3c
+- Removed perfsonar-MDM-3.1 Admin Guide 1.0.pdf from the package
+- Renamed the package from ps-mdm-sshtelnet-mp to perfsonar-java-sshtelnet-mp
+
+* Tue Jan 13 2009 Stijn Melis 
<>
 1.3.4.1
+- ps-base version: 1.0.200800902
+- web-admin version: 0.9.3c
+- Fixed problem with StrictHostKeyChecking
+- Fixed LS registration problem
+- Fixed bug when no devices are configured
+
+* Tue Jan 13 2009 Stijn Melis 
<>
 1.3.4
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.3c
+
+* Fri Dec 19 2008 Stijn Melis 
<>
 1.3.4RC8
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.3c
+- Updated WebAdmin to use 0.9.3c
+- Made sure that the directory for the temporary token files for the MP is 
writeable by the tomcat user
+
+* Thu Nov 27 2008 Stijn Melis 
<>
 1.3.4RC7
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.1c
+- Updated WebAdmin to use 0.9.1c
+- Fixed bug about the test page in the web admin
+- Fixed small issue regarding logging information when a telnet session 
isn't successfully established
+
+* Tue Oct 28 2008 Stijn Melis 
<>
 1.3.4RC6
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.0c
+- Updated WebAdmin to use 0.9.0c
+
+* Wed Oct 22 2008 Stijn Melis 
<>
 1.3.4RC5
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.7b
+- Fixed paths for logging when using deb file
+- Updated WebAdmin to use 0.9.7b
+
+* Wed Oct 15 2008 Stijn Melis 
<>
 1.3.4RC4
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.6b
+- Fixed some descriptions in the WebAdmin
+
+* Mon Oct 13 2008 Stijn Melis 
<>
 1.3.4RC3
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.6b
+- Changed LS registration rating to 90000ms
+- Fixed paths for logging
+- Fixed bug in self-test
+
+* Tue Sep 30 2008 Stijn Melis 
<>
 1.3.4RC2
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.6b
+
+* Wed Sep 17 2008 Stijn Melis 
<>
 1.3.4RC1
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.3b
+- added selftest and syslogging
+- updated webadmin
+
+* Wed Jun 18 2008 Stijn Melis 
<>
 1.3.3
+- ps-base version: 1.0.20080310
+- web-admin version: 0.8.3b
+- fixed the design flaw which was related to the command parameters (had to 
update the list of commands for this)
+- added a parameter to the service.properties file, which defines a 
directory to put the temporary token files
+
+* Fri Jun 06 2008 Stijn Melis 
<>
 1.3.2
+- ps-base version: 1.0.20080310
+- web-admin version: 0.8.3b
+- fixed the bug which prevented the SSHTELNET MP from registering to the LS
+
+* Wed May 28 2008 Stijn Melis 
<>
 1.3.1
+- ps-base version: 1.0.20080310
+- web-admin version: 0.8.3b
+- fixed the bug in the service.properties and wizard.properties files which 
prevented the Authentication to work properly
+- removed some unnecessary logging entries in some classes (too much 
printlns which don't really add anything useful)
+
+* Mon May 05 2008 Stijn Melis 
<>
 1.3
+- ps-base version: 1.0.20080310
+- web-admin version: 0.8.3b
+- fixed the bug which prevented the MP from connecting to the eXist database
+- fixed the bug which removed the groups in the webadmin once it was used 
once 
+
+* Thu Mar 27 2008 Stijn Melis 
<>
 1.3RC4
+- ps-base version: 1.0.20080310
+- web-admin version: 0.8b
+- no further fixes
+
+* Thu Mar 06 2008 Stijn Melis 
<>
 1.3RC3
+- fixed timeout bug in the telnet side of the SSHTELNET MP
+
+* Mon Mar 03 2008 Stijn Melis 
<>
 1.3RC2
+- fixed bug in the service.properties file
+
+* Wed Feb 06 2008 Stijn Melis 
<>
 1.3RC1
+- added Authentication
+- changed eventTypes to be URL based
+- changed metadata configuration to XML (now uses eXist database)
+- added timeout parameter
+- added maximum number of users parameter
+- added web admin interface
+- installation is now rpm based
+- updated command list
+