diff --git a/packages/build-client.sh b/packages/build-client.sh
index d516d7078a6bec2ddea9bbd174c47a44f1914828..d85f748bb8c233e20a01c852572927202a3b5ebb 100755
--- a/packages/build-client.sh
+++ b/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}"
diff --git a/packages/build-server.sh b/packages/build-server.sh
index 802b9689b9018034b9fa4acb86bfccc7c438b551..86b2a3fd8989db1ba06e43651f94ff520b16599f 100755
--- a/packages/build-server.sh
+++ b/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}"
diff --git a/packages/warden-client-2.1.tar.gz b/packages/warden-client-2.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..00b702e5803cb698db1db851f4b6af0611dbe226
Binary files /dev/null and b/packages/warden-client-2.1.tar.gz differ
diff --git a/packages/warden-client-2.1.tar.gz.sig b/packages/warden-client-2.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..9db67a9c9cf9432b727b98d5d60db99cb20be9c3
--- /dev/null
+++ b/packages/warden-client-2.1.tar.gz.sig
@@ -0,0 +1 @@
+79bcb17ca5b81df49c1c94b9b9ef83fecff31c69 warden-client-2.1.tar.gz
diff --git a/packages/warden-server-2.1.tar.gz b/packages/warden-server-2.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6245ace4c1f682a339415411ffa95ef642a04a8b
Binary files /dev/null and b/packages/warden-server-2.1.tar.gz differ
diff --git a/packages/warden-server-2.1.tar.gz.sig b/packages/warden-server-2.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..d69238dde0c43ebebdfb2b75f7ef283d493ac402
--- /dev/null
+++ b/packages/warden-server-2.1.tar.gz.sig
@@ -0,0 +1 @@
+b80714a0ba3ebddc46d0a05fea7593aed82fab05 warden-server-2.1.tar.gz
diff --git a/src/warden-server/bin/wardenWatchdog.pl b/src/contrib/wardenWatchdog.pl
similarity index 100%
rename from src/warden-server/bin/wardenWatchdog.pl
rename to src/contrib/wardenWatchdog.pl
diff --git a/src/warden-client/doc/AUTHORS b/src/warden-client/doc/AUTHORS
index 55961f38fce4c1d8d442a572443e431c3b8c4f5a..836f0d9a222692f572df8525bc3abed999f9cd0d 100644
--- a/src/warden-client/doc/AUTHORS
+++ b/src/warden-client/doc/AUTHORS
@@ -1,24 +1,25 @@
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>
diff --git a/src/warden-client/doc/CHANGELOG b/src/warden-client/doc/CHANGELOG
index 79f017b8364c3eed9342dbacdfab1f88acc25410..e66cbe3bd60c54364c5c223046b2c0acb108c37f 100644
--- a/src/warden-client/doc/CHANGELOG
+++ b/src/warden-client/doc/CHANGELOG
@@ -1,3 +1,8 @@
+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
diff --git a/src/warden-client/doc/LICENSE b/src/warden-client/doc/LICENSE
index 41397ce2aac7e03fac59f38a50036b705044a184..637e108da406945bad1f52542e2b4306e9ba373c 100644
--- a/src/warden-client/doc/LICENSE
+++ b/src/warden-client/doc/LICENSE
@@ -1,6 +1,6 @@
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,
diff --git a/src/warden-client/doc/README b/src/warden-client/doc/README
index 15307238ee2d41e26108f8c1bc096bf80bd5596f..71caccfef12a29fc9f9d77e132dd64a270da3595 100644
--- a/src/warden-client/doc/README
+++ b/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
diff --git a/src/warden-client/doc/README.cesnet b/src/warden-client/doc/README.cesnet
index 15ab12b3ae5bbc4654fa6fc9a8510614c7ebdcc8..52cb24b056b5d4c1e82bdcf520127eaf90a8bafc 100644
--- a/src/warden-client/doc/README.cesnet
+++ b/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
diff --git a/src/warden-client/lib/WardenClientCommon.pm b/src/warden-client/lib/WardenClientCommon.pm
index 901588d0d2f4ad57835b05a32de8045fe1a9f011..8170d9129a5c6ebd1c08e2ab756bde8bca452209 100755
--- a/src/warden-client/lib/WardenClientCommon.pm
+++ b/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.
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index 8e70ec0946441ca0b970e95398fff49b81453ab0..ee5b2b6e7c7a1422fc7a68aeb259db29681aa8e0 100755
--- a/src/warden-client/sh/install.sh
+++ b/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.
diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh
index 96e63413bec166489f1dc3d9e88714c1bd4ed8d9..97c5acdaeb0a7cae2301545f765bc6b386cc1666 100755
--- a/src/warden-client/sh/uninstall.sh
+++ b/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.
diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh
index a08085c6bceafd9bc7ee50a0fa4c7365db7a4f16..a061f733c60208794175abae2d0b9dedbb2bd15f 100755
--- a/src/warden-client/sh/update.sh
+++ b/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.
diff --git a/src/warden-server/doc/CHANGELOG b/src/warden-server/doc/CHANGELOG
index d44a5d70b617e9c6d01b911f06abb1fb6aacab02..b26e6eb1ca6b58427f2c390e82cc08844c241a03 100644
--- a/src/warden-server/doc/CHANGELOG
+++ b/src/warden-server/doc/CHANGELOG
@@ -1,4 +1,4 @@
-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)
diff --git a/src/warden-server/doc/README b/src/warden-server/doc/README
index c50005d6ed9b7a355dffe0a42746a89971ea6734..059924d0c27e1fb6c06855dc564395c47aa3bea8 100644
--- a/src/warden-server/doc/README
+++ b/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
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 70a7feb99e4a22d19f208eee644b760cd807093c..425e899adb5d46e2ca2ce60e7cd6e51f26f091ea 100755
--- a/src/warden-server/sh/install.sh
+++ b/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!"
diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index d9bdcbf84fdb8437bcb174dcb98d585acecb80f9..417ca43889810f1d45c414d9c189a35241f973ea 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/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"
}
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index bc0810eef19120bd6575d104dca47ed11507c523..f29fe545c943ff10a4386ce6cc7f3a984d234aba 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -73,8 +73,8 @@ root_chck()
params_chck()
{
if [ -z $prefix ]; then
- prefix=/opt
- echo "Warning: parameter -d <directory> is not set - default update directory is ${prefix}!"
+ echo "Parameter -d <direcotry> is not set!"
+ exit 1
fi
}