merge masteru a receive-apache2 branche

6e2ea855 · Tomáš Plesník · e6bceb2b · 52b4030c · 6e2ea855 · 6e2ea855
Commit 6e2ea855 authored Jun 5, 2012 by Tomáš Plesník
--- a/packages/TODO.zcu
+++ b/packages/TODO.zcu
+* sjednotit warden-client.conf a warden-server.conf 
+* ipv6
+* zrusit vsude licence a nahradit jedinym radkem s odkazem
+* generovani konfiguracnich souboru z template z balicku a ne primo ze shell skriptu
+* verze klienta a serveru jsou mimo sync coz je osklive, proc mam pouzivat c1.1.1 a s0.1.1 ? to nedava smysl ...
+
--- a/packages/build-client.sh
+++ b/packages/build-client.sh
@@ -52,7 +52,7 @@ err()
 #-------------------------------------------------------------------------------

 # edit when you build new package
-version="1.2.0"
+version="2.0.0-beta"

 package_name="warden-client"
 package="$package_name-$version"

--- a/packages/build-server.sh
+++ b/packages/build-server.sh
@@ -49,7 +49,7 @@ err()
 #-------------------------------------------------------------------------------

 # edit when you build new package
-version="0.1.0"
+version="0.1.1"

 package_name="warden-server"
 package="$package_name-$version"
@@ -74,6 +74,8 @@ cp ../src/$package_name/doc/CHANGELOG $package 2> $err || err
 cp ../src/$package_name/doc/INSTALL $package 2> $err || err
 cp ../src/$package_name/doc/LICENSE $package 2> $err || err
 cp ../src/$package_name/doc/README $package 2> $err || err
+cp ../src/$package_name/doc/README.warden-apache $package 2> $err || err
+
 echo "OK"

 echo -n "Building '$bin' directory ... "
@@ -90,6 +92,7 @@ echo "OK"
 echo -n "Building '$etc' directory ... "
 mkdir -p $etc 2> $err || err
 cp ../src/$package_name/etc/package_version $etc 2> $err || err
+cp ../src/$package_name/etc/warden-apache.conf $etc 2> $err || err
 echo "OK"

 echo -n "Building '$lib' directory ... "

--- a/packages/warden-client-2.0.0-beta.tar.gz
+++ b/packages/warden-client-2.0.0-beta.tar.gz
--- a/packages/warden-client-2.0.0-beta.tar.gz.sig
+++ b/packages/warden-client-2.0.0-beta.tar.gz.sig
+c2d0cc933a689504f4146debbd6046dfd4773f7f  warden-client-2.0.0-beta.tar.gz
--- a/src/meta/README
+++ b/src/meta/README
+* customize wrapper's clown computing nodes selector
+** set SERVER, IP, BASE (2x) variables in scripts
+** http://meta.cesnet.cz/wiki/Pl%C3%A1novac%C3%AD_syst%C3%A9m_-_detailn%C3%AD_popis
+* connect to any job submitter frontend (arda, skirit, ...)
+** submit a job `qsub wtw-lenny-meta.sh`
+** monitor it `qstat -u $USER`
+
+* populate clients table
+** set USER, PASS, DB (other/importMetaClients.sh)
+** 'meta-nodes' must be in the same directory
+** run;)
--- a/src/meta/other/importMetaClients.sh
+++ b/src/meta/other/importMetaClients.sh
+#!/bin/bash
+
+USER=""
+PASS=""
+DB="warden"
+
+if [ -z $PASS ]; then
+	MYSQL_CMD="mysql -u$USER $DB";
+else
+	MYSQL_CMD="mysql -u$USER -p$PASS $DB";
+fi
+
+for host in `cat meta-nodes`; do
+	IP=`host $host | grep -v 'handle' | awk '{print $4}'`
+	echo "INSERT INTO clients VALUES (NULL, '$host', now(),'automatic', 'test', 's', NULL, 'n', 'bruteforce', '$IP/32');" | $MYSQL_CMD
+done 
--- a/src/meta/other/meta-nodes
+++ b/src/meta/other/meta-nodes
+tarkil10-1.cesnet.cz
+tarkil10-2.cesnet.cz
+tarkil11-1.cesnet.cz
+tarkil11-2.cesnet.cz
+tarkil12-1.cesnet.cz
+tarkil12-2.cesnet.cz
+tarkil13-1.cesnet.cz
+tarkil13-2.cesnet.cz
+tarkil14-1.cesnet.cz
+tarkil14-2.cesnet.cz
+tarkil15-1.cesnet.cz
+tarkil15-2.cesnet.cz
+tarkil17-1.cesnet.cz
+tarkil17-2.cesnet.cz
+tarkil18-1.cesnet.cz
+tarkil18-2.cesnet.cz
+tarkil19-1.cesnet.cz
+tarkil19-2.cesnet.cz
+tarkil20-1.cesnet.cz
+tarkil20-2.cesnet.cz
+tarkil21-1.cesnet.cz
+tarkil21-2.cesnet.cz
+tarkil22-1.cesnet.cz
+tarkil22-2.cesnet.cz
+tarkil23-1.cesnet.cz
+tarkil23-2.cesnet.cz
+tarkil24-1.cesnet.cz
+tarkil24-2.cesnet.cz
+tarkil25-1.cesnet.cz
+tarkil25-2.cesnet.cz
+tarkil26-1.cesnet.cz
+tarkil26-2.cesnet.cz
+tarkil27-1.cesnet.cz
+tarkil27-2.cesnet.cz
+tarkil5-1.cesnet.cz
+tarkil5-2.cesnet.cz
+tarkil7-1.cesnet.cz
+tarkil7-2.cesnet.cz
+tarkil9-1.cesnet.cz
+tarkil9-2.cesnet.cz
+konos20-1.fav.zcu.cz
+perian55-1.ncbr.muni.cz
+skirit51-1.ics.muni.cz
+skirit51-2.ics.muni.cz
+skirit52-1.ics.muni.cz
+skirit52-2.ics.muni.cz
+skirit53-1.ics.muni.cz
+skirit53-2.ics.muni.cz
+skirit54-1.ics.muni.cz
+skirit54-2.ics.muni.cz
+skirit55-1.ics.muni.cz
+skirit55-2.ics.muni.cz
+skirit56-1.ics.muni.cz
+skirit56-2.ics.muni.cz
+skirit57-1.ics.muni.cz
+skirit57-2.ics.muni.cz
+skirit58-1.ics.muni.cz
+skirit58-2.ics.muni.cz
+skirit59-1.ics.muni.cz
+skirit59-2.ics.muni.cz
+skirit60-1.ics.muni.cz
+skirit60-2.ics.muni.cz
+skirit61-1.ics.muni.cz
+skirit61-2.ics.muni.cz
+skirit62-1.ics.muni.cz
+skirit62-2.ics.muni.cz
+skirit63-1.ics.muni.cz
+skirit63-2.ics.muni.cz
+skirit64-1.ics.muni.cz
+skirit64-2.ics.muni.cz
+skirit65-1.ics.muni.cz
+skirit65-2.ics.muni.cz
+skirit67-1.ics.muni.cz
+skirit67-2.ics.muni.cz
+skirit68-1.ics.muni.cz
+skirit68-2.ics.muni.cz
+skirit69-1.ics.muni.cz
+skirit69-2.ics.muni.cz
+skirit70-1.ics.muni.cz
+skirit70-2.ics.muni.cz
+skirit71-1.ics.muni.cz
+skirit71-2.ics.muni.cz
+skirit72-1.ics.muni.cz
+skirit72-2.ics.muni.cz
+skirit73-1.ics.muni.cz
+skirit73-2.ics.muni.cz
+skirit74-1.ics.muni.cz
+skirit74-2.ics.muni.cz
+skirit75-1.ics.muni.cz
+skirit75-2.ics.muni.cz
+skirit76-1.ics.muni.cz
+skirit76-2.ics.muni.cz
+skirit77-1.ics.muni.cz
+skirit77-2.ics.muni.cz
+skirit78-1.ics.muni.cz
+skirit78-2.ics.muni.cz
+skirit79-1.ics.muni.cz
+skirit79-2.ics.muni.cz
+skirit84-1.ics.muni.cz
+skirit84-2.ics.muni.cz
+perian10-1.ncbr.muni.cz
+perian10-2.ncbr.muni.cz
+perian11-1.ncbr.muni.cz
+perian11-2.ncbr.muni.cz
+perian1-1.ncbr.muni.cz
+perian12-1.ncbr.muni.cz
+perian12-2.ncbr.muni.cz
+perian1-2.ncbr.muni.cz
+perian13-1.ncbr.muni.cz
+perian13-2.ncbr.muni.cz
+perian14-1.ncbr.muni.cz
+perian14-2.ncbr.muni.cz
+perian15-1.ncbr.muni.cz
+perian15-2.ncbr.muni.cz
+perian16-1.ncbr.muni.cz
+perian16-2.ncbr.muni.cz
+perian17-1.ncbr.muni.cz
+perian17-2.ncbr.muni.cz
+perian18-1.ncbr.muni.cz
+perian18-2.ncbr.muni.cz
+perian19-1.ncbr.muni.cz
+perian19-2.ncbr.muni.cz
+perian20-1.ncbr.muni.cz
+perian20-2.ncbr.muni.cz
+perian21-1.ncbr.muni.cz
+perian21-2.ncbr.muni.cz
+perian2-1.ncbr.muni.cz
+perian22-1.ncbr.muni.cz
+perian22-2.ncbr.muni.cz
+perian2-2.ncbr.muni.cz
+perian23-1.ncbr.muni.cz
+perian23-2.ncbr.muni.cz
+perian24-1.ncbr.muni.cz
+perian24-2.ncbr.muni.cz
+perian25-1.ncbr.muni.cz
+perian25-2.ncbr.muni.cz
+perian26-1.ncbr.muni.cz
+perian26-2.ncbr.muni.cz
+perian27-1.ncbr.muni.cz
+perian27-2.ncbr.muni.cz
+perian28-1.ncbr.muni.cz
+perian28-2.ncbr.muni.cz
+perian29-1.ncbr.muni.cz
+perian29-2.ncbr.muni.cz
+perian30-1.ncbr.muni.cz
+perian30-2.ncbr.muni.cz
+perian31-1.ncbr.muni.cz
+perian31-2.ncbr.muni.cz
+perian3-1.ncbr.muni.cz
+perian32-1.ncbr.muni.cz
+perian32-2.ncbr.muni.cz
+perian3-2.ncbr.muni.cz
+perian33-1.ncbr.muni.cz
+perian33-2.ncbr.muni.cz
+perian34-1.ncbr.muni.cz
+perian34-2.ncbr.muni.cz
+perian35-1.ncbr.muni.cz
+perian35-2.ncbr.muni.cz
+perian36-1.ncbr.muni.cz
+perian36-2.ncbr.muni.cz
+perian37-1.ncbr.muni.cz
+perian37-2.ncbr.muni.cz
+perian38-1.ncbr.muni.cz
+perian38-2.ncbr.muni.cz
+perian39-1.ncbr.muni.cz
+perian39-2.ncbr.muni.cz
+perian40-1.ncbr.muni.cz
+perian40-2.ncbr.muni.cz
+perian4-1.ncbr.muni.cz
+perian4-2.ncbr.muni.cz
+perian5-1.ncbr.muni.cz
+perian5-2.ncbr.muni.cz
+perian6-1.ncbr.muni.cz
+perian6-2.ncbr.muni.cz
+perian7-1.ncbr.muni.cz
+perian7-2.ncbr.muni.cz
+perian8-1.ncbr.muni.cz
+perian8-2.ncbr.muni.cz
+perian9-1.ncbr.muni.cz
+perian9-2.ncbr.muni.cz
+loslab1-1.ics.muni.cz
+loslab1-2.ics.muni.cz
+loslab2-1.ics.muni.cz
+loslab2-2.ics.muni.cz
+loslab3-1.ics.muni.cz
+loslab3-2.ics.muni.cz
+loslab4-1.ics.muni.cz
+loslab4-2.ics.muni.cz
+loslab5-1.ics.muni.cz
+loslab5-2.ics.muni.cz
+loslab6-1.ics.muni.cz
+loslab6-2.ics.muni.cz
+manwe3.ics.muni.cz
+manwe4.ics.muni.cz
+loslab1.ics.muni.cz
+loslab2.ics.muni.cz
+loslab3.ics.muni.cz
+loslab4.ics.muni.cz
+loslab5.ics.muni.cz
+loslab6.ics.muni.cz
+perian55-2.ncbr.muni.cz
+skirit50.ics.muni.cz
+skirit51.ics.muni.cz
+skirit52.ics.muni.cz
+skirit53.ics.muni.cz
+skirit54.ics.muni.cz
+skirit55.ics.muni.cz
+skirit56.ics.muni.cz
+skirit57.ics.muni.cz
+skirit58.ics.muni.cz
+skirit59.ics.muni.cz
+skirit60.ics.muni.cz
+skirit61.ics.muni.cz
+skirit62.ics.muni.cz
+skirit63.ics.muni.cz
+skirit64.ics.muni.cz
+skirit65.ics.muni.cz
+skirit66.ics.muni.cz
+skirit67.ics.muni.cz
+skirit68.ics.muni.cz
+skirit69.ics.muni.cz
+skirit70.ics.muni.cz
+skirit71.ics.muni.cz
+skirit72.ics.muni.cz
+skirit73.ics.muni.cz
+skirit74.ics.muni.cz
+skirit75.ics.muni.cz
+skirit76.ics.muni.cz
+skirit77.ics.muni.cz
+skirit78.ics.muni.cz
+skirit79.ics.muni.cz
+skirit80.ics.muni.cz
+skirit84.ics.muni.cz
+perian10.ncbr.muni.cz
+perian11.ncbr.muni.cz
+perian12.ncbr.muni.cz
+perian13.ncbr.muni.cz
+perian14.ncbr.muni.cz
+perian15.ncbr.muni.cz
+perian16.ncbr.muni.cz
+perian17.ncbr.muni.cz
+perian18.ncbr.muni.cz
+perian19.ncbr.muni.cz
+perian1.ncbr.muni.cz
+perian20.ncbr.muni.cz
+perian21.ncbr.muni.cz
+perian22.ncbr.muni.cz
+perian23.ncbr.muni.cz
+perian24.ncbr.muni.cz
+perian25.ncbr.muni.cz
+perian26.ncbr.muni.cz
+perian27.ncbr.muni.cz
+perian28.ncbr.muni.cz
+perian29.ncbr.muni.cz
+perian2.ncbr.muni.cz
+perian30.ncbr.muni.cz
+perian31.ncbr.muni.cz
+perian32.ncbr.muni.cz
+perian33.ncbr.muni.cz
+perian34.ncbr.muni.cz
+perian35.ncbr.muni.cz
+perian36.ncbr.muni.cz
+perian37.ncbr.muni.cz
+perian38.ncbr.muni.cz
+perian39.ncbr.muni.cz
+perian3.ncbr.muni.cz
+perian40.ncbr.muni.cz
+perian4.ncbr.muni.cz
+perian5.ncbr.muni.cz
+perian6.ncbr.muni.cz
+perian7.ncbr.muni.cz
+perian8.ncbr.muni.cz
+perian9.ncbr.muni.cz
+tarkil10.cesnet.cz
+tarkil11.cesnet.cz
+tarkil12.cesnet.cz
+tarkil13.cesnet.cz
+tarkil14.cesnet.cz
+tarkil15.cesnet.cz
+tarkil17.cesnet.cz
+tarkil18.cesnet.cz
+tarkil19.cesnet.cz
+tarkil20.cesnet.cz
+tarkil21.cesnet.cz
+tarkil22.cesnet.cz
+tarkil23.cesnet.cz
+tarkil24.cesnet.cz
+tarkil25.cesnet.cz
+tarkil26.cesnet.cz
+tarkil27.cesnet.cz
+tarkil5.cesnet.cz
+tarkil7.cesnet.cz
+tarkil9.cesnet.cz
+konos10.fav.zcu.cz
+konos1.fav.zcu.cz
+konos2.fav.zcu.cz
+konos3.fav.zcu.cz
+konos4.fav.zcu.cz
+konos5.fav.zcu.cz
+konos6.fav.zcu.cz
+konos7.fav.zcu.cz
+konos8.fav.zcu.cz
+konos9.fav.zcu.cz
+tarkil8-1.cesnet.cz
+tarkil8-2.cesnet.cz
+tarkil8.cesnet.cz
+alela1-1.feec.vutbr.cz
+alela1-2.feec.vutbr.cz
+alela1.feec.vutbr.cz
+alela10-1.feec.vutbr.cz
+alela10-2.feec.vutbr.cz
+alela10.feec.vutbr.cz
+alela11-1.feec.vutbr.cz
+alela11-2.feec.vutbr.cz
+alela11.feec.vutbr.cz
+alela12-1.feec.vutbr.cz
+alela12-2.feec.vutbr.cz
+alela12.feec.vutbr.cz
+alela2-1.feec.vutbr.cz
+alela2-2.feec.vutbr.cz
+alela2.feec.vutbr.cz
+alela3-1.feec.vutbr.cz
+alela3-2.feec.vutbr.cz
+alela3.feec.vutbr.cz
+alela4-1.feec.vutbr.cz
+alela4-2.feec.vutbr.cz
+alela4.feec.vutbr.cz
+alela5-1.feec.vutbr.cz
+alela5-2.feec.vutbr.cz
+alela5.feec.vutbr.cz
+alela6-1.feec.vutbr.cz
+alela6-2.feec.vutbr.cz
+alela6.feec.vutbr.cz
+alela7-1.feec.vutbr.cz
+alela7-2.feec.vutbr.cz
+alela7.feec.vutbr.cz
+alela8-1.feec.vutbr.cz
+alela8-2.feec.vutbr.cz
+alela8.feec.vutbr.cz
+alela9-1.feec.vutbr.cz
+alela9-2.feec.vutbr.cz
+alela9.feec.vutbr.cz
+konos15-1.fav.zcu.cz
+konos15-2.fav.zcu.cz
+konos15.fav.zcu.cz
+konos17-1.fav.zcu.cz
+konos17-2.fav.zcu.cz
+konos17.fav.zcu.cz
+konos18-1.fav.zcu.cz
+konos18-2.fav.zcu.cz
+konos18.fav.zcu.cz
+konos20-2.fav.zcu.cz
+konos20.fav.zcu.cz
+konos22-1.fav.zcu.cz
+konos22-2.fav.zcu.cz
+konos22.fav.zcu.cz
+konos27-1.fav.zcu.cz
+konos27-2.fav.zcu.cz
+konos27.fav.zcu.cz
+konos30-1.fav.zcu.cz
+konos30-2.fav.zcu.cz
+konos30.fav.zcu.cz
+konos34-1.fav.zcu.cz
+konos34-2.fav.zcu.cz
+konos34.fav.zcu.cz
+hermes05-1.prf.jcu.cz
+hermes05-2.prf.jcu.cz
+hermes05.prf.jcu.cz
+orca1-1.ics.muni.cz
+orca1-2.ics.muni.cz
+orca1.ics.muni.cz
+orca10-1.ics.muni.cz
+orca10-2.ics.muni.cz
+orca10.ics.muni.cz
+orca11-1.ics.muni.cz
+orca11-2.ics.muni.cz
+orca11.ics.muni.cz
+orca12-1.ics.muni.cz
+orca12-2.ics.muni.cz
+orca12.ics.muni.cz
+orca13-1.ics.muni.cz
+orca13-2.ics.muni.cz
+orca13.ics.muni.cz
+orca14-1.ics.muni.cz
+orca14-2.ics.muni.cz
+orca14.ics.muni.cz
+orca15-1.ics.muni.cz
+orca15-2.ics.muni.cz
+orca15.ics.muni.cz
+orca16-1.ics.muni.cz
+orca16-2.ics.muni.cz
+orca16.ics.muni.cz
+orca17-1.ics.muni.cz
+orca17-2.ics.muni.cz
+orca17.ics.muni.cz
+orca18-1.ics.muni.cz
+orca18-2.ics.muni.cz
+orca18.ics.muni.cz
+orca2-1.ics.muni.cz
+orca2-2.ics.muni.cz
+orca2.ics.muni.cz
+orca3-1.ics.muni.cz
+orca3-2.ics.muni.cz
+orca3.ics.muni.cz
+orca5-1.ics.muni.cz
+orca5-2.ics.muni.cz
+orca5.ics.muni.cz
+orca6-1.ics.muni.cz
+orca6-2.ics.muni.cz
+orca6.ics.muni.cz
+orca7-1.ics.muni.cz
+orca7-2.ics.muni.cz
+orca7.ics.muni.cz
+orca8-1.ics.muni.cz
+orca8-2.ics.muni.cz
+orca8.ics.muni.cz
+orca9-1.ics.muni.cz
+orca9-2.ics.muni.cz
+orca9.ics.muni.cz
+quark11-1.video.muni.cz
+quark11-2.video.muni.cz
+quark11.video.muni.cz
+quark12-1.video.muni.cz
+quark12-2.video.muni.cz
+quark12.video.muni.cz
+quark13-1.video.muni.cz
+quark13-2.video.muni.cz
+quark13.video.muni.cz
+quark14-1.video.muni.cz
+quark14-2.video.muni.cz
+quark14.video.muni.cz
+quark15-1.video.muni.cz
+quark15-2.video.muni.cz
+quark15.video.muni.cz
+quark6-1.video.muni.cz
+quark6-2.video.muni.cz
+quark6.video.muni.cz
+quark7-1.video.muni.cz
+quark7-2.video.muni.cz
+quark7.video.muni.cz
+hermes07-1.prf.jcu.cz
+hermes07-2.prf.jcu.cz
+hermes07.prf.jcu.cz
+hermes08-1.prf.jcu.cz
+hermes08-2.prf.jcu.cz
+hermes08.prf.jcu.cz
+hermes09-1.prf.jcu.cz
+hermes09-2.prf.jcu.cz
+hermes09.prf.jcu.cz
+hermes10-1.prf.jcu.cz
+hermes10-2.prf.jcu.cz
+hermes10.prf.jcu.cz
+hermes03-1.prf.jcu.cz
+hermes03-2.prf.jcu.cz
+hermes03.prf.jcu.cz
+konos37-1.fav.zcu.cz
+konos37-2.fav.zcu.cz
+konos37.fav.zcu.cz
+tarkil1-1.cesnet.cz
+tarkil1-2.cesnet.cz
+tarkil1.cesnet.cz
+nympha1-1.zcu.cz
+nympha1-2.zcu.cz
+nympha1.zcu.cz
+nympha2-1.zcu.cz
+nympha2-2.zcu.cz
+nympha2.zcu.cz
+nympha3-1.zcu.cz
+nympha3-2.zcu.cz
+nympha3.zcu.cz
+nympha4-1.zcu.cz
+nympha4-2.zcu.cz
+nympha4.zcu.cz
+nympha5-1.zcu.cz
+nympha5-2.zcu.cz
+nympha5.zcu.cz
+nympha6-1.zcu.cz
+nympha6-2.zcu.cz
+nympha6.zcu.cz
+nympha7-1.zcu.cz
+nympha7-2.zcu.cz
+nympha7.zcu.cz
+nympha8-1.zcu.cz
+nympha8-2.zcu.cz
+nympha8.zcu.cz
+nympha9-1.zcu.cz
+nympha9-2.zcu.cz
+nympha9.zcu.cz
+hermes06-1.prf.jcu.cz
+hermes06-2.prf.jcu.cz
+hermes06.prf.jcu.cz
+quark9-1.video.muni.cz
+quark9-2.video.muni.cz
+quark9.video.muni.cz
+konos16-1.fav.zcu.cz
+konos16-2.fav.zcu.cz
+konos16.fav.zcu.cz
+konos24-1.fav.zcu.cz
+konos24-2.fav.zcu.cz
+konos24.fav.zcu.cz
+konos26-1.fav.zcu.cz
+konos26-2.fav.zcu.cz
+konos26.fav.zcu.cz
+konos36-1.fav.zcu.cz
+konos36-2.fav.zcu.cz
+konos36.fav.zcu.cz
+nympha10-1.zcu.cz
+nympha10-2.zcu.cz
+nympha10.zcu.cz
+tarkil16-1.cesnet.cz
+tarkil16-2.cesnet.cz
+tarkil16.cesnet.cz
+tarkil2-1.cesnet.cz
+tarkil2-2.cesnet.cz
+tarkil2.cesnet.cz
+ajax.zcu.cz
+eru1.ruk.cuni.cz
+eru2.ruk.cuni.cz
+hermes02-1.prf.jcu.cz
+hermes02-2.prf.jcu.cz
+hermes02.prf.jcu.cz
+nympha12-1.zcu.cz
+nympha12-2.zcu.cz
+nympha12.zcu.cz
+nympha13-1.zcu.cz
+nympha13-2.zcu.cz
+nympha13.zcu.cz
+nympha15-1.zcu.cz
+nympha15-2.zcu.cz
+nympha15.zcu.cz
+nympha16-1.zcu.cz
+nympha16-2.zcu.cz
+nympha16.zcu.cz
+nympha17-1.zcu.cz
+nympha17-2.zcu.cz
+nympha17.zcu.cz
+nympha19-1.zcu.cz
+nympha19-2.zcu.cz
+nympha19.zcu.cz
+quark10-1.video.muni.cz
+quark10-2.video.muni.cz
+quark10.video.muni.cz
+quark8-1.video.muni.cz
+quark8-2.video.muni.cz
+quark8.video.muni.cz
+hermes11-1.prf.jcu.cz
+hermes11-2.prf.jcu.cz
+hermes11.prf.jcu.cz
+orca4-1.ics.muni.cz
+orca4-2.ics.muni.cz
+orca4.ics.muni.cz
+hermes01-1.prf.jcu.cz
+hermes01-2.prf.jcu.cz
+hermes01.prf.jcu.cz
+quark16-1.video.muni.cz
+quark16-2.video.muni.cz
+quark16.video.muni.cz
+nympha11-1.zcu.cz
+nympha11-2.zcu.cz
+nympha11.zcu.cz
+nympha18-1.zcu.cz
+nympha18-2.zcu.cz
+nympha18.zcu.cz
+tarkil3-1.cesnet.cz
+tarkil3-2.cesnet.cz
+tarkil3.cesnet.cz
+tarkil28-1.cesnet.cz
+tarkil28-2.cesnet.cz
+tarkil28.cesnet.cz
+manwe1.ics.muni.cz
+manwe2.ics.muni.cz
+manwe5.ics.muni.cz
+manwe6.ics.muni.cz
+manwe7.ics.muni.cz
+perian55.ncbr.muni.cz
+skirit80-1.ics.muni.cz
+tarkil4-1.cesnet.cz
+tarkil4-2.cesnet.cz
+tarkil4.cesnet.cz
+tarkil6-1.cesnet.cz
+tarkil6-2.cesnet.cz
+tarkil6.cesnet.cz
+nympha14-1.zcu.cz
+nympha14-2.zcu.cz
+nympha14.zcu.cz
+skirit83.ics.muni.cz
+skirit83-1.ics.muni.cz
+skirit83-2.ics.muni.cz
+luna3.fzu.cz
+apollo1.fzu.cz
+apollo2.fzu.cz
+apollo3.fzu.cz
+perian56-1.ncbr.muni.cz
+perian56-2.ncbr.muni.cz
+perian56.ncbr.muni.cz
+perian41-1.ncbr.muni.cz
+perian41-2.ncbr.muni.cz
+perian41.ncbr.muni.cz
+perian42-1.ncbr.muni.cz
+perian42-2.ncbr.muni.cz
+perian42.ncbr.muni.cz
+perian43-1.ncbr.muni.cz
+perian43-2.ncbr.muni.cz
+perian43.ncbr.muni.cz
+perian44-1.ncbr.muni.cz
+perian44-2.ncbr.muni.cz
+perian44.ncbr.muni.cz
+perian45-1.ncbr.muni.cz
+perian45-2.ncbr.muni.cz
+perian45.ncbr.muni.cz
+perian46-1.ncbr.muni.cz
+perian46-2.ncbr.muni.cz
+perian46.ncbr.muni.cz
+perian47-1.ncbr.muni.cz
+perian47-2.ncbr.muni.cz
+perian47.ncbr.muni.cz
+perian48-1.ncbr.muni.cz
+perian48-2.ncbr.muni.cz
+perian48.ncbr.muni.cz
+perian49-1.ncbr.muni.cz
+perian49-2.ncbr.muni.cz
+perian49.ncbr.muni.cz
+perian50-1.ncbr.muni.cz
+perian50-2.ncbr.muni.cz
+perian50.ncbr.muni.cz
+perian51-1.ncbr.muni.cz
+perian51-2.ncbr.muni.cz
+perian51.ncbr.muni.cz
+perian52-1.ncbr.muni.cz
+perian52-2.ncbr.muni.cz
+perian52.ncbr.muni.cz
+perian53-1.ncbr.muni.cz
+perian53-2.ncbr.muni.cz
+perian53.ncbr.muni.cz
+perian54-1.ncbr.muni.cz
+perian54-2.ncbr.muni.cz
+perian54.ncbr.muni.cz
+skirit80-2.ics.muni.cz
+minos1.zcu.cz
+minos1-1.zcu.cz
+minos1-2.zcu.cz
+minos2.zcu.cz
+minos2-1.zcu.cz
+minos2-2.zcu.cz
+minos3.zcu.cz
+minos3-1.zcu.cz
+minos3-2.zcu.cz
+minos4.zcu.cz
+minos4-1.zcu.cz
+minos4-2.zcu.cz
+minos5.zcu.cz
+minos5-1.zcu.cz
+minos5-2.zcu.cz
+minos6.zcu.cz
+minos6-1.zcu.cz
+minos6-2.zcu.cz
+minos7.zcu.cz
+minos7-1.zcu.cz
+minos7-2.zcu.cz
+minos8.zcu.cz
+minos8-1.zcu.cz
+minos8-2.zcu.cz
+minos9.zcu.cz
+minos9-1.zcu.cz
+minos9-2.zcu.cz
+minos10.zcu.cz
+minos10-1.zcu.cz
+minos10-2.zcu.cz
+minos11.zcu.cz
+minos11-1.zcu.cz
+minos11-2.zcu.cz
+minos12.zcu.cz
+minos12-1.zcu.cz
+minos12-2.zcu.cz
+minos13.zcu.cz
+minos13-1.zcu.cz
+minos13-2.zcu.cz
+minos14.zcu.cz
+minos14-1.zcu.cz
+minos14-2.zcu.cz
+minos15.zcu.cz
+minos15-1.zcu.cz
+minos15-2.zcu.cz
+minos16.zcu.cz
+minos16-1.zcu.cz
+minos16-2.zcu.cz
+minos17.zcu.cz
+minos17-1.zcu.cz
+minos17-2.zcu.cz
+minos18.zcu.cz
+minos18-1.zcu.cz
+minos18-2.zcu.cz
+minos19.zcu.cz
+minos19-1.zcu.cz
+minos19-2.zcu.cz
+minos20.zcu.cz
+minos20-1.zcu.cz
+minos20-2.zcu.cz
+minos21.zcu.cz
+minos21-1.zcu.cz
+minos21-2.zcu.cz
+minos22.zcu.cz
+minos22-1.zcu.cz
+minos22-2.zcu.cz
+minos23.zcu.cz
+minos23-1.zcu.cz
+minos23-2.zcu.cz
+minos24.zcu.cz
+minos24-1.zcu.cz
+minos24-2.zcu.cz
+minos25.zcu.cz
+minos25-1.zcu.cz
+minos25-2.zcu.cz
+minos26.zcu.cz
+minos26-1.zcu.cz
+minos26-2.zcu.cz
+minos27.zcu.cz
+minos27-1.zcu.cz
+minos27-2.zcu.cz
+minos28.zcu.cz
+minos28-1.zcu.cz
+minos28-2.zcu.cz
+minos29.zcu.cz
+minos29-1.zcu.cz
+minos29-2.zcu.cz
+minos30.zcu.cz
+minos30-1.zcu.cz
+minos30-2.zcu.cz
+minos31.zcu.cz
+minos31-1.zcu.cz
+minos31-2.zcu.cz
+minos32.zcu.cz
+minos32-1.zcu.cz
+minos32-2.zcu.cz
+minos33.zcu.cz
+minos33-1.zcu.cz
+minos33-2.zcu.cz
+minos34.zcu.cz
+minos34-1.zcu.cz
+minos34-2.zcu.cz
+minos35.zcu.cz
+minos35-1.zcu.cz
+minos35-2.zcu.cz
+minos36.zcu.cz
+minos36-1.zcu.cz
+minos36-2.zcu.cz
+minos37.zcu.cz
+minos37-1.zcu.cz
+minos37-2.zcu.cz
+minos38.zcu.cz
+minos38-1.zcu.cz
+minos38-2.zcu.cz
+minos39.zcu.cz
+minos39-1.zcu.cz
+minos39-2.zcu.cz
+minos40.zcu.cz
+minos40-1.zcu.cz
+minos40-2.zcu.cz
+minos41.zcu.cz
+minos41-1.zcu.cz
+minos41-2.zcu.cz
+minos42.zcu.cz
+minos42-1.zcu.cz
+minos42-2.zcu.cz
+minos43.zcu.cz
+minos43-1.zcu.cz
+minos43-2.zcu.cz
+minos44.zcu.cz
+minos44-1.zcu.cz
+minos44-2.zcu.cz
+minos45.zcu.cz
+minos45-1.zcu.cz
+minos45-2.zcu.cz
+minos46.zcu.cz
+minos46-1.zcu.cz
+minos46-2.zcu.cz
+minos47.zcu.cz
+minos47-1.zcu.cz
+minos47-2.zcu.cz
+minos48.zcu.cz
+minos48-1.zcu.cz
+minos48-2.zcu.cz
+minos49.zcu.cz
+minos49-1.zcu.cz
+minos49-2.zcu.cz
+skirit66-1.ics.muni.cz
+skirit66-2.ics.muni.cz
+luna1.fzu.cz
+mandos1.ics.muni.cz
+mandos2.ics.muni.cz
+mandos3.ics.muni.cz
+mandos4.ics.muni.cz
+mandos5.ics.muni.cz
+mandos6.ics.muni.cz
+mandos7.ics.muni.cz
+mandos8.ics.muni.cz
+mandos9.ics.muni.cz
+mandos10.ics.muni.cz
+mandos11.ics.muni.cz
+mandos12.ics.muni.cz
+mandos13.ics.muni.cz
+mandos14.ics.muni.cz
--- a/src/meta/warden-client-meta.tgz
+++ b/src/meta/warden-client-meta.tgz
--- a/src/meta/wardentest-lenny-meta.sh
+++ b/src/meta/wardentest-lenny-meta.sh
+#!/bin/bash
+
+#IP serveru 
+SERVER=""
+PORT=""
+
+#Cesta ke scriptum a zdrojakum, typicky AFS, napr. /afs/zcu.cz/users/v/vomacka/public/wardentest
+BASE=""
+
+HNAME=`hostname -f`
+
+# STAGEIN
+WDIR="/scratch/${PBS_O_LOGNAME}/wardentest.$$"
+mkdir -p $WDIR || exit 1
+cd $WDIR
+
+tar xzf $BASE/warden-client-meta.tgz 
+perl -pi -e "s#\[path\]#$WDIR#" performance-sender.pm
+perl -pi -e "s#\[path\]#$WDIR#" etc/warden-client.conf
+perl -pi -e "s#\[server\]#$SERVER#" etc/warden-client.conf
+perl -pi -e "s#\[port\]#$PORT#" etc/warden-client.conf
+
+openssl req -new -nodes -keyform PEM -outform PEM -config ./ca/openssl.cnf -keyout ./ca/server-key.pem -out ./ca/server.csr -subj "/CN=$HNAME" -days 365 
+openssl ca -batch -keyform PEM -passin pass:test -name client_ca -config ./ca/openssl.cnf -out ./ca/server-cert.pem -infiles ./ca/server.csr
+
+# JOB
+for i in `seq 1 1000`; do 
+./performance-sender.pm test 10 &> /dev/null
+done
+
+date
+
+# STAGEOUT
+#cp p1.log $BASE/output-p1.log.$PBS_JOBID.$HNAME
+#cp p2.log $BASE/output-p2.log.$PBS_JOBID.$HNAME
+cd /tmp
+rm -rf $WDIR
+
--- a/src/meta/wtw-lenny-meta.sh
+++ b/src/meta/wtw-lenny-meta.sh
+#!/bin/bash
+#PBS -N wtw-lenny.sh
+#PBS -q short
+#PBS -l nodes=1:ppn=1:^cl_luna
+#PBS -j oe
+#PBS -m abe
+#
+# describtion from 'man qsub':
+# -N ... declares a name for the job.  The name specified may be up to and including 15 characters in  length.   It
+#        must consist of printable, non white space characters with the first character alphabetic.
+# -q ... defines the destination of the job (queue)
+# -l ... defines  the  resources that are required by the job
+# -j oe ... standard error stream of the job will be merged with the standard output stream
+# -m ace ...  mail is sent anytime
+
+#in file name of which can be found in variable PBS_NODEFILE, is list of allocated machines
+echo '***PBS_NODEFILE***START*******'
+cat $PBS_NODEFILE
+echo '***PBS_NODEFILE***END*********'
+
+#Cesta ke scriptum a zdrojakum, typicky AFS, napr. /afs/zcu.cz/users/v/vomacka/public/wardentest
+BASE=""
+cd $BASE || exit 1
+
+# spusti dany prikaz na vsech pridelenych strojich
+pbsdsh -o -- bash ${BASE}/wardentest-lenny-meta.sh
+
+
--- a/src/warden-client/doc/AUTHORS
+++ b/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>
+
+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>
--- a/src/warden-client/doc/CHANGELOG
+++ b/src/warden-client/doc/CHANGELOG
+2012-05-10 v.2.0.0-beta beta version of warden-client-2.0.0
+-----------------------------------------------------------
+- Changed communication with server: HTTP layer added (compatible with
+  Apache mod_perl 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

--- a/src/warden-client/doc/README
+++ b/src/warden-client/doc/README
-+------------------------------+
-| 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
 
@@ -59,7 +58,7 @@ B. Installation Dependencies
    Perl 			>= 5.10.1  
    SOAP::Lite			>= 0.712
    IO::Socket::SSL		>= 1.33
-    SOAP::Transport::TCP	>= 0.712
+    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.
--- a/src/warden-client/doc/example-receiver.pl.txt
+++ b/src/warden-client/doc/example-receiver.pl.txt
 #!/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;


--- a/src/warden-client/doc/example-sender.pl.txt
+++ b/src/warden-client/doc/example-sender.pl.txt
 #!/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;

--- a/src/warden-client/etc/package_version
+++ b/src/warden-client/etc/package_version
-warden-client-1.2.0
+warden-client-2.0.0-beta
--- a/src/warden-client/etc/warden-client.conf
+++ b/src/warden-client/etc/warden-client.conf
@@ -21,3 +21,4 @@ $SSL_CERT_FILE = "/opt/warden-client/etc/warden-dev.cesnet.cz.pem";
 # SSL_CA_FILE - path to CA certificate file
 #-------------------------------------------------------------------------------
 $SSL_CA_FILE = "/etc/ssl/certs/tcs-ca-bundle.pem";
+
--- 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

--- a/src/warden-client/lib/WardenClientReceive.pm
+++ b/src/warden-client/lib/WardenClientReceive.pm
@@ -3,43 +3,18 @@
 # 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;

 use strict;
 use SOAP::Lite;
 use IO::Socket::SSL qw(debug1);
-use SOAP::Transport::TCP;
+use SOAP::Transport::HTTP;
 use FindBin;

-our $VERSION = "1.2";
+our $VERSION = "2.0"; #first iteration after 'port to Apache'

 #-------------------------------------------------------------------------------
 # errMsg - print error message and die
@@ -65,19 +40,18 @@ sub c2s

  my $client;
  my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
-  if (!($client = SOAP::Transport::TCP::Client->new(
-    PeerAddr            => $server,
-    PeerPort            => $port,
-    Proto               => 'tcp',
+  if (!($client = SOAP::Transport::HTTP::Client->new())) {
+    errMsg("Sorry, unable to create socket: " . &SOAP::Transport::HTTP::Client::errstr)
+  }
+  $client->ssl_opts(verify_hostname     => 1,
        		        SSL_use_cert        => 1,
        		        SSL_verify_mode     => 0x02,
        		        SSL_key_file        => $ssl_key_file,
        		        SSL_cert_file       => $ssl_cert_file,
-    SSL_ca_file         => $ssl_ca_file,
-  ))) {errMsg("Sorry, unable to create socket: " . &SOAP::Transport::TCP::Client::errstr)}
+        		        SSL_ca_file         => $ssl_ca_file);

  # setting of URI and serialize SOAP envelope and data object
-  my $soap = SOAP::Lite->uri($uri);
+  my $soap     = SOAP::Lite->uri($service)->proxy($uri);
  my $envelope;
  if (!defined $data) {
    $envelope = $soap->serializer->envelope(method => $method);
@@ -86,8 +60,8 @@ sub c2s
  }

  # setting of TCP URI and send serialized SOAP envelope and data
-  my $tcp_uri = "tcp://$server:$port/$service";
-  my $result = $client->send_receive(envelope => $envelope, endpoint => $tcp_uri);
+  my $server_uri = "https://$server:$port/$service";
+  my $result = $client->send_receive(envelope => $envelope, endpoint => $server_uri);

  # check server response
  if (!defined $result) {
@@ -101,6 +75,8 @@ sub c2s
 }


+
+
 #-------------------------------------------------------------------------------
 # getNewEvents - get new events from warden server greater than last received ID
 #-------------------------------------------------------------------------------
@@ -144,10 +120,13 @@ sub getNewEvents
  # get new events from warden server DB based on gathered last ID 

  # create SOAP data obejct
-  my $request_data = SOAP::Data->name(request => \SOAP::Data->value(
+  my $request_data = SOAP::Data->name(
+    request => \SOAP::Data->value(
      SOAP::Data->name(REQUESTED_TYPE => $requested_type),
      SOAP::Data->name(LAST_ID        => $last_id)
-  ));
+    )
+  );
+  
  # call server method getNewEvents 
  my $response = c2s($uri, $ssl_key_file, $ssl_cert_file, $ssl_ca_file, "getNewEvents", $request_data);

@@ -182,7 +161,7 @@ sub getNewEvents
    if ($id > $last_id) {
 	    $last_id = $id;
    }
-  }
+  } #end of while loop

  # write last return ID
  if (defined $last_id) { # must be defined for first check ID
@@ -192,6 +171,7 @@ sub getNewEvents
  }

  return @events;
+
 } # End of getNewEvents

 1;