Skip to Content.
Sympa Menu

perfsonar-dev - r1429 - in branches/release/perfsonar/releng: . perfSONAR-1.0 perfSONAR-1.0/scripts

Subject: perfsonar development work

List archive

r1429 - in branches/release/perfsonar/releng: . perfSONAR-1.0 perfSONAR-1.0/scripts


Chronological Thread 
  • From:
  • To:
  • Subject: r1429 - in branches/release/perfsonar/releng: . perfSONAR-1.0 perfSONAR-1.0/scripts
  • Date: Tue, 18 Jul 2006 01:41:10 -0400
Author: zurawski
Date: 2006-07-18 01:41:09 -0400 (Tue, 18 Jul 2006)
New Revision: 1429

Removed:
branches/release/perfsonar/releng/perfSONAR-1.0/Licence.txt
branches/release/perfsonar/releng/perfSONAR-1.0/Licence.txt.pol
branches/release/perfsonar/releng/perfSONAR-1.0/Readme.txt.pol
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol
Modified:
branches/release/perfsonar/releng/TODO
branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES
branches/release/perfsonar/releng/perfSONAR-1.0/Readme.txt
branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/log.sh
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
Log:
Changes to bring us to an official release.

-jason



Modified: branches/release/perfsonar/releng/TODO
===================================================================
--- branches/release/perfsonar/releng/TODO 2006-07-17 15:45:24 UTC (rev
1428)
+++ branches/release/perfsonar/releng/TODO 2006-07-18 05:41:09 UTC (rev
1429)
@@ -4,7 +4,8 @@

Installer
Need multi-lang support
- IzPack (in it's current state) doesnt allow 'skipping'
- panels (hence the MA/LS info shows up each time),
- but can be modified to do so. We can work on this for
- future releases.
+
+Licence
+ Is needed, go without for now
+
+

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES 2006-07-17
15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES 2006-07-18
05:41:09 UTC (rev 1429)
@@ -1,3 +1,27 @@
+Changes From perfSONAR-1.0 RC3
+------------------------------
+
+Installer
+-------------------
+
+* Graphical installer improved to skip panels
+
+* Questions simplfied and corrected
+
+* perfSONAR Graphic has been added
+
+* README has been corrected and simplified
+
+LS/MA
+-------------------
+
+* Catalina properties file now parsed for extra entries.
+
+* eXist configiration scripts corrected to include admin password options
+
+
+
+
Changes From perfSONAR-1.0 RC2
------------------------------

@@ -66,6 +90,4 @@
TODO
------------------------------

-* Graphical enhancement to skip panels
-
* Feedback on installation procedure

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/Licence.txt

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/Licence.txt.pol

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/Readme.txt
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/Readme.txt 2006-07-17
15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/Readme.txt 2006-07-18
05:41:09 UTC (rev 1429)
@@ -61,7 +61,8 @@
This may (or may not) cause some other problems. T-
he basic issue is that 'pack' files are not expanded
to their jar equivalent. To solve this problem, try
- writing a script like this:
+ writing a script like this (be sure to set executab-
+ le permissions):


#!/bin/sh
@@ -85,7 +86,7 @@
export JRE_HOME=/usr/java/jdk1.5.X_Y/jre
export PATH=$JRE_HOME/bin:$PATH

-export CLASSPATH=.:/usr/java/jdk1.5.X_Y/lib
+export CLASSPATH=.:$CLASSPATH:/usr/java/jdk1.5.X_Y/lib


c) Tomcat
@@ -150,7 +151,8 @@

You should see a tomcat start page. If you see not-
hing, or get an error be sure your port and firewall
- settings are correct.
+ settings are correct, as well as your relative Java
+ paths.

d) Axis
------------------------------------------------------------
@@ -170,7 +172,6 @@
tar -zxf axis-bin-1_2_1.tar.gz
mv axis-1_2_1 /usr/local/axis-1_2_1

-
It is helpful to install symbolic links (to shorten
relative path names). To do so:

@@ -288,10 +289,10 @@
export EXIST_HOME=/usr/local/eXist
export PATH=$EXIST_HOME/bin:$PATH

- The perfSONAR installer is now capable of helping to
- set up eXist to a certain degree. It is still nece-
- ssary to follow the following steps up to (but not
- including) number 5.
+ The perfSONAR installer is capable of helping to se-
+ t up eXist to a certain degree. It is still necess-
+ ary to follow the following steps up to (but not in-
+ cluding) number 5.

The first several steps of server configuration sho-
uld be done before installing perfSONAR:
@@ -385,6 +386,10 @@
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
pub/libs/zlib-1.2.3.tar.gz

+ If your system uses a package manager (apt, yum, et-
+ c.) it may be possible to install the necessary pac-
+ kages via a binary method instead of from source.
+
Installing is done the usual way:

tar -zxf rrdtool-1.2.13.tar.gz
@@ -524,3 +529,6 @@
And we do encourage the use of this for tracking all
problems. The general mailing list is discouraged
for reporting errors.
+
+ When reporting bugs please try to include as much i-
+ nformation as possible.

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/Readme.txt.pol

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.pl 2006-07-17
15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.pl 2006-07-18
05:41:09 UTC (rev 1429)
@@ -1,7 +1,7 @@
#!/usr/bin/perl

# pS version
-$version = "1.0 RC3";
+$version = "1.0";

my %var = ();
my %var1 = ();
@@ -35,26 +35,34 @@
$var{"common.basepath"} = &ask("Enter base path for the application:",
&locate("pwd", "/usr/local/perfSONAR-1.0"));
$var{"common.javapath"} = &ask("Enter java path for the application:" ,
$var{"common.javapath"});
$var{"common.hostname"} = &ask("Enter the hostname:" , &locate("hostname",
"localhost"));
-$var{"common.master_log_size"} = &ask("Enter the size (in # of lines) of the
master log file:", "1000");
-$var{"common.sub_log_size"} = &ask("Enter the size (in # of lines) of the
individual log files:", "100");
+$var{"common.log_size"} = &ask("Enter the max file size of the log files
(indicate KB or MB):", "500KB");
+$var{"common.log_backup_size"} = &ask("Enter the number of backup logs to
keep:", "10");
$var{"common.exist_home"} = &ask("eXist home directory:", &locate("echo
\$EXIST_HOME", "/usr/local/eXist"));

+ # Make these default values (user can twiddle
+ # if they are not happy)
+
$var{"common.log4j_properties"} =
$var{"common.basepath"}."/conf/log4j.properties";
$var{"common.logs_dir"} = $var{"common.basepath"}."/log";
$var{"common.sax_parser_config"} =
$var{"common.basepath"}."/src/objects.config";
+$var{"common.exist_admin_password"} = "";

+
+ # RRD MA installation section
+
$maFlag = 0;
-$ma = &ask("\n\nDo you want to install the MA?", "y/n");
+$ma = &ask("\n\nDo you want to install the RRD MA?", "y/n");
if ($ma eq "y" || $ma eq "Y") {
$maFlag = 1;
- print "Enter Information Specific to the MA:\n\n";
+ print "Enter Information Specific to the RRD MA:\n\n";

$var2{"ma.r_type"} = "ma";
$var2{"ma.tomcat_home"} = &ask("Tomcat home directory:", &locate("echo
\$CATALINA_HOME", "/usr/local/tomcat"));
$var2{"ma.axis_home"} = &ask("Axis home directory:",
$var2{"ma.tomcat_home"}."/webapps/axis");
$var2{"ma.port"} = &ask("Enter Tomcat port:", "8080");

- # copy libraries
+ # copy libraries to axis directory
+
system("cp lib/activation.jar " . $var2{"ma.axis_home"} . "/WEB-INF/lib");
system("cp lib/perfSONAR-generic.jar " . $var2{"ma.axis_home"} .
"/WEB-INF/lib");
system("cp lib/xercesSamples.jar " . $var2{"ma.axis_home"} .
"/WEB-INF/lib");
@@ -73,8 +81,9 @@
system("cp lib/perfSONAR-rrdma.jar " . $var2{"ma.axis_home"} .
"/WEB-INF/lib");
system("cp lib/rrdjtool.jar " . $var2{"ma.axis_home"} . "/WEB-INF/lib");

+ # CLASSPATH munging

- print "\n\nBe sure to change your CLASSPATH:\n";
+ print "\n\nBe sure to edit your CLASSPATH:\n";
print "\tCLASSPATH=\$CLASSPATH:";
$cp = $var2{"ma.axis_home"} . "/WEB-INF/lib/" . "axis-ant.jar" . ":";
$cp = $cp . $var2{"ma.axis_home"} . "/WEB-INF/lib/" .
"commons-discovery-0.2.jar" . ":";
@@ -97,26 +106,32 @@
}

print $cp , "\n\texport CLASSPATH\n\n";
- print "Please be sure tomcat and axis are running.\n\n";
+ print "Please be sure axis is installed, and tomcat is running.\n\n";


-
- $var2{"ma.service_name"} = &ask("Enter service name:", "Measurement
Archive Service");
- $var2{"ma.rrdjdir"} = &ask("Enter rrdj directory:",
$var{"common.basepath"}."/contrib/rrdjtool");
+ # default answer, this should be
+ # good enough
+ $var2{"ma.rrdjdir"} = $var{"common.basepath"}."/contrib/rrdjtool";
$var2{"ma.rrdtool_path"} = &ask("Enter rrdtool path:",
"/usr/local/rrdtool");

- print "\n\nBe sure to change your LD_LIBRARY_PATH:\n";
+
+ # LD_LIBRARY_PATH munging
+
+ print "\n\nBe sure to edit your LD_LIBRARY_PATH:\n";
print "\tLD_LIBRARY_PATH=\$LD_LIBRARY_PATH:" , $var2{"ma.rrdtool_path"} ,
"/lib:" . $var2{"ma.rrdjdir"} . "/build\n";
print "\texport LD_LIBRARY_PATH\n\n";

- $var2{"ma.r_access_point"} = &ask("Measurement Archive Information of
service -- access point (URL):",
+
+ # service specific information
+ $var2{"ma.service_name"} = &ask("Enter general service name:",
"Measurement Archive Service");
+ $var2{"ma.r_access_point"} = &ask("Measurement Archive access point
(URL):",
"http://".$var{"common.hostname"}.":"; . $var2{"ma.port"} .
"/axis/services/MeasurementArchiveService");
- $var2{"ma.r_service_name"} = &ask("Measurement Archive Information of
service -- service name:", "Java MA");
- $var2{"ma.r_service_type"} = &ask("Measurement Archive Information of
service -- service type:", "MA");
- $var2{"ma.r_description"} = &ask("Measurement Archive Information of
service -- service description:", "Java RRD MA, perfSONAR project");

+ $var2{"ma.r_service_name"} = &ask("Measurement Archive service name:",
"Java MA");
+ $var2{"ma.r_service_type"} = &ask("Measurement Archive service type:",
"MA");
+ $var2{"ma.r_description"} = &ask("Measurement Archive service
description:", "Java RRD MA, perfSONAR project");

$ma_ls = "";
- $ma_exist = &ask("\n\nDo you want to register with a LookupService?",
"y/n");
+ $ma_exist = &ask("\n\nDo you want to register the RRD MA with a
LookupService?", "y/n");
if ($ma_exist eq "y" || $ma_exist eq "Y") {
$var2{"ma.r_lookup_service"} = &ask("Lookup Information to register with
(URL):",
"http://".$var{"common.hostname"}.":"; . $var2{"ma.port"} .
"/axis/services/LookupService");
@@ -126,25 +141,31 @@
$var2{"ma.r_lookup_service"} = "";
}

- $var2{"ma.conf_file"} = &ask("MA Storage Conf File:",
$var{"common.basepath"}."/conf/rrd-database_TEST.xml");

+ # set up the conf file (it is generated on
+ # the fly w/ current time stamps so it can
+ # be used for testing purposes)

- # ma rrddb executable
- $ARG = "\"" . $var{"common.basepath"} . "\"";
- system("./scripts/rrddb.sh " . $ARG);
-
+ $var2{"ma.conf_file"} = &ask("MA Storage Conf File:",
$var{"common.basepath"}."/conf/rrd-database_TEST.xml");
+
+ if($var2{"ma.conf_file"} eq
$var{"common.basepath"}."/conf/rrd-database_TEST.xml") {
+ $ARG = "\"" . $var{"common.basepath"} . "\"";
+ system("./scripts/rrddb.sh " . $ARG);
+ }

+ # So are we using the xml DB?
+
$ma_exist = &ask("\n\nDo you want the MA to use an eXist database?",
"y/n");
if ($ma_exist eq "y" || $ma_exist eq "Y") {
- $var2{"ma.storage_uri"} = &ask("MA Storage -- XML database collection:",
"xmldb:exist://localhost:8680/exist/xmlrpc/db/rrdmaconfig");
- $var2{"ma.storage_username"} = &ask("MA Storage -- XML database
username:", "rrdmaservice");
- $var2{"ma.storage_password"} = &ask("MA Storage -- XML database
password:", "rrdmaservice");
+ $var2{"ma.storage_uri"} = &ask("XML database collection:",
"xmldb:exist://localhost:8680/exist/xmlrpc/db/rrdmaconfig");
+ $var2{"ma.storage_username"} = &ask("XML database username:",
"rrdmaservice");
+ $var2{"ma.storage_password"} = &ask("XML database password:",
"rrdmaservice");
$var2{"ma.storage.use"} = "on";

$ma_exist_store = &ask("\n\nDo you want the allow the MA to store
data?", "y/n");
if ($ma_exist_store eq "y" || $ma_exist_store eq "Y") {
$var2{"ma.allow.store"} = "on";
- $var2{"ma.store_dir"} = &ask("MA Storage RRD Storage Directory:",
$var{"common.basepath"}."/data/rrd/test");
+ $var2{"ma.store_dir"} = &ask("RRD Storage Directory:",
$var{"common.basepath"}."/data/rrd/test");
}
else {
$var2{"ma.allow.store"} = "off";
@@ -153,17 +174,22 @@

$exist_install = &ask("\n\nDo you want the installer to configure eXist
for you?", "y/n");
if ($exist_install eq "y" || $exist_install eq "Y") {
+
+ $var{"common.exist_admin_password"} = &ask("eXist admin password",
"");
+
print "\nA backup of the old eXist database will be in '" ,
$var{"common.basepath"};
print "/conf'.\nRunning the 'restore' shell script will roll back the
database.\n\n";

$ARG = "\"". $var2{"ma.storage_uri"} . "\" \"" .
$var2{"ma.storage_username"} . "\" \"";
$ARG = $ARG . $var2{"ma.storage_password"} . "\" \"" .
$var{"common.exist_home"} . "\" \"";
$ARG = $ARG . $var2{"ma.conf_file"} . "\" \"no\" \"" .
$var{"common.basepath"} . "\" \"";
- $ARG = $ARG . $var2{"ma.allow.store"} . "\"";
+ $ARG = $ARG . $var{"common.exist_admin_password"} . "\" \"" .
$var2{"ma.allow.store"} . "\"";

- system("./scripts/load-exist.sh " . $ARG);
+ system("./scripts/load-exist.sh " . $ARG);
}
-
+ else {
+ print "\nDon't forget to configure the eXist database for the RRD
MA.\n\n";
+ }
}
else {
$var2{"ma.storage_uri"} = "";
@@ -216,7 +242,7 @@

# log executable
$ARG = "\"" . $var{"common.log4j_properties"} . "\" \"" .
$var{"common.logs_dir"} . "\" \"";
- $ARG = $ARG . $var{"common.master_log_size"} . "\" \"" .
$var{"common.sub_log_size"} . "\"";
+ $ARG = $ARG . $var{"common.log_size"} . "\" \"" .
$var{"common.log_backup_size"} . "\"";
system("./scripts/log.sh " . $ARG);




@@ -325,7 +351,7 @@
"http://".$var{"common.hostname"}.":"; . $var1{"ls.port"} .
"/axis/services/LookupService");
$var1{"ls.service_name"} = &ask("Enter service name:", "Lookup Service");

-
+ print "\n";
$var1{"ls.storage_uri"} = &ask("LS Storage -- XML database collection:",
"xmldb:exist://localhost:8680/exist/xmlrpc/db/ls");
$var1{"ls.storage_username"} = &ask("LS Storage -- XML database
username:", "lookupservice");
@@ -337,13 +363,15 @@

$exist_install = &ask("\n\nDo you want the installer to configure eXist
for you?", "y/n");
if ($exist_install eq "y" || $exist_install eq "Y") {
+ $var{"common.exist_admin_password"} = &ask("eXist admin password", "");

+
print "\nA backup of the old eXist database will be in '" ,
$var{"common.basepath"};
print "/conf'.\nRunning the 'restore' shell script will roll back the
database.\n\n";

$ARG = "\"". $var1{"ls.storage_uri"} . "\" \"" .
$var1{"ls.storage_username"} . "\" \"";
$ARG = $ARG . $var1{"ls.storage_password"} . "\" \"" .
$var{"common.exist_home"} . "\" \"";
$ARG = $ARG . $var1{"ls.conf_file"} . "\" \"" .
$var1{"ls.control_conf_file"} . "\" \"";
- $ARG = $ARG . $var{"common.basepath"} . "\" \"on\"";
+ $ARG = $ARG . $var{"common.basepath"} . "\" \"" .
$var{"common.exist_admin_password"} . "\" \"on\"";
system("./scripts/load-exist.sh " . $ARG);
}

@@ -364,7 +392,7 @@

# log executable
$ARG = "\"" . $var{"common.log4j_properties"} . "\" \"" .
$var{"common.logs_dir"} . "\" \"";
- $ARG = $ARG . $var{"common.master_log_size"} . "\" \"" .
$var{"common.sub_log_size"} . "\"";
+ $ARG = $ARG . $var{"common.log_size"} . "\" \"" .
$var{"common.log_backup_size"} . "\"";
system("./scripts/log.sh " . $ARG);



Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-07-17
15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-07-18
05:41:09 UTC (rev 1429)
@@ -4,7 +4,7 @@

<info>
<appname>perfSONAR</appname>
- <appversion>1.0 RC3</appversion>
+ <appversion>1.0</appversion>
<!--
<authors>
<author name="Some Author"
email=""/>
@@ -14,13 +14,9 @@
<uninstaller write="no"/>
<javaversion>1.5.0</javaversion>
</info>
-
-
-
- <guiprefs width="800" height="600" resizable="yes"/>
-
-
-
+
+ <guiprefs width="900" height="700" resizable="yes"/>
+
<locale>
<langpack iso3="eng"/>
<!--
@@ -54,9 +50,10 @@
<variable name="common_javapath" value="/usr/java/jdk1.5.0_06" />
<variable name="common_hostname" value="localhost" />
<variable name="common_exist_home" value="/usr/local/eXist" />
- <variable name="common_master_log_size" value="1000" />
- <variable name="common_sub_log_size" value="100" />
-
+ <variable name="common_log_size" value="500KB" />
+ <variable name="common_log_backup_size" value="10" />
+ <variable name="common_exist_admin_password" value="" />
+
<!-- LS specific -->
<variable name="ls_r_type" value="ls" />
<variable name="ls_tomcat_home" value="/usr/local/tomcat" />
@@ -117,7 +114,7 @@


<resources>
- <res id="LicencePanel.licence_eng" src="Licence.txt"/>
+ <!-- <res id="LicencePanel.licence_eng" src="Licence.txt"/> -->
<!-- <res id="LicencePanel.licence_pol" src="Licence.txt.pol"/> -->
<!-- add other language support? -->

@@ -139,7 +136,7 @@
<panels>
<panel classname="HelloPanel"/>
<panel classname="InfoPanel"/>
- <panel classname="LicencePanel"/>
+ <!-- <panel classname="LicencePanel"/> -->
<panel classname="TargetPanel"/>
<panel classname="UserInputPanel"/>
<panel classname="PacksPanel"/>
@@ -158,9 +155,9 @@
<description>The base files</description>
<file src="CHANGES" targetdir="$INSTALL_PATH"/>
<file src="Readme.txt" targetdir="$INSTALL_PATH"/>
- <file src="Readme.txt.pol" targetdir="$INSTALL_PATH"/>
- <file src="Licence.txt" targetdir="$INSTALL_PATH"/>
- <file src="Licence.txt.pol" targetdir="$INSTALL_PATH"/>
+ <!-- <file src="Readme.txt.pol" targetdir="$INSTALL_PATH"/> -->
+ <!-- <file src="Licence.txt" targetdir="$INSTALL_PATH"/> -->
+ <!-- <file src="Licence.txt.pol" targetdir="$INSTALL_PATH"/> -->

<file src="conf" targetdir="$INSTALL_PATH"/>
<file src="log" targetdir="$INSTALL_PATH"/>
@@ -225,8 +222,8 @@
<args>
<arg value="$INSTALL_PATH/conf/log4j.properties" />
<arg value="$INSTALL_PATH/log" />
- <arg value="${common_master_log_size}" />
- <arg value="${common_sub_log_size}" />
+ <arg value="${common_log_size}" />
+ <arg value="${common_log_backup_size}" />
</args>
</executable>

@@ -243,6 +240,7 @@
<arg value="$INSTALL_PATH/conf/LSStore.xml" />
<arg value="$INSTALL_PATH/conf/LSStore-control.xml" />

<arg value="$INSTALL_PATH" />
+ <arg value="${common_exist_admin_password}" />
<arg value="${ls_exist}" />

</args>
</executable>
@@ -358,8 +356,8 @@
<args>
<arg value="$INSTALL_PATH/conf/log4j.properties" />
<arg value="$INSTALL_PATH/log" />
- <arg value="${common_master_log_size}" />
- <arg value="${common_sub_log_size}" />
+ <arg value="${common_log_size}" />
+ <arg value="${common_log_backup_size}" />

</args>
</executable>

@@ -441,6 +439,7 @@
<arg value="$INSTALL_PATH/conf/rrd-database_TEST.xml" />
<arg value="no" />
<arg value="$INSTALL_PATH" />
+ <arg value="${common_exist_admin_password}" />

<arg value="${ma_exist}" />

</args>
</executable>

Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
2006-07-17 15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
2006-07-18 05:41:09 UTC (rev 1429)
@@ -1,8 +1,7 @@
#!/bin/sh

-if [ "${8}" = "on" ];
+if [ "${9}" = "on" ];

then
- echo ${1} ${2} ${3} ${4} ${5} ${6} ${7} | perl -ne '@array=split(/
/,$_);foreach $a (@array){$a =~
s/\n//;}@exist
= split(/xmldb:exist:\/\/\w+:\d+\/exist\/xmlrpc/, $array[0]);@exist2 =
split(/\//, $exist[1]);$pre = $exist[1];$pre =~ s/\/$exist2[$exist2-1]//;$db
= $array[0];$db =~ s/$exist[1]//;system($array[3]."/bin/backup.sh
-ouri=".$db." -u admin -d ".$array[6]."/conf/old-".$exist2[$exist2-1]." -b
".$pre."/".$exist2[$exist2-1]." &>
".$array[6]."/log/exist.ls.install");open(RESTORE,
">".$array[6]."/scripts/restore-".$exist2[$exist2-1].".sh");print RESTORE
"#!/bin/sh\n\n";print RESTORE $array[3]."/bin/backup.sh -ouri=".$db." -u
admin -r
".$array[6]."/conf/old-".$exist2[$exist2-1]."/db/__contents__.xml\n";close(RESTORE);system("chmod
755
".$array[6]."/scripts/restore-".$exist2[$exist2-1].".sh");system($array[3]."/bin/client.sh
-l -ouri=".$db." -u ".$array[1]." -P ".$array[2]." -c ".$pre." -R
".$exist2[$exist2-1]." &>
".$array[6]."/log/exist.ls.install");system($array[3]."/b
in/client.sh -l -ouri=".$db." -u ".$array[1]." -P ".$array[2]." -m
".$exist[1]." -p ".$array[4]." &>
".$array[6]."/log/exist.ls.install");if($array[5] ne
"no"){system($array[3]."/bin/client.sh -l -ouri=".$db." -u ".$array[1]." -P
".$array[2]." -m ".$exist[1]." -p ".$array[5]." &>
".$array[6]."/log/exist.ls.install");}'
+ echo ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} | perl -ne '@array=split(/
/,$_);foreach $a (@array){$a =~
s/\n//;}@exist
= split(/xmldb:exist:\/\/\w+:\d+\/exist\/xmlrpc/, $array[0]);@exist2 =
split(/\//, $exist[1]);$pre = $exist[1];$pre =~ s/\/$exist2[$exist2-1]//;$db
= $array[0];$db =~ s/$exist[1]//;if($array[7])
{system($array[3]."/bin/backup.sh -ouri=".$db." -u admin -p ".$array[7]." -d
".$array[6]."/conf/old-".$exist2[$exist2-1]." -b
".$pre."/".$exist2[$exist2-1]." &>
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");}else
{system($array[3]."/bin/backup.sh -ouri=".$db." -u admin -d
".$array[6]."/conf/old-".$exist2[$exist2-1]." -b
".$pre."/".$exist2[$exist2-1]." &>
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");}open(RESTORE,
">".$array[6]."/scripts/restore-".$exist2[$exist2-1].".sh");if($array[7])
{print RESTORE "#!/bin/sh\n\n";print RESTORE $array[3]."/bin/backup.sh
-ouri=".$db." -u admin -p ".$array[7]." -r
".$array[6]."/conf/old-".$exist2[$exist2-1]."
/db/__contents__.xml\n";}else {print RESTORE "#!/bin/sh\n\n";print RESTORE
$array[3]."/bin/backup.sh -ouri=".$db." -u admin -r
".$array[6]."/conf/old-".$exist2[$exist2-1]."/db/__contents__.xml\n";}close(RESTORE);system("chmod
755
".$array[6]."/scripts/restore-".$exist2[$exist2-1].".sh");system($array[3]."/bin/client.sh
-l -ouri=".$db." -u ".$array[1]." -P ".$array[2]." -c ".$pre." -R
".$exist2[$exist2-1]." &>
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");system($array[3]."/bin/client.sh
-l -ouri=".$db." -u ".$array[1]." -P ".$array[2]." -m ".$exist[1]." -p
".$array[4]." &>
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");if($array[5] ne
"no"){system($array[3]."/bin/client.sh -l -ouri=".$db." -u ".$array[1]." -P
".$array[2]." -m ".$exist[1]." -p ".$array[5]." &>
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");}'
fi
-

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/log.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/log.sh
2006-07-17 15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/log.sh
2006-07-18 05:41:09 UTC (rev 1429)
@@ -14,42 +14,42 @@
echo "" >> ${1}
echo "log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender" >>
${1}
echo "log4j.appender.rootAppender.File=\${logDir}/sonar.log" >> ${1}
-echo "log4j.appender.rootAppender.MaxFileSize=500KB" >> ${1}
-echo "log4j.appender.rootAppender.MaxBackupIndex=${3}" >> ${1}
+echo "log4j.appender.rootAppender.MaxFileSize=${3}" >> ${1}
+echo "log4j.appender.rootAppender.MaxBackupIndex=${4}" >> ${1}
echo "log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout" >>
${1}
echo "log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n" >>
${1}
echo "" >> ${1}
echo "log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender" >>
${1}
echo "log4j.appender.debugAppender.File=\${logDir}/sonar_debug.log" >> ${1}
-echo "log4j.appender.debugAppender.MaxFileSize=500KB" >> ${1}
+echo "log4j.appender.debugAppender.MaxFileSize=${3}" >> ${1}
echo "log4j.appender.debugAppender.MaxBackupIndex=${4}" >> ${1}
echo "log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout" >>
${1}
echo "log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n"
>> ${1}
echo "" >> ${1}
echo "log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender" >>
${1}
echo "log4j.appender.infoAppender.File=\${logDir}/sonar_info.log" >> ${1}
-echo "log4j.appender.infoAppender.MaxFileSize=500KB" >> ${1}
+echo "log4j.appender.infoAppender.MaxFileSize=${3}" >> ${1}
echo "log4j.appender.infoAppender.MaxBackupIndex=${4}" >> ${1}
echo "log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout" >>
${1}
echo "log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n" >>
${1}
echo "" >> ${1}
echo "log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender" >>
${1}
echo "log4j.appender.warnAppender.File=\${logDir}/sonar_warn.log" >> ${1}
-echo "log4j.appender.warnAppender.MaxFileSize=500KB" >> ${1}
+echo "log4j.appender.warnAppender.MaxFileSize=${3}" >> ${1}
echo "log4j.appender.warnAppender.MaxBackupIndex=${4}" >> ${1}
echo "log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout" >>
${1}
echo "log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n" >>
${1}
echo "" >> ${1}
echo "log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender" >>
${1}
echo "log4j.appender.errorAppender.File=\${logDir}/sonar_error.log" >> ${1}
-echo "log4j.appender.errorAppender.MaxFileSize=500KB" >> ${1}
+echo "log4j.appender.errorAppender.MaxFileSize=${3}" >> ${1}
echo "log4j.appender.errorAppender.MaxBackupIndex=${4}" >> ${1}
echo "log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout" >>
${1}
echo "log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n"
>> ${1}
echo "" >> ${1}
echo "log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender" >>
${1}
echo "log4j.appender.fatalAppender.File=\${logDir}/sonar_fatal.log" >> ${1}
-echo "log4j.appender.fatalAppender.MaxFileSize=500KB" >> ${1}
+echo "log4j.appender.fatalAppender.MaxFileSize=${3}" >> ${1}
echo "log4j.appender.fatalAppender.MaxBackupIndex=${4}" >> ${1}
echo "log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout" >>
${1}
echo "log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n"
>> ${1}

Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
2006-07-17 15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
2006-07-18 05:41:09 UTC (rev 1429)
@@ -7,8 +7,8 @@
<str txt="This Panel Asks for Information Common to the LS and MA"
id="common_label"/>
<str txt="Enter java path for the application:" id="common_javapathlabel"
/>
<str txt="Enter the hostname:" id="common_hostnamelabel" />
- <str txt="Enter the size (in # of lines) of the master log file:"
id="common_master_log_sizelabel" />
- <str txt="Enter the size (in # of lines) of the other log files:"
id="common_sub_log_sizelabel" />
+ <str txt="Enter the max file size of the log files (indicate KB or MB):"
id="common_log_sizelabel" />
+ <str txt="Enter the number of backup logs to keep:"
id="common_log_backup_sizelabel" />
<str txt="eXist home directory:" id="common_exist_homelabel"/>

<str txt="This Panel Asks for Information Specific to the LS"
id="ls_introlabel" />
@@ -32,7 +32,8 @@
<str txt="/AXIS_PATH/WEB-INF/lib/ALL_JAR_FILES"
id="ls_advise2label"/>
<str txt="Do you want the installer to configure eXist[on/off]:"
id="ls_existlabel"/>
-
+ <str txt="XML database password:" id="common_exist_admin_passwordlabel" />
+
<str txt="This Panel Asks for Information Specific to the MA"
id="ma_introlabel"/>
<str txt="Tomcat home directory:" id="ma_tomcat_homelabel" />
<str txt="Axis home directory:" id="ma_axis_homelabel" />
@@ -63,6 +64,7 @@
<str txt="Do you want to allow storage into the MA[on/off]:"
id="ma_allowstorelabel" />
<str txt="MA Storage Directory:" id="ma_store_dirlabel" />

<str txt="Do you want the installer to configure eXist[on/off]:"
id="ma_existlabel"/>
+ <str txt="XML database password:" id="common_exist_admin_passwordlabel" />

</langpack>


Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
2006-07-17 15:45:24 UTC (rev 1428)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
2006-07-18 05:41:09 UTC (rev 1429)
@@ -14,6 +14,8 @@
</field>
</panel>

+
+
<panel order="1">
<field type="staticText" align="center"
txt="This Panel Asks for Information Common to the LS and MA"
id="common_label"/>
@@ -35,15 +37,15 @@
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid hostname!"/>
</field>

- <field type="text" variable="common_master_log_size">
- <spec txt="Enter the size (in # of lines) of the master log file:"
id="common_master_log_sizelabel" size="10"
- set="${common_master_log_size}"/>
+ <field type="text" variable="common_log_size">
+ <spec txt="Enter the max file size of the log files (indicate KB or
MB):" id="common_log_sizelabel" size="10"
+ set="${common_log_size}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid log size!"/>
</field>

- <field type="text" variable="common_sub_log_size">
- <spec txt="Enter the size (in # of lines) of the other log files:"
id="common_sub_log_sizelabel" size="10"
- set="${common_sub_log_size}"/>
+ <field type="text" variable="common_log_backup_size">
+ <spec txt="Enter the number of backup logs to keep:"
id="common_log_backup_sizelabel" size="10"
+ set="${common_log_backup_size}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid log size!"/>
</field>

@@ -163,6 +165,12 @@
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Answer!"/>
</field>

+ <field type="text" variable="common_exist_admin_password">
+ <spec txt="XML database password:"
id="common_exist_admin_passwordlabel" size="40"
+ set="${common_exist_admin_password}"/>
+ <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Password!"/>
+ </field>
+
<!--
=========================================================================================
-->

</panel>
@@ -323,6 +331,12 @@
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Answer!"/>
</field>

+ <field type="text" variable="common_exist_admin_password">
+ <spec txt="XML database password:"
id="common_exist_admin_passwordlabel" size="40"
+ set="${common_exist_admin_password}"/>
+ <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Password!"/>
+ </field>
+
<!--
=========================================================================================
-->

</panel>


  • r1429 - in branches/release/perfsonar/releng: . perfSONAR-1.0 perfSONAR-1.0/scripts, svnlog, 07/18/2006

Archive powered by MHonArc 2.6.16.

Top of Page