diff --git a/src/warden-client/doc/AUTHORS b/src/warden-client/doc/AUTHORS
new file mode 100644
index 0000000000000000000000000000000000000000..55961f38fce4c1d8d442a572443e431c3b8c4f5a
--- /dev/null
+++ b/src/warden-client/doc/AUTHORS
@@ -0,0 +1,24 @@
+AUTHORS AND MAINTAINERS :
+
+MAIN DEVELOPERS:
+Tomas Plesnik <plesnik@ics.muni.cz>
+Jan Soukal <soukal@ics.muni.cz>
+Michal Kostenec <kostenec@civ.zcu.cz>
+
+CONTRIBUTORS:
+Vit Slama <slama@cis.vutbr.cz>
+Martin Drasar <drasar@ics.muni.cz>
+
+TESTING:
+Jakub Cegan <cegan@ics.muni.cz>
+
+DEVELOPMENT MANAGER:
+Jan Vykopal <vykopal@ics.muni.cz>
+
+PROJECT MANAGERS:
+Pavel Kacha <ph@cesnet.cz>
+Andrea Kropacova <andrea@cesnet.cz>
+
+COMMUNITY:
+Radoslav Bodo <bodik@civ.zcu.cz>
+Radomir Orkac <orkac@cesnet.cz>
diff --git a/src/warden-client/doc/CHANGELOG b/src/warden-client/doc/CHANGELOG
index 1de1f5599e6f4290c994042665ca1d4477120c23..8881ff3150a05048ab92178c45b54ba3a97288d9 100644
--- a/src/warden-client/doc/CHANGELOG
+++ b/src/warden-client/doc/CHANGELOG
@@ -1,3 +1,11 @@
+2012-05-10 v.2.0.0-beta beta-version of warden-client-2.0.0
+-----------------------------------------------------------
+- Changed communication with server to HTTP layer (compatible with Apache-based
+ version of Warden server)
+- Removed Linux version check in install.sh, unistall.sh and update.sh
+- Removed shell (Bash) dependencies in install.sh, unistall.sh and update.sh
+
+
2012-03-30 v1.2.0 stable version and bugfix release of warden-client-1.1.0
--------------------------------------------------------------------------
- Fixed SSL certificate/key access privileges security issue
diff --git a/src/warden-client/doc/README b/src/warden-client/doc/README
index 777d20399be552d3a2528e33529bc357d18d928f..fd9268e96f30685e5b495b9b9ae83939156b6d75 100644
--- a/src/warden-client/doc/README
+++ b/src/warden-client/doc/README
@@ -1,6 +1,6 @@
-+------------------------------+
-| README - Warden Client 1.2.0 |
-+------------------------------+
++-----------------------------------+
+| README - Warden Client 2.0.0-beta |
++-----------------------------------+
Content
@@ -13,7 +13,6 @@ Content
G. Configuration
H. Integration with Local Applications
I. Functions, Arguments and Calls
- J. Authors
--------------------------------------------------------------------------------
@@ -30,7 +29,7 @@ A. Overall Information
2. Version
- 1.2.0 (2012-03-30)
+ 2.0.0-beta (2012-05-10)
3. Package structure
@@ -39,13 +38,13 @@ A. Overall Information
CHANGELOG
example-sender.pl.txt
example-receiver.pl.txt
- INSTALL
- LICENSE
- README
- README.cesnet
+ INSTALL
+ LICENSE
+ README
+ README.cesnet
etc/
warden-client.conf
- package_version
+ package_version
lib/
WardenClientConf.pm
WardenClientSend.pm
@@ -56,12 +55,12 @@ A. Overall Information
--------------------------------------------------------------------------------
B. Installation Dependencies
- Perl >= 5.10.1
- SOAP::Lite >= 0.712
- IO::Socket::SSL >= 1.33
- SOAP::Transport::TCP >= 0.712
- FindBin >= 1.50
- DateTime >= 0.61
+ Perl >= 5.10.1
+ SOAP::Lite >= 0.712
+ IO::Socket::SSL >= 1.33
+ SOAP::Transport::HTTP >= 0.712
+ FindBin >= 1.50
+ DateTime >= 0.61
--------------------------------------------------------------------------------
@@ -129,11 +128,11 @@ D. Installation (First installation of the Warden client package)
1. Check SHA1 checksum of corresponding Warden client package archive
- $ sha1sum -c warden-client-1.2.0.tar.gz.sig
+ $ sha1sum -c warden-client-2.0.0-beta.tar.gz.sig
2. Untar it
- $ tar xzvf warden-client-1.2.0.tar.gz
+ $ tar xzvf warden-client-2.0.0-beta.tar.gz
3. Run install.sh
@@ -189,11 +188,11 @@ E. Update (Update of previously installed the Warden client package)
1. Check SHA1 checksum of corresponding the Warden client package archive
- $ sha1sum -c warden-client-1.2.0.tar.gz.sig
+ $ sha1sum -c warden-client-2.0.0-beta.tar.gz.sig
2. Untar it
- $ tar xzvf warden-client-1.2.0.tar.gz
+ $ tar xzvf warden-client-2.0.0-beta.tar.gz
3. Run update.sh
@@ -427,12 +426,5 @@ I. Functions, Arguments and Calls
additional attribute ID - unique id of this particular event (BIGINT).
--------------------------------------------------------------------------------
-J. Authors
-Development: Tomas PLESNIK <plesnik@ics.muni.cz>
- Jan SOUKAL <soukal@ics.muni.cz>
-
-Copyright (C) 2011-2012 Cesnet z.s.p.o
-
-Special thanks go to Martin Drasar from CSIRT-MU for his help and support
-in the development of the Warden system.
+Copyright (C) 2011-2012 Cesnet z.s.p.o
\ No newline at end of file
diff --git a/src/warden-client/doc/example-receiver.pl.txt b/src/warden-client/doc/example-receiver.pl.txt
index 2f4f92624c46ff90899f8501f93eb9840b8ee6f6..7236548d03518741f5f4f644bfc04b1b4a4c117d 100644
--- a/src/warden-client/doc/example-receiver.pl.txt
+++ b/src/warden-client/doc/example-receiver.pl.txt
@@ -1,34 +1,8 @@
#!/usr/bin/perl -w
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
#
+# Use of this source is governed by a BSD-style license, see LICENSE file.
use strict;
diff --git a/src/warden-client/doc/example-sender.pl.txt b/src/warden-client/doc/example-sender.pl.txt
index 9e1089a380dac5461f96e905070e3c984e543055..b0988177f135a3335c6087a59e4f4181602df4ad 100644
--- a/src/warden-client/doc/example-sender.pl.txt
+++ b/src/warden-client/doc/example-sender.pl.txt
@@ -1,34 +1,8 @@
#!/usr/bin/perl -w
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
#
+# Use of this source is governed by a BSD-style license, see LICENSE file.
use strict;
use DateTime;
diff --git a/src/warden-client/etc/package_version b/src/warden-client/etc/package_version
index c7673b58f3ac7b70d71e2ff412fd13800fdf6dee..faa8f64f32791692b7686b61ce2aea3a8bf3a4cc 100644
--- a/src/warden-client/etc/package_version
+++ b/src/warden-client/etc/package_version
@@ -1 +1 @@
-warden-client-1.3.0
+warden-client-2.0.0-beta
diff --git a/src/warden-client/lib/WardenClientConf.pm b/src/warden-client/lib/WardenClientConf.pm
index ba1f661fcf3d869f4d56bd2a636e8281e82afa57..637e046f324073e02e1d3557d598e9257145f71b 100755
--- a/src/warden-client/lib/WardenClientConf.pm
+++ b/src/warden-client/lib/WardenClientConf.pm
@@ -3,40 +3,14 @@
# WardenClientConf.pm
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
#
+# Use of this source is governed by a BSD-style license, see LICENSE file.
package WardenClientConf;
use strict;
-our $VERSION = "1.0";
+our $VERSION = "2.0";
#-------------------------------------------------------------------------------
# loadConf - load variables from configuration file
diff --git a/src/warden-client/lib/WardenClientReceive.pm b/src/warden-client/lib/WardenClientReceive.pm
index 4b37851e00847297f04b6a4950e8b680cb9cbfea..4fb27b867ae89d8935e7a17f28c1ca0138a8f93e 100755
--- a/src/warden-client/lib/WardenClientReceive.pm
+++ b/src/warden-client/lib/WardenClientReceive.pm
@@ -1,35 +1,10 @@
#!/usr/bin/perl -w
-#
+#
# WardenClientReceive.pm
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
+# Use of this source is governed by a BSD-style license, see LICENSE file.
package WardenClientReceive;
@@ -39,7 +14,7 @@ use IO::Socket::SSL qw(debug1);
use SOAP::Transport::HTTP;
use FindBin;
-our $VERSION = "1.3"; #first iteration after 'port to Apache'
+our $VERSION = "2.0"; #first iteration after 'port to Apache'
#-------------------------------------------------------------------------------
# errMsg - print error message and die
diff --git a/src/warden-client/lib/WardenClientSend.pm b/src/warden-client/lib/WardenClientSend.pm
index 0ed2df4abe9bacd8caf35e6cd931e7c8236d4f32..25966b09ba51c78c1f3978c5c2ab88f155a209ee 100755
--- a/src/warden-client/lib/WardenClientSend.pm
+++ b/src/warden-client/lib/WardenClientSend.pm
@@ -3,33 +3,8 @@
# WardenClientSend.pm
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
+# Use of this source is governed by a BSD-style license, see LICENSE file.
package WardenClientSend;
@@ -38,7 +13,7 @@ use SOAP::Lite;
use IO::Socket::SSL qw(debug1);
use SOAP::Transport::HTTP;
-our $VERSION = "1.3"; #first iteration after 'port to Apache'
+our $VERSION = "2.0"; #first iteration after 'port to Apache'
#-------------------------------------------------------------------------------
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index d276dfa9a005eb8412c1dd59326a56653a3fca88..5919c95acd95a2dfac193270559ec50cba5f75d0 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -3,35 +3,10 @@
# install.sh
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
-
-VERSION="1.1"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="2.0"
#-------------------------------------------------------------------------------
# FUNCTIONS
diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh
index a67a885006dd601220d59d6a9ddfe4c79da54c17..b927de0ec464cc77ee117e86ce6664b89ff2c235 100755
--- a/src/warden-client/sh/uninstall.sh
+++ b/src/warden-client/sh/uninstall.sh
@@ -3,35 +3,10 @@
# uninstall.sh
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
-
-VERSION="1.0"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="2.0"
#-------------------------------------------------------------------------------
# FUNCTIONS
diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh
index 395f28d17040617dec67e0a694653bef2ae7792c..bbf644c51c1b6179efb4fcde5b3453fe124766bc 100755
--- a/src/warden-client/sh/update.sh
+++ b/src/warden-client/sh/update.sh
@@ -3,36 +3,10 @@
# update.sh
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s): Tomas PLESNIK <plesnik@ics.muni.cz>
-# Jan SOUKAL <soukal@ics.muni.cz>
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the Cesnet z.s.p.o 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 ``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 the Cesnet z.s.p.o or contributors 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.
-
-
-VERSION="1.1"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="2.0"
#-------------------------------------------------------------------------------
# FUNCTIONS