Merge branch 'master' of homeproj.cesnet.cz:warden

packages/build-client.sh

@@ -27,7 +27,7 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="2.1-beta"
+version="2.1"
 
 package_name="warden-client"
 package="${package_name}-${version}"

packages/build-server.sh

@@ -24,7 +24,7 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="2.1-beta6"
+version="2.1"
 
 package_name="warden-server"
 package="${package_name}-${version}"

packages/warden-client-2.1.tar.gz.sig

+79bcb17ca5b81df49c1c94b9b9ef83fecff31c69  warden-client-2.1.tar.gz

packages/warden-server-2.1.tar.gz.sig

+b80714a0ba3ebddc46d0a05fea7593aed82fab05  warden-server-2.1.tar.gz

src/warden-client/doc/AUTHORS

 AUTHORS AND MAINTAINERS :
 
-MAIN DEVELOPERS:
-Tomas Plesnik   	<plesnik@ics.muni.cz>
-Jan Soukal      	<soukal@ics.muni.cz>
-Michal Kostenec 	<kostenec@civ.zcu.cz>
+PROJECT ARCHITECTS:
+Pavel Kacha             <ph@cesnet.cz>
+Andrea Kropacova        <andrea@cesnet.cz>
+Jan Vykopal             <vykopal@cesnet.cz>
 
-CONTRIBUTORS:
-Vit Slama		<slama@cis.vutbr.cz>
-Martin Drasar		<drasar@ics.muni.cz>
+MAIN DEVELOPERS:
+Michal Kostenec         <kostenec@cesnet.cz>
+Tomas Plesnik           <plesnik@cesnet.cz>
+Jan Soukal              <soukal@cesnet.cz>
 
 TESTING:
-Jakub Cegan		<cegan@ics.muni.cz>
+Jakub Cegan             <jakubcegan@cesnet.cz>
 
-DEVELOPMENT MANAGER:
-Jan Vykopal		<vykopal@ics.muni.cz>
-
-PROJECT MANAGERS:
-Pavel Kacha		<ph@cesnet.cz>
-Andrea Kropacova	<andrea@cesnet.cz>
+CONTRIBUTORS:
+Radoslav Bodo           <bodik@civ.zcu.cz>
+Martin Drasar           <drasar@ics.muni.cz>
+Vit Slama               <slama@cis.vutbr.cz>
 
 COMMUNITY:
-Radoslav Bodo		<bodik@civ.zcu.cz>
-Radomir Orkac		<orkac@cesnet.cz>
+Radomir Orkac           <orkac@cesnet.cz>
+Daniel Studeny          <Daniel.Studeny@cesnet.cz>
+Pavel Vachek            <Pavel.Vachek@cesnet.cz>
+Martin Zadnik           <izadnik@fit.vutbr.cz>

src/warden-client/doc/CHANGELOG

+2013-02-05 v.2.1 stable
+-----------------------
+- Minor changes in documentation
+
+
 2012-11-05 v.2.1-beta version
 -------------------------------
 - Added WardenClientCommon.pm package containing error-handling and

src/warden-client/doc/LICENSE

 BSD License
 
-Copyright © 2011-2012 Cesnet z.s.p.o
+Copyright © 2011-2013 Cesnet z.s.p.o
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

src/warden-client/doc/README

@@ -30,7 +30,7 @@ A. Overall Information
  
  2. Version
   
-    2.1 (2012-11-05)
+    2.1 (2013-02-05)
     
  3. Package structure
  
@@ -128,11 +128,11 @@ D. Update (Update of previously installed the Warden client package)
 
  1. Check SHA1 checksum of corresponding the Warden client package archive
 
-    $ sha1sum -c warden-client-2.0.tar.gz.sig
+    $ sha1sum -c warden-client-2.1.tar.gz.sig
 
  2. Untar it
 
-    $ tar xzvf warden-client-2.0.tar.gz
+    $ tar xzvf warden-client-2.1.tar.gz
 
  3. Run update.sh 
   
@@ -469,5 +469,5 @@ I. Functions, Arguments and Calls
 
 --------------------------------------------------------------------------------
 
-Copyright (C) 2011-2012 Cesnet z.s.p.o
+Copyright (C) 2011-2013 Cesnet z.s.p.o
 

src/warden-client/doc/README.cesnet

@@ -26,7 +26,7 @@ A. Overall Information
 
  2. Version
 
-    2.1 (2012-10-18)
+    2.1 (2013-02-05)
 
 --------------------------------------------------------------------------------
 B. Registration
@@ -163,4 +163,4 @@ G. Authors of this document
     Pavel Kacha     <ph@cesnet.cz>
     Jan Soukal      <soukal@ics.muni.cz>
 
-Copyright (C) 2011-2012 Cesnet z.s.p.o
+Copyright (C) 2011-2013 Cesnet z.s.p.o

src/warden-client/lib/WardenClientCommon.pm

@@ -2,7 +2,7 @@
 #
 # WardenClientCommon.pm
 #
-# Copyright (C) 2011-2012 Cesnet z.s.p.o
+# Copyright (C) 2011-2013 Cesnet z.s.p.o
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 

src/warden-client/sh/install.sh

@@ -2,7 +2,7 @@
 #
 # install.sh
 #
-# Copyright (C) 2011-2012 Cesnet z.s.p.o
+# Copyright (C) 2011-2013 Cesnet z.s.p.o
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.  
 

src/warden-client/sh/uninstall.sh

@@ -2,7 +2,7 @@
 #
 # uninstall.sh
 #
-# Copyright (C) 2011-2012 Cesnet z.s.p.o
+# Copyright (C) 2011-2013 Cesnet z.s.p.o
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.  
 

src/warden-client/sh/update.sh

@@ -2,7 +2,7 @@
 #
 # update.sh
 #
-# Copyright (C) 2011-2012 Cesnet z.s.p.o
+# Copyright (C) 2011-2013 Cesnet z.s.p.o
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 

src/warden-server/doc/CHANGELOG

-2012-11-16 v2.1 stable version
+2013-02-05 v2.1 stable version
 ------------------------------
 - fixed bug in default value of database timestamp type		(#576, #577)
 - fixed bug in getStatus function				(#566)
@@ -7,7 +7,7 @@
 - added update process						(#573)
 - added server limit of maximum number of events that can be	(#526)
   delivered to one client in one batch
-- added validation of received events parameters	 	(#524)
+- added validation of received events parameters	 	(#524, #817)
 - server can provide clients with events disregarding event	(#523)
   type
 - added verbose logging option (stack info)			(#521)

src/warden-server/doc/README

@@ -25,7 +25,7 @@ A. Overall Information
 
  2. Version
   
-    2.1 (2012-11-16)
+    2.1 (2013-02-05)
     
  3. Package structure
  
@@ -33,7 +33,6 @@ A. Overall Information
       bin/
 	getClients.pl
 	getStatus.pl
-	getWebStatus.sh
 	registerReceiver.pl
 	registerSender.pl
 	unregisterClients.pl

src/warden-server/sh/install.sh

@@ -74,8 +74,8 @@ root_chck()
 params_chck()
 {
 	if [ -z $prefix ]; then
-		prefix=/opt
-		echo "Warning: parameter -d <directory> is not set - default installation directory is ${prefix}!"
+		echo "Parameter -d <directory> is not set!"
+		exit 1
 	fi
 	if [ -z $key ]; then
 		echo "Parameter -k <ssl_key_file> is not set!"

src/warden-server/sh/uninstall.sh

@@ -74,19 +74,21 @@ root_chck()
 params_chck()
 {
 	if [ -z $prefix ]; then
-		prefix=/opt
-		echo "Warning: parameter -d <directory> is not set - default uninstallation directory is ${prefix}!"
+		echo "Parameter -d <direcotry> is not set!"
+		exit 1
 	fi
 }
 
 
 obtain_package_version()
 {
+	echo -n "Obtaing package version ... "
 	if [ -f $old_package_version_file ]; then 
 		package_version=`cat $old_package_version_file`
 	else
 		package_version="unknown"
 	fi
+	echo "OK"
 }