From 50e77a9caabb1d54f823e3b8040ac5182f1424a4 Mon Sep 17 00:00:00 2001
From: soukal <soukal@ics.muni.cz>
Date: Thu, 10 May 2012 16:35:18 +0200
Subject: [PATCH] drobne upravy do verze 2.0.0-beta (doplneny verze, soubor
AUTHORS, a jine drobnosti)
---
src/warden-client/doc/AUTHORS | 24 ++++++++++
src/warden-client/doc/CHANGELOG | 8 ++++
src/warden-client/doc/README | 48 ++++++++-----------
src/warden-client/doc/example-receiver.pl.txt | 28 +----------
src/warden-client/doc/example-sender.pl.txt | 28 +----------
src/warden-client/etc/package_version | 2 +-
src/warden-client/lib/WardenClientConf.pm | 30 +-----------
src/warden-client/lib/WardenClientReceive.pm | 31 ++----------
src/warden-client/lib/WardenClientSend.pm | 29 +----------
src/warden-client/sh/install.sh | 31 ++----------
src/warden-client/sh/uninstall.sh | 31 ++----------
src/warden-client/sh/update.sh | 32 ++-----------
12 files changed, 71 insertions(+), 251 deletions(-)
create mode 100644 src/warden-client/doc/AUTHORS
diff --git a/src/warden-client/doc/AUTHORS b/src/warden-client/doc/AUTHORS
new file mode 100644
index 0000000..55961f3
--- /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 1de1f55..8881ff3 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 777d203..fd9268e 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 2f4f926..7236548 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 9e1089a..b098817 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 c7673b5..faa8f64 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 ba1f661..637e046 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 4b37851..4fb27b8 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 0ed2df4..25966b0 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 d276dfa..5919c95 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 a67a885..b927de0 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 395f28d..bbf644c 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
--
GitLab