perfsonar development work

Author: psnc.pietrzak
Date: 2010-08-17 16:58:52 +0100 (Tue, 17 Aug 2010)
New Revision: 5721

Added:
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/changelog
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/conffiles
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/control
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/copyright
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/dirs
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/docs
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/install
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postinst
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postrm
   trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/rules
   
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
Removed:
   trunk/geant2_java-sshtelnet-mp/packaging/deb/files
Modified:
   trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
   trunk/geant2_java-sshtelnet-mp/packaging/deb/control
   trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/install
   trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
   trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
Log:
Renamed package to perfsonar-java-sshtelnet-mp

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2010-08-12 
09:59:32 UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2010-08-17 
15:58:52 UTC (rev 5721)
@@ -1,3 +1,14 @@
+perfsonar-java-sshtelnet-mp (1.3.4.2) stable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.3c
+  * Changed Packager name
+  * Renamed the package
+  * Introduced replacing mechanism for package management
+  * Removed perfsonar-MDM-3.1 Admin Guide 1.0.pdf from package
+
+ -- Blazej Pietrzak 
<>
  Thu, 3 Jul 2009 17:00:00 +0200
+
 ps-mdm-sshtelnet-mp (1.3.4.1) stable; urgency=low
 
   * ps-base version: 1.0.200800902

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/control
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/control        2010-08-12 
09:59:32 UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/control        2010-08-17 
15:58:52 UTC (rev 5721)
@@ -1,12 +1,14 @@
-Source: ps-mdm-sshtelnet-mp
+Source: perfsonar-java-sshtelnet-mp
 Section: web
 Priority: extra
-Maintainer: Stijn Melis 
<>
+Maintainer: Blazej Pietrzak 
<>
 Build-Depends: debhelper (>= 5), sun-java5-jdk | sun-java6-jdk
 Standards-Version: 3.7.2
 
-Package: ps-mdm-sshtelnet-mp
+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
 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 

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2010-08-12 09:59:32 
UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2010-08-17 15:58:52 
UTC (rev 5721)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4.1/doc/*
\ No newline at end of file
+ps-mdm-sshtelnet-mp-1.3.4.2/doc/*
\ No newline at end of file

Deleted: trunk/geant2_java-sshtelnet-mp/packaging/deb/files
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/files  2010-08-12 09:59:32 
UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/files  2010-08-17 15:58:52 
UTC (rev 5721)
@@ -1 +0,0 @@
-ps-mdm-sshtelnet-mp_1.3.4.1_all.deb web extra

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/install
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2010-08-12 
09:59:32 UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2010-08-17 
15:58:52 UTC (rev 5721)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4.1/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+geant2_java-sshtelnet-mp/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2010-08-12 09:59:32 
UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2010-08-17 15:58:52 
UTC (rev 5721)
@@ -17,7 +17,7 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       ant -f ps-mdm-sshtelnet-mp-1.3.4.1/ant/build.xml webapp-package-create
+       ant -f geant2_java-sshtelnet-mp/ant/build.xml webapp-package-create
 
        touch $@
 

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/changelog
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/changelog              
                  (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/changelog        
2010-08-17 15:58:52 UTC (rev 5721)
@@ -0,0 +1,166 @@
+ps-mdm-sshtelnet-mp (1.3.4.2) stable; urgency=low
+
+  * ps-base version: 1.0.200800902
+  * web-admin version: 0.9.3c
+  * Dummy package used to rename package to perfsonar-java-sshtelnet-mp
+  
+ -- Blazej Pietrzak 
<>
  Fri, 3 Jul 2009 17:00:00 +0200
+
+
+ps-mdm-sshtelnet-mp (1.3.4.1) stable; urgency=low
+
+  * 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
+  
+ -- Stijn Melis 
<>
  Thu, 26 Mar 2009 12:12:48 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4) stable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.3c
+  
+ -- Stijn Melis 
<>
  Tue, 13 Jan 2009 11:35:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC8) unstable; urgency=low
+
+  * 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
+  
+ -- Stijn Melis 
<>
  Fri, 19 Dec 2008 12:07:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC7) unstable; urgency=low
+
+  * 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
+
+ -- Stijn Melis 
<>
  Thu, 27 Nov 2008 14:37:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC6) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.0c
+  * Fixed paths for logging in the deb file
+  * Updated WebAdmin to use 0.9.0c
+
+ -- Stijn Melis 
<>
  Tue, 28 Oct 2008 10:07:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC5) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.7b
+  * Fixed paths for logging in the deb file
+  * Updated WebAdmin to use 0.9.7b
+
+ -- Stijn Melis 
<>
  Wed, 22 Oct 2008 09:58:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC4) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.6b
+  * Fixed bug with paths in deb file
+  * Fixed some descriptions in the WebAdmin
+
+ -- Stijn Melis 
<>
  Wed, 15 Oct 2008 14:25:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC3) unstable; urgency=low
+
+  * 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
+
+ -- Stijn Melis 
<>
  Mon, 13 Oct 2008 11:40:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC2) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.6b
+
+ -- Stijn Melis 
<>
  Tue, 30 Sep 2008 11:40:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC1) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.3b
+  * added selftest and syslogging
+  * updated webadmin
+
+ -- Stijn Melis 
<>
  Wed, 17 Sep 2008 11:50:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.3) stable; urgency=low
+
+  * 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
+
+ -- Stijn Melis 
<>
  Wed, 18 Jun 2008 11:50:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.2) stable; urgency=low
+
+  * 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
+
+ -- Stijn Melis 
<>
  Fri, 06 Jun 2008 11:42:29 +0200
+
+ps-mdm-sshtelnet-mp (1.3.1) stable; urgency=low
+
+  * 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)
+
+ -- Stijn Melis 
<>
  Wed, 28 May 2008 12:01:28 +0200
+
+ps-mdm-sshtelnet-mp (1.3) stable; urgency=low
+
+  * 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 
+
+ -- Stijn Melis 
<>
  Mon, 05 May 2008 15:12:46 +0200
+
+ps-mdm-sshtelnet-mp (1.3RC4) unstable; urgency=low
+
+  * ps-base version: 1.0.20080310
+  * web-admin version: 0.8b
+  * no further fixes
+
+ -- Stijn Melis 
<>
  Thu, 27 Mar 2008 14:53:12 +0200
+
+ps-mdm-sshtelnet-mp (1.3RC3) unstable; urgency=low
+
+  * fixed timeout bug in the telnet side of the SSHTELNET MP
+
+ -- Stijn Melis 
<>
  Thu, 06 Mar 2008 14:01:00 +0200
+
+ps-mdm-sshtelnet-mp (1.3RC2) unstable; urgency=low
+
+  * fixed bug in the service.properties file
+
+ -- Stijn Melis 
<>
  Mon, 03 Mar 2008  16:07:22 +0200
+
+ps-mdm-sshtelnet-mp (1.3RC1) unstable; urgency=low
+
+  * Initial release
+  * 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
+
+ -- Stijn Melis 
<>
  Wed, Feb 06 2008 13:53:46 +0200

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/conffiles
===================================================================

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/control
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/control                
          (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/control  2010-08-17 
15:58:52 UTC (rev 5721)
@@ -0,0 +1,15 @@
+Source: ps-mdm-sshtelnet-mp
+Section: web
+Priority: extra
+Maintainer: Blazej Pietrzak 
<>
+Build-Depends: debhelper (>= 5), sun-java5-jdk | sun-java6-jdk
+Standards-Version: 3.7.2
+
+Package: ps-mdm-sshtelnet-mp
+Architecture: all
+Depends: perfsonar-java-sshtelnet-mp
+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. This is a dummy package used to rename the package to 
perfsonar-java-sshtelnet-mp
+

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/copyright
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/copyright              
                  (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/copyright        
2010-08-17 15:58:52 UTC (rev 5721)
@@ -0,0 +1,24 @@
+* Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the DANTE or GEANT2 nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY DANTE ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL DANTE or the GEANT2 NRENS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/dirs
===================================================================

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/docs
===================================================================

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/install
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/install                
          (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/install  2010-08-17 
15:58:52 UTC (rev 5721)
@@ -0,0 +1 @@
+

Added: trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postinst
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postinst               
          (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postinst 2010-08-17 
15:58:52 UTC (rev 5721)
@@ -0,0 +1,41 @@
+#!/bin/sh
+# postinst script for ps-mdm-sshtelnet-mp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst 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-dummy/postrm
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postrm                 
          (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/postrm   2010-08-17 
15:58:52 UTC (rev 5721)
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for ps-mdm-sshtelnet-mp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+    ;;
+    
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm 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-dummy/rules
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/rules                  
          (rev 0)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb-dummy/rules    2010-08-17 
15:58:52 UTC (rev 5721)
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+
+
+configure: patch configure-stamp
+configure-stamp: patch
+       dh_testdir
+       # Add here commands to configure the package.
+       touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+       dh_testdir
+       touch $@
+
+clean: clean-patched unpatch
+
+clean-patched:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+       rm -rf build
+       rm -rf bin
+       dh_clean 
+
+patch: patch-stamp
+patch-stamp:
+       dpatch apply-all
+       dpatch cat-all >patch-stamp
+
+unpatch:
+       dpatch deapply-all
+       rm -rf patch-stamp debian/patched
+
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k 
+       dh_installdirs
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs 
+       dh_installexamples
+       dh_install
+       dh_installinit
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+#      dh_makeshlibs
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

Added: 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
                              (rev 0)
+++ 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/perfsonar-java-sshtelnet-mp.specs
      2010-08-17 15:58:52 UTC (rev 5721)
@@ -0,0 +1,245 @@
+
+# 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
+ 

Modified: 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2010-08-12 09:59:32 UTC (rev 5720)
+++ trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2010-08-17 15:58:52 UTC (rev 5721)
@@ -1,237 +1,187 @@
-
-# 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: ps-mdm-sshtelnet-mp
-
-# Version of the microrelease
-Version: 1.3.4.1
-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: Stijn Melis 
<>
-
-# What is the location of the source package
-URL: http://www.perfsonar.org
-
-# 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}/%{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
-
-# copy the service content to the tomcat webapps directory
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/tmp-webapps/webapps
-    %{__cp} -a  %{name}/* ${RPM_BUILD_ROOT}%{prefix}
-popd
-
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
-popd
-
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/samples
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/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}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
-%{__rm} -rf %{_var}/log/%{name}
-
-
-
-%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}/%{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
-
-
-%changelog
-* 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/ps-mdm-sshtelnet-mp
+
+# The full name of your package.
+Name: ps-mdm-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: dummy-%{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
+
+# on what packages should the resulting package depend
+Requires: perfsonar-java-sshtelnet-mp
+
+# 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. This is a dummy package used 
to rename the package to perfsonar-java-sshtelnet-mp.
+
+
+
+%prep
+%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+%setup -q
+
+
+
+%build
+
+
+
+%install
+# make the directory
+
+# copy the service content to the tomcat webapps directory
+
+%post
+## make symlink for easy access to conf
+
+%preun
+
+%postun
+
+%clean
+# clean up the durt
+rm -rf $RPM_BUILD_ROOT
+
+
+
+%files
+
+%changelog
+* Tue Jul 3 2009 Blazej Pietrzak 
<>
 1.3.4.2
+- ps-base version: 1.0.200800902
+- web-admin version: 0.9.3c
+- Renamed the package to perfsonar-java-sshtelnet-mp
+- Removed Admin Guide from package
+
+* 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
+ 
+