Skip to Content.
Sympa Menu

perfsonar-dev - r1326 - in branches/release/perfsonar/releng/perfSONAR-1.0: . client conf lib scripts

Subject: perfsonar development work

List archive

r1326 - in branches/release/perfsonar/releng/perfSONAR-1.0: . client conf lib scripts


Chronological Thread 
  • From:
  • To:
  • Subject: r1326 - in branches/release/perfsonar/releng/perfSONAR-1.0: . client conf lib scripts
  • Date: Mon, 26 Jun 2006 01:04:51 -0400
Author: zurawski
Date: 2006-06-26 01:04:50 -0400 (Mon, 26 Jun 2006)
New Revision: 1326

Added:

branches/release/perfsonar/releng/perfSONAR-1.0/client/LSDeregisterRequest.xml

branches/release/perfsonar/releng/perfSONAR-1.0/client/LSKeepaliveRequest.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/LSQueryRequest.xml

branches/release/perfsonar/releng/perfSONAR-1.0/client/LSRegisterRequest.xml

branches/release/perfsonar/releng/perfSONAR-1.0/client/MAQueryKeyRequest.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAQueryRequest.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAStore.xml
branches/release/perfsonar/releng/perfSONAR-1.0/conf/LSStore-control.xml
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/axis.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/libjrrd.sh
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/scripts/ls.catalina.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.components.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.service.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.components.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.service.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrddb.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrdjtool-static.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrdjtool.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ls.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh
branches/release/perfsonar/releng/perfSONAR-1.0/xml/
Removed:
branches/release/perfsonar/releng/perfSONAR-1.0/axis.sh
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-deregister.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-keepalive.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-register.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-request.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/ma-request-key.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/ma-request.xml
branches/release/perfsonar/releng/perfSONAR-1.0/client/ma-store.xml
branches/release/perfsonar/releng/perfSONAR-1.0/exist.sh
branches/release/perfsonar/releng/perfSONAR-1.0/libjrrd.sh
branches/release/perfsonar/releng/perfSONAR-1.0/load-exist.sh
branches/release/perfsonar/releng/perfSONAR-1.0/log.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ls.catalina.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ls.components.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ls.service.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ma-store-key.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ma.catalina.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ma.components.sh
branches/release/perfsonar/releng/perfSONAR-1.0/ma.service.sh
branches/release/perfsonar/releng/perfSONAR-1.0/rrddb.sh
branches/release/perfsonar/releng/perfSONAR-1.0/rrdjtool-static.sh
branches/release/perfsonar/releng/perfSONAR-1.0/rrdjtool.sh
branches/release/perfsonar/releng/perfSONAR-1.0/test_ls.sh
branches/release/perfsonar/releng/perfSONAR-1.0/test_ma.sh
Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES
branches/release/perfsonar/releng/perfSONAR-1.0/conf/LSStore.xml
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/lib/perfSONAR-generic.jar
branches/release/perfsonar/releng/perfSONAR-1.0/lib/perfSONAR-xmlls.jar
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol
branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
Log:
RC3 Changes

-jason



Modified: branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES 2006-06-22
21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES 2006-06-26
05:04:50 UTC (rev 1326)
@@ -1,3 +1,33 @@
+Changes From perfSONAR-1.0 RC2
+------------------------------
+
+Installer
+-------------------
+
+* The log script was corrected to actually place logs in the right
+location. In addition to this, the format was changed to imprint the
+time stamp.
+
+* A 'scripts' directory was created for all install scripts.
+
+* Several questions were removed in favor of default values.
+
+* Undeploy/Deploy Scripts were added to control tomcat/axis.
+
+* Questions regarding the installation of eXist matters were added
+and backup procedures were created to restore the state of eXist
+in the event of an error.
+
+* The Graphical installer has been simplified a bit.
+
+LS
+-------------------
+
+* The correct versions of XML example files were used.
+
+
+
+
Changes From perfSONAR-1.0 RC1
------------------------------

@@ -31,6 +61,8 @@



+
+
TODO
------------------------------


Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/axis.sh

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/LSDeregisterRequest.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/LSKeepaliveRequest.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/LSQueryRequest.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/LSRegisterRequest.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAQueryKeyRequest.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAQueryRequest.xml

Added: branches/release/perfsonar/releng/perfSONAR-1.0/client/MAStore.xml

Deleted:
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-deregister.xml

Deleted:
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-keepalive.xml

Deleted:
branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-register.xml

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/client/ls-request.xml

Deleted:
branches/release/perfsonar/releng/perfSONAR-1.0/client/ma-request-key.xml

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/client/ma-request.xml

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/client/ma-store.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/conf/LSStore-control.xml

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/conf/LSStore.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/conf/LSStore.xml
2006-06-22 21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/conf/LSStore.xml
2006-06-26 05:04:50 UTC (rev 1326)
@@ -1,78 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>

-<!-- Purpose: Example of an LS Store document, there are two ways to chain
together
- the service and measurement metadata explained below. A
group decission
- should be made as to which is better.-->
-<!-- Version: $Id: LSStore.xml 762 2006-02-09 05:32:51Z zurawski $ -->
+<!-- Purpose: Holds the information for registered services -->

<nmwg:store type="LSStore"
-
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
-
- <!-- ...Service listings... -->
+ xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>

- <nmwg:metadata id="meta1">
- <nmwg:subject id="sub1">
- <psservice:service id="UDelMA1">
- <psservice:serviceName>UDel MA-1</psservice:serviceName>
-
<psservice:accessPoint>http://stout.pc.cis.udel.edu:8080/services/RRDMA</psservice:accessPoint>

- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>UDel CIS MA-1, Newark DE,
USA</psservice:serviceDescription>
- </psservice:service>
- </nmwg:subject>
- </nmwg:metadata>
-
- <nmwg:metadata id="meta2">
- <nmwg:subject id="sub2">
- <psservice:service id="PSNCMA-1">
- <psservice:serviceName>PSNC MA-1</psservice:serviceName>
-
<psservice:accessPoint>http://ma1.man.poznan.pl:8080/services/RRDMA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>this is PSNC pilot MA
service</psservice:serviceDescription>
- </psservice:service>
- </nmwg:subject>
- </nmwg:metadata>
-
- <nmwg:metadata id="meta3">
- <nmwg:subject id="sub3">
- <psservice:service id="DanteMA-1">
- <psservice:serviceName>Dante MA-1</psservice:serviceName>
-
<psservice:accessPoint>http://ma1.dante.net:8080/services/RRDMA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>this is Dante pilot MA
service</psservice:serviceDescription>
- </psservice:service>
- </nmwg:subject>
- </nmwg:metadata>
-
- <!-- Data is all of the capabilities (interfaces) you are monitoring, in
the
- form of metadata blocks. It is neccessary to wrap these in data
blocks
- because they are measurement metadata (not service metadata). -->

-
- <nmwg:data id="data1" metadataIdRef="meta1">
- <nmwg:metadata id="meta4">
- <netutil:subject id="sub4">
- <nmwgt:interface>
- <nmwgt:ipAddress type="ipv4">128.4.133.163</nmwgt:ipAddress>
- <nmwgt:hostName>moonshine.pc.cis.udel.edu</nmwgt:hostName>
- <nmwgt:ifName>eth0</nmwgt:ifName>
- <nmwgt:ifDescription>gigE</nmwgt:ifDescription>
- <nmwgt:ifAddress type="ipv4">128.4.133.163</nmwgt:ifAddress>
- <nmwgt:type>gigE</nmwgt:type>
- </nmwgt:interface>
- </netutil:subject>
- <nmwg:eventType>interface.utilization</nmwg:eventType>
- <nmwg:parameters id="paramid1">
- <nmwg:parameter name="valueUnits">octets</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:metadata>
-
- <!-- ...more metadatas this MA describes... -->
-
- </nmwg:data>
-
- <!-- ...more datas elements for each MA service... -->
-
</nmwg:store>

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/exist.sh

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.pl 2006-06-22
21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.pl 2006-06-26
05:04:50 UTC (rev 1326)
@@ -1,7 +1,7 @@
#!/usr/bin/perl

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

my %var = ();
my %var1 = ();
@@ -35,10 +35,14 @@
$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.log4j_properties"} = &ask("Enter the log4j file:",
$var{"common.basepath"}."/conf/log4j.properties");
-$var{"common.logs_dir"} = &ask("Enter the log directory:",
$var{"common.basepath"}."/log");
-$var{"common.sax_parser_config"} = &ask("Enter the sax config file:",
$var{"common.basepath"}."/src/objects.config");
+$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.exist_home"} = &ask("eXist home directory:", &locate("echo
\$EXIST_HOME", "/usr/local/eXist"));

+$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";
+
$maFlag = 0;
$ma = &ask("\n\nDo you want to install the MA?", "y/n");
if ($ma eq "y" || $ma eq "Y") {
@@ -70,7 +74,6 @@
system("cp lib/rrdjtool.jar " . $var2{"ma.axis_home"} . "/WEB-INF/lib");


-
print "\n\nBe sure to change your CLASSPATH:\n";
print "\tCLASSPATH=\$CLASSPATH:";
$cp = $var2{"ma.axis_home"} . "/WEB-INF/lib/" . "axis-ant.jar" . ":";
@@ -128,42 +131,16 @@

# ma rrddb executable
$ARG = "\"" . $var{"common.basepath"} . "\"";
- system("./rrddb.sh " . $ARG);
+ system("./scripts/rrddb.sh " . $ARG);


$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") {
- $var{"common.exist_home"} = &ask("eXist home directory:", &locate("echo
\$EXIST_HOME", "/usr/local/eXist"));
-
$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.use"} = "on";

- # run the eXist program
- @existInfo = split(/xmldb:exist:\/\/\w+:\d+\/exist\/xmlrpc/,
$var2{"ma.storage_uri"});
- $existInfo[1] =~ s/\n//g;
-
- $var2{"ma.storage.collection"} = $existInfo[1];
-
- @existInfo2 = split(/\//, $var2{"ma.storage.collection"});
- $existInfo2[$existInfo2-1] =~ s/\n//g;
-
- $var2{"ma.storage.collection.post"} = $existInfo2[$existInfo2-1];
- $var2{"ma.storage.collection.pre"} = $var2{"ma.storage.collection"};
- $var2{"ma.storage.collection.pre"} =~ s/\/$existInfo2[$existInfo2-1]//;
-
- $var2{"ma.storage.db"} = $var2{"ma.storage_uri"};
- $var2{"ma.storage.db"} =~ s/$existInfo[1]//;
-
- $ARG = "\"". $var{"common.exist_home"} . "\" \"" .
$var2{"ma.storage.db"} . "\" \"";
- $ARG = $ARG . $var2{"ma.storage_username"} . "\" \"" .
$var2{"ma.storage_password"} . "\" \"";
- $ARG = $ARG . $var2{"ma.storage.collection.pre"} . "\" \"" .
$var2{"ma.storage.collection.post"} . "\" \"";
- $ARG = $ARG . $var2{"ma.storage.collection"} . "\" \"" .
$var2{"ma.conf_file"} . "\" \"";
- $ARG = $ARG . $var{"common.basepath"} . "/log/exist.ma.install" ."\"";
-
- system("./exist.sh " . $ARG);
-
$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";
@@ -173,6 +150,20 @@
$var2{"ma.allow.store"} = "off";
$var2{"ma.store_dir"} = $var{"common.basepath"};
}
+
+ $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") {
+ 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"} . "\"";
+
+ system("./scripts/load-exist.sh " . $ARG);
+ }
+
}
else {
$var2{"ma.storage_uri"} = "";
@@ -192,19 +183,19 @@
$ARG = "\"" . $var2{"ma.rrdjdir"} . "\" \"" . $var2{"ma.rrdtool_path"}
. "\" \"" . $var{"common.javapath"} . "\" \"";

$ARG = $ARG . "Makefile.linux" . "\" \"" . $var{"common.basepath"} .
"/log/libjrrd.install" ."\"";

- system("./libjrrd.sh " . $ARG);
+ system("./scripts/libjrrd.sh " . $ARG);
}
elsif($system eq "SunOS") {
$ARG = "\"" . $var2{"ma.rrdjdir"} . "\" \"" . $var2{"ma.rrdtool_path"}
. "\" \"" . $var{"common.javapath"} . "\" \"";

$ARG = $ARG . "Makefile.solaris" . "\" \"" . $var{"common.basepath"} .
"/log/libjrrd.install" ."\"";

- system("./libjrrd.sh " . $ARG);
+ system("./scripts/libjrrd.sh " . $ARG);
}
elsif($system eq "Darwin") {
$ARG = "\"" . $var2{"ma.rrdjdir"} . "\" \"" . $var2{"ma.rrdtool_path"}
. "\" \"" . $var{"common.javapath"} . "\" \"";

$ARG = $ARG . "Makefile.osx" . "\" \"" . $var{"common.basepath"} .
"/log/libjrrd.install" ."\"";

- system("./libjrrd.sh " . $ARG);
+ system("./scripts/libjrrd.sh " . $ARG);
}
else {
print "libjrdd: System not found or unsupported, using pre-compiled
library...\n";
@@ -213,19 +204,20 @@
# rrdjtool executable
$ARG = "\"" . $var2{"ma.rrdjdir"} . "\" \"" . $var{"common.javapath"} .
"\" \"" . $var{"common.basepath"} . "/log/rrdjtool-javac.install\" \"";
$ARG = $ARG . $var{"common.basepath"} . "/log/rrdjtool-jar.install\"";

- system("./rrdjtool.sh " . $ARG);
+ system("./scripts/rrdjtool.sh " . $ARG);

}
else {
print "libjrdd: JDK not found, using pre-compiled library...\n";
print "rrdjtool: JDK not found, using pre-compiled library...\n";
$ARG = "\"" . $var2{"ma.rrdjdir"} . "\"";
- system("./rrdjtool-static.sh " . $ARG);
+ system("./scripts/rrdjtool-static.sh " . $ARG);
}

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




# ma service executable
@@ -235,42 +227,44 @@
$ARG = $ARG . $var2{"ma.storage_uri"} . "\" \"" .
$var2{"ma.storage_username"} . "\" \"" . $var2{"ma.storage_password"} . "\"
\"";
$ARG = $ARG . $var2{"ma.storage.use"} . "\" \"" . $var2{"ma.allow.store"}
. "\" \"" . $var2{"ma.store_dir"} . "\"";



- system("./ma.service.sh " . $ARG);
+ system("./scripts/ma.service.sh " . $ARG);


# ma components executable
$ARG = "\"" . $var{"common.basepath"} . "\" \"" . $ma_ls . "\"";
- system("./ma.components.sh " . $ARG);
+ system("./scripts/ma.components.sh " . $ARG);


# catalina modifier
$ARG = "\"" . $var2{"ma.tomcat_home"}."/conf/catalina.properties" . "\"
\"" . $var{"common.basepath"} . "\"";
- system("./ma.catalina.sh " . $ARG);
+ system("./scripts/ma.catalina.sh " . $ARG);


# axis
$ARG = "\"". $var{"common.javapath"}."/bin/java" . "\" \"" .
$var{"common.hostname"} . "\" \"" . $var2{"ma.port"} . "\" \"";
$ARG = $ARG . $var{"common.basepath"} . "/wsdd/ma-service-undeploy.wsdd" .
"\" \"" . $var{"common.basepath"} . "/wsdd/ma-service-deploy.wsdd" . "\" ";
- $ARG = $ARG . "\"" . $cp . "\"";
- system("./axis.sh " . $ARG);
+ $ARG = $ARG . "\"" . $cp . "\" \"" . $var{"common.basepath"} . "\" \"" .
"MA" . "\"";
+ system("./scripts/axis.sh " . $ARG);


# create client
$ARG = "\"" . $var{"common.basepath"} . "\" \"" . $var{"common.javapath"}
. "/bin/java" . "\" \"" . $var2{"ma.r_access_point"} . "\" ";
$ARG = $ARG . "\"" . $cp . "\"";
- system("./test_ma.sh " . $ARG);
- system("chmod 755 client/*sh");
+ system("./scripts/test_ma.sh " . $ARG);
+ system("chmod 755 scripts/*sh");

# ma store key file
$ARG = "\"" . $var{"common.basepath"} . "\" \"" . $var2{"ma.store_dir"} .
"\"";
- system("./ma-store-key.sh " . $ARG);
+ system("./scripts/ma-store-key.sh " . $ARG);

+ system("mv client/MA* xml");
}


-
+$lsFlag = 0;
$ls = &ask("\n\nDo you want to install the LS?", "y/n");
if ($ls eq "y" || $ls eq "Y") {
+ $lsFlag = 1;
print "Enter Information Specific to the LS:\n\n";

$var1{"ls.r_type"} = "ls";
@@ -332,52 +326,26 @@
$var1{"ls.service_name"} = &ask("Enter service name:", "Lookup Service");


- if(!($var{"common.exist_home"})) {
- $var{"common.exist_home"} = &ask("eXist home directory:", &locate("echo
\$EXIST_HOME", "/usr/local/eXist"));
- }
-
$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");
- $var1{"ls.storage_password"} = &ask("LS Storage -- XML database
password:", "sonar");
- $var1{"ls.conf_file"} = $var{"common.basepath"} . "/conf/LSStore.xml";
-
-
-
- # run the eXist program
- @existInfo = split(/xmldb:exist:\/\/\w+:\d+\/exist\/xmlrpc/,
$var1{"ls.storage_uri"});
- $existInfo[1] =~ s/\n//g;
-
- $var1{"ls.storage.collection"} = $existInfo[1];
-
- @existInfo2 = split(/\//, $var1{"ls.storage.collection"});
- $existInfo2[$existInfo2-1] =~ s/\n//g;
-
- $var1{"ls.storage.collection.post"} = $existInfo2[$existInfo2-1];
- $var1{"ls.storage.collection.pre"} = $var1{"ls.storage.collection"};
- $var1{"ls.storage.collection.pre"} =~ s/\/$existInfo2[$existInfo2-1]//;
-
- $var1{"ls.storage.db"} = $var1{"ls.storage_uri"};
- $var1{"ls.storage.db"} =~ s/$existInfo[1]//;
+ $var1{"ls.storage_password"} = &ask("LS Storage -- XML database
password:", "sonar");

- $ARG = "\"". $var{"common.exist_home"} . "\" \"" . $var1{"ls.storage.db"}
. "\" \"";
- $ARG = $ARG . $var1{"ls.storage_username"} . "\" \"" .
$var1{"ls.storage_password"} . "\" \"";
- $ARG = $ARG . $var1{"ls.storage.collection.pre"} . "\" \"" .
$var1{"ls.storage.collection.post"} . "\" \"";
- $ARG = $ARG . $var1{"ls.storage.collection"} . "\" \"" .
$var1{"ls.conf_file"} . "\" \"";
- $ARG = $ARG . $var{"common.basepath"} . "/log/exist.ls.install" ."\"";
-
- system("./exist.sh " . $ARG);
+ $var1{"ls.conf_file"} = $var{"common.basepath"}."/conf/LSStore.xml";
+ $var1{"ls.control_conf_file"} =
$var{"common.basepath"}."/conf/LSStore-control.xml";


-
-
-
-
-
-
-
-
-
+ $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") {
+ 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\"";
+ system("./scripts/load-exist.sh " . $ARG);
+ }

$var1{"ls.cleanup_interval"} = &ask("LS Cleanup -- cleanup interval
(ms):", "180000");
$var1{"ls.register_interval"} = &ask("Register with LS interval (ms):",
"600000");
@@ -394,10 +362,10 @@
}


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


# ls service executable
@@ -407,62 +375,62 @@
$ARG = $ARG . $var1{"ls.r_service_name"} . "\" \"" .
$var1{"ls.r_service_type"} . "\" \"" . $var1{"ls.r_description"} . "\" \"";

$ARG = $ARG . $var1{"ls.r_lookup_service"} . "\" \"" .
$var1{"ls.storage_uri"} . "\" \"" . $var1{"ls.storage_username"} . "\" \"";
$ARG = $ARG . $var1{"ls.storage_password"} . "\" \"" .
$var1{"ls.cleanup_interval"} . "\" \"" . $var1{"ls.register_interval"} . "\"";
- system("./ls.service.sh " . $ARG);
+ system("./scripts/ls.service.sh " . $ARG);



# ls components executable
$ARG = "\"" . $var{"common.basepath"} . "\"";
- system("./ls.components.sh " . $ARG);
+ system("./scripts/ls.components.sh " . $ARG);



# catalina modifier
$ARG = "\"" . $var1{"ls.tomcat_home"}."/conf/catalina.properties" . "\"
\"" . $var{"common.basepath"} . "\"";
- system("./ls.catalina.sh " . $ARG);
+ system("./scripts/ls.catalina.sh " . $ARG);


# ls axis
$ARG = "\"". $var{"common.javapath"}."/bin/java" . "\" \"" .
$var{"common.hostname"} . "\" \"" . $var1{"ls.port"} . "\" \"";
$ARG = $ARG . $var{"common.basepath"} . "/wsdd/ls-service-undeploy.wsdd" .
"\" \"" . $var{"common.basepath"} . "/wsdd/ls-service-deploy.wsdd" . "\" ";
- $ARG = $ARG . "\"" . $cp . "\"";
- system("./axis.sh " . $ARG);
+ $ARG = $ARG . "\"" . $cp . "\" \"" . $var{"common.basepath"} . "\" \"" .
"LS" . "\"";
+ system("./scripts/axis.sh " . $ARG);


# create client
$ARG = "\"" . $var{"common.basepath"} . "\" \"" . $var{"common.javapath"}
. "/bin/java" . "\" \"" . $var1{"ls.r_access_point"} . "\" ";
$ARG = $ARG . "\"" . $cp . "\"";
- system("./test_ls.sh " . $ARG);
- system("chmod 755 client/*sh");
+ system("./scripts/test_ls.sh " . $ARG);
+ system("chmod 755 scripts/*sh");
+
+ system("mv client/LS* xml");
+
}

$ls = &ask("\n\nDo you want to clean up the installation?", "y/n");
if ($ls eq "y" || $ls eq "Y") {
- system("rm -f test_ma.sh");
- system("rm -f ma.catalina.sh");
- system("rm -f ma.components.sh");
- system("rm -f ma.service.sh");
- system("rm -f ma-store-key.sh");
- system("rm -f rrddb.sh");
- system("rm -f rrdjtool.sh");
- system("rm -f rrdjtool-static.sh");
- system("rm -f libjrrd.sh");

- system("rm -f ls.service.sh");
- system("rm -f ls.components.sh");
- system("rm -f ls.catalina.sh");
- system("rm -f test_ls.sh");
+ $ARG = "\"" . $var{"common.basepath"}."/log/cleanup.log" . "\" \"" .
$var{"common.basepath"}."/scripts" ."\"";
+ system("./scripts/cleanup.sh " . $ARG);

- system("rm -f exist.sh");
- system("rm -f load-exist.sh");
- system("rm -f log.sh");
- system("rm -f axis.sh");
+ system("rm -f scripts/cleanup.sh");
+
system("rm -f userInputLang*");
system("rm -f userInputSpec*");
system("rm -f install.xml");

system("rm -f install.pl");
system("rm -frd lib");
+
+ if(!($lsFlag)) {
+ system("rm -frd client/LS*xml");
+ system("rm -frd wsdd/ls*wsdd");
+ }
+ if(!($maFlag)) {
+ system("rm -frd client/MA*xml");
+ system("rm -frd wsdd/ma*wsdd");
+ }
+ system("rm -frd client");
}



Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-06-22
21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-06-26
05:04:50 UTC (rev 1326)
@@ -4,7 +4,7 @@

<info>
<appname>perfSONAR</appname>
- <appversion>1.0 RC2</appversion>
+ <appversion>1.0 RC3</appversion>
<!--
<authors>
<author name="Some Author"
email=""/>
@@ -15,8 +15,12 @@
<javaversion>1.5.0</javaversion>
</info>

+
+
<guiprefs width="800" height="600" resizable="yes"/>

+
+
<locale>
<langpack iso3="eng"/>
<!--
@@ -43,60 +47,58 @@
-->
</locale>

+
+
<variables>
<!-- Common -->
- <variable name="common.basepath" value="/usr/local/perfSONAR-1.0" />
- <variable name="common.javapath" value="/usr/java/jdk1.5.0_06" />
- <variable name="common.hostname" value="localhost" />
- <variable name="common.log4j_properties"
value="/usr/local/perfSONAR-1.0/conf/log4j.properties" />
- <variable name="common.logs_dir"
value="/usr/local/perfSONAR-1.0/log" />
- <variable name="common.sax_parser_config"
value="/usr/local/perfSONAR-1.0/src/objects.config" />
- <variable name="common.exist_home" value="/usr/local/eXist" />
+ <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" />
+
<!-- LS specific -->
- <variable name="ls.r_type" value="ls" />
- <variable name="ls.tomcat_home" value="/usr/local/tomcat" />
- <variable name="ls.axis_home" value="/usr/local/tomcat/webapps/axis"
/>
- <variable name="ls.port" value="8080" />
- <variable name="ls.r_access_point"
value="http://localhost:8080/axis/services/LookupService"; />

- <variable name="ls.r_service_name" value="Test Lookup Service" />
- <variable name="ls.r_service_type" value="LS" />
- <variable name="ls.r_description" value="Test Lookup Service,
perfSONAR" />
- <variable name="ls.r_lookup_service"
value="http://localhost:8080/axis/services/LookupService"; />
- <variable name="ls.service_name" value="Lookup Service" />
- <variable name="ls.storage_uri"
value="xmldb:exist://localhost:8680/exist/xmlrpc/db/ls" />
- <variable name="ls.storage_username" value="lookupservice" />
- <variable name="ls.storage_password" value="sonar" />
- <variable name="ls.conf_file"
value="/usr/local/perfSONAR-1.0/conf/LSStore.xml" />
- <variable name="ls.cleanup_interval" value="180000" />
- <variable name="ls.register_interval" value="600000" />
-
-
-
+ <variable name="ls_r_type" value="ls" />
+ <variable name="ls_tomcat_home" value="/usr/local/tomcat" />
+ <variable name="ls_axis_home" value="/usr/local/tomcat/webapps/axis"
/>
+ <variable name="ls_port" value="8080" />
+ <variable name="ls_r_access_point"
value="http://localhost:8080/axis/services/LookupService"; />

+ <variable name="ls_r_service_name" value="Test Lookup Service" />
+ <variable name="ls_r_service_type" value="LS" />
+ <variable name="ls_r_description" value="Test Lookup Service,
perfSONAR" />
+ <variable name="ls_r_lookup_service"
value="http://localhost:8080/axis/services/LookupService"; />
+ <variable name="ls_service_name" value="Lookup Service" />
+ <variable name="ls_storage_uri"
value="xmldb:exist://localhost:8680/exist/xmlrpc/db/ls" />
+ <variable name="ls_storage_username" value="lookupservice" />
+ <variable name="ls_storage_password" value="sonar" />
+ <variable name="ls_cleanup_interval" value="180000" />
+ <variable name="ls_register_interval" value="600000" />
+ <variable name="ls_exist" value="on" />
+
<!-- MA specific -->
- <variable name="ma.r_type" value="ma" />
- <variable name="ma.tomcat_home" value="/usr/local/tomcat" />
- <variable name="ma.axis_home" value="/usr/local/tomcat/webapps/axis"
/>
- <variable name="ma.port" value="8080" />
- <variable name="ma.service_name" value="Measurement Archive Service"
/>
- <variable name="ma.rrdjdir"
value="/usr/local/perfsonar/contrib/rrdjtool" />
- <variable name="ma.rrdtool_path" value="/usr/local/rrdtool-1.2.11"
/>
- <variable name="ma.r_access_point"
value="http://localhost:8080/axis/services/MeasurementArchiveService"; />

- <variable name="ma.r_service_name" value="Test Measurement Archive"
/>
- <variable name="ma.r_service_type" value="MA" />
- <variable name="ma.r_description" value="Java RRD MA, perfSONAR
project" />
- <variable name="ma.r_lookup_service" value="" />
- <variable name="ma.conf_file"
value="/usr/local/perfsonar/conf/rrd-database_TEST.xml" />

- <variable name="ma.storage_uri"
value="xmldb:exist://localhost:8680/exist/xmlrpc/db/rrdmaconfig" />
- <variable name="ma.storage_username" value="rrdmaservice" />
- <variable name="ma.storage_password" value="rrdmaservice" />
- <variable name="ma.storage.use" value="off" />
- <variable name="ma.allow.store" value="off" />
- <variable name="ma.store_dir"
value="/usr/local/perfSONAR-1.0/data/rrd/test" />
-
-
-
+ <variable name="ma_r_type" value="ma" />
+ <variable name="ma_tomcat_home" value="/usr/local/tomcat" />
+ <variable name="ma_axis_home" value="/usr/local/tomcat/webapps/axis"
/>
+ <variable name="ma_port" value="8080" />
+ <variable name="ma_service_name" value="Measurement Archive Service"
/>
+ <variable name="ma_rrdjdir"
value="/usr/local/perfSONAR-1.0/contrib/rrdjtool" />
+ <variable name="ma_rrdtool_path" value="/usr/local/rrdtool" />
+ <variable name="ma_r_access_point"
value="http://localhost:8080/axis/services/MeasurementArchiveService"; />

+ <variable name="ma_r_service_name" value="Test Measurement Archive"
/>
+ <variable name="ma_r_service_type" value="MA" />
+ <variable name="ma_r_description" value="Java RRD MA, perfSONAR
project" />
+ <variable name="ma_r_lookup_service" value="" />
+ <variable name="ma_storage_uri"
value="xmldb:exist://localhost:8680/exist/xmlrpc/db/rrdmaconfig" />
+ <variable name="ma_storage_username" value="rrdmaservice" />
+ <variable name="ma_storage_password" value="rrdmaservice" />
+ <variable name="ma_storage.use" value="off" />
+ <variable name="ma_allowstore" value="off" />
+ <variable name="ma_store_dir"
value="/usr/local/perfSONAR-1.0/data/rrd/test" />
+ <variable name="ma_exist" value="on" />
</variables>

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

+
+
<panels>
<panel classname="HelloPanel"/>
<panel classname="InfoPanel"/>
@@ -127,26 +131,9 @@
<panel classname="SimpleFinishPanel"/>
</panels>

+
+
<packs>
- <pack name="perfSONARBase" required="yes" os="unix"
preselected="yes">
- <description>Install perfSONAR Base</description>
- <file src="lib/activation.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/perfSONAR-generic.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xercesSamples.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xml-apis.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/commons-pool-1.1.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/resolver.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xmldb.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/exist.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xmlParserAPIs.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/jdom.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xalan.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xmlrpc-1.2-patched.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/mail.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xercesImpl.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- <file src="lib/xmlsec.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
- </pack>
-
<pack name="Base" required="yes" preselected="yes">
<description>The base files</description>
<file src="CHANGES" targetdir="$INSTALL_PATH"/>
@@ -159,8 +146,15 @@
<file src="log" targetdir="$INSTALL_PATH"/>
<file src="src" targetdir="$INSTALL_PATH"/>
<file src="wsdd" targetdir="$INSTALL_PATH"/>
+ <file src="scripts" targetdir="$INSTALL_PATH"/>
+ <!--
<file src="client" targetdir="$INSTALL_PATH"/>
- </pack>
+ -->
+ <file src="xml" targetdir="$INSTALL_PATH"/>
+ <!--
+ <file src="lib" targetdir="$INSTALL_PATH"/>
+ -->
+ </pack>
<pack name="Contribution" required="no" preselected="no">
<description>A directory of contributed files.</description>
<file src="contrib" targetdir="$INSTALL_PATH"/>
@@ -182,69 +176,86 @@

<pack name="perfSONARLS" required="no" os="unix" preselected="no">
<description>Install perfSONAR LS</description>
- <depends packname="perfSONARBase" />
- <file src="lib/perfSONAR-xmlls.jar"
targetdir="${ls.axis_home}/WEB-INF/lib"/>
+ <file src="lib/activation.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/perfSONAR-generic.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xercesSamples.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xml-apis.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/commons-pool-1.1.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/resolver.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmldb.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/exist.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmlParserAPIs.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/jdom.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xalan.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmlrpc-1.2-patched.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/mail.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xercesImpl.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmlsec.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>
+ <file src="lib/perfSONAR-xmlls.jar"
targetdir="${ls_axis_home}/WEB-INF/lib"/>

+ <file src="client/LSDeregisterRequest.xml"
targetdir="$INSTALL_PATH/xml"/>
+ <file src="client/LSQueryRequest.xml"
targetdir="$INSTALL_PATH/xml"/>
+ <file src="client/LSKeepaliveRequest.xml"
targetdir="$INSTALL_PATH/xml"/>
+ <file src="client/LSRegisterRequest.xml"
targetdir="$INSTALL_PATH/xml"/>
+
<!-- handle the log4j file -->
- <file src="log.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/log.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/log.sh" stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/log.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/log.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${common.log4j_properties}" />
- <arg value="${common.logs_dir}" />
+ <arg value="$INSTALL_PATH/conf/log4j.properties" />
+ <arg value="$INSTALL_PATH/log" />
+ <arg value="${common_master_log_size}" />
+ <arg value="${common_sub_log_size}" />
</args>
</executable>


<!-- exist deployment -->
-
-
- <file src="load-exist.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/load-exist.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/load-exist.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/load-exist.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/load-exist.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${ls.storage_uri}" />
- <arg value="${ls.storage_username}" />
- <arg value="${ls.storage_password}" />
- <arg value="${common.exist_home}" />
- <arg value="${ls.conf_file}" />
- <arg value="${common.basepath}" />
- <arg value="on" />

+ <arg value="${ls_storage_uri}" />
+ <arg value="${ls_storage_username}" />
+ <arg value="${ls_storage_password}" />
+ <arg value="${common_exist_home}" />
+ <arg value="$INSTALL_PATH/conf/LSStore.xml" />
+ <arg value="$INSTALL_PATH/conf/LSStore-control.xml" />

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

</args>
</executable>


+
<!-- handle the service file -->
- <file src="ls.service.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ls.service.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ls.service.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ls.service.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ls.service.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">

<args>
<arg value="$INSTALL_PATH" />
- <arg value="${ls.service_name}" />
- <arg value="${common.basepath}" />
- <arg value="${common.log4j_properties}" />
- <arg value="${common.sax_parser_config}" />
- <arg value="${ls.r_type}" />
- <arg value="${ls.r_access_point}" />
- <arg value="${ls.r_service_name}" />
- <arg value="${ls.r_service_type}" />
- <arg value="${ls.r_description}" />
- <arg value="${ls.r_lookup_service}" />
- <arg value="${ls.storage_uri}" />
- <arg value="${ls.storage_username}" />
- <arg value="${ls.storage_password}" />
- <arg value="${ls.cleanup_interval}" />
- <arg value="${ls.register_interval}" />
+ <arg value="${ls_service_name}" />
+ <arg value="$INSTALL_PATH" />
+ <arg value="$INSTALL_PATH/conf/log4j.properties" />
+ <arg value="$INSTALL_PATH/src/objects.config" />
+ <arg value="${ls_r_type}" />
+ <arg value="${ls_r_access_point}" />
+ <arg value="${ls_r_service_name}" />
+ <arg value="${ls_r_service_type}" />
+ <arg value="${ls_r_description}" />
+ <arg value="${ls_r_lookup_service}" />
+ <arg value="${ls_storage_uri}" />
+ <arg value="${ls_storage_username}" />
+ <arg value="${ls_storage_password}" />
+ <arg value="${ls_cleanup_interval}" />
+ <arg value="${ls_register_interval}" />
</args>
</executable>

<!-- handle the components file -->
- <file src="ls.components.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ls.components.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ls.components.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ls.components.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ls.components.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
<arg value="$INSTALL_PATH" />
@@ -252,44 +263,43 @@
</executable>

<!-- tomcat catalina.properties munging... -->
- <file src="ls.catalina.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ls.catalina.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ls.catalina.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ls.catalina.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ls.catalina.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${ls.tomcat_home}/conf/catalina.properties" />
+ <arg value="${ls_tomcat_home}/conf/catalina.properties" />
<arg value="$INSTALL_PATH" />
</args>
</executable>

<!-- undelpoy/deploy from axis -->
- <file src="axis.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/axis.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/axis.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/axis.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/axis.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${common.javapath}/bin/java" />
- <arg value="${common.hostname}" />
- <arg value="${ls.port}" />
+ <arg value="${common_javapath}/bin/java" />
+ <arg value="${common_hostname}" />
+ <arg value="${ls_port}" />
<arg value="$INSTALL_PATH/wsdd/ls-service-undeploy.wsdd" />
<arg value="$INSTALL_PATH/wsdd/ls-service-deploy.wsdd" />

- <arg
value=".:${ls.axis_home}/WEB-INF/lib/activation.jar:${ls.axis_home}/WEB-INF/lib/jdom.jar:${ls.axis_home}/WEB-INF/lib/xalan.jar:${ls.axis_home}/WEB-INF/lib/axis-ant.jar:${ls.axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ls.axis_home}/WEB-INF/lib/xercesImpl.jar:${ls.axis_home}/WEB-INF/lib/axis.jar:${ls.axis_home}/WEB-INF/lib/mail.jar:${ls.axis_home}/WEB-INF/lib/xercesSamples.jar:${ls.axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ls.axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ls.axis_home}/WEB-INF/lib/xml-apis.jar:${ls.axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ls.axis_home}/WEB-INF/lib/perfSONAR-xmlls.jar:${ls.axis_home}/WEB-INF/lib/xmldb.jar:${ls.axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ls.axis_home}/WEB-INF/lib/resolver.jar:${ls.axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ls.axis_home}/WEB-INF/lib/exist.jar:${ls.axis_home}/WEB-INF/lib/saaj.jar:${ls.axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ls.axis_home}/WEB-INF/lib/jaxrpc.jar:${ls.axis_home}/WEB-I
NF/lib/wsdl4j-1.5.1.jar:${ls.axis_home}/WEB-INF/lib/xmlsec.jar" />
+ <arg
value=".:${ls_axis_home}/WEB-INF/lib/activation.jar:${ls_axis_home}/WEB-INF/lib/jdom.jar:${ls_axis_home}/WEB-INF/lib/xalan.jar:${ls_axis_home}/WEB-INF/lib/axis-ant.jar:${ls_axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ls_axis_home}/WEB-INF/lib/xercesImpl.jar:${ls_axis_home}/WEB-INF/lib/axis.jar:${ls_axis_home}/WEB-INF/lib/mail.jar:${ls_axis_home}/WEB-INF/lib/xercesSamples.jar:${ls_axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ls_axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ls_axis_home}/WEB-INF/lib/xml-apis.jar:${ls_axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ls_axis_home}/WEB-INF/lib/perfSONAR-xmllsjar:${ls_axis_home}/WEB-INF/lib/xmldb.jar:${ls_axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ls_axis_home}/WEB-INF/lib/resolver.jar:${ls_axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ls_axis_home}/WEB-INF/lib/exist.jar:${ls_axis_home}/WEB-INF/lib/saaj.jar:${ls_axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ls_axis_home}/WEB-INF/lib/jaxrpc.jar:${ls_axis_home}/WEB-IN
F/lib/wsdl4j-1.5.1.jar:${ls_axis_home}/WEB-INF/lib/xmlsec.jar" />
+ <arg value="$INSTALL_PATH" />
+ <arg value="LS" />
</args>
</executable>

<!-- client test -->
- <file src="test_ls.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/test_ls.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/test_ls.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/test_ls.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/test_ls.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
<arg value="$INSTALL_PATH" />
- <arg value="${common.javapath}/bin/java" />
- <arg value="${ls.r_access_point}" />
- <arg
value=".:${ls.axis_home}/WEB-INF/lib/activation.jar:${ls.axis_home}/WEB-INF/lib/jdom.jar:${ls.axis_home}/WEB-INF/lib/xalan.jar:${ls.axis_home}/WEB-INF/lib/axis-ant.jar:${ls.axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ls.axis_home}/WEB-INF/lib/xercesImpl.jar:${ls.axis_home}/WEB-INF/lib/axis.jar:${ls.axis_home}/WEB-INF/lib/mail.jar:${ls.axis_home}/WEB-INF/lib/xercesSamples.jar:${ls.axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ls.axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ls.axis_home}/WEB-INF/lib/xml-apis.jar:${ls.axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ls.axis_home}/WEB-INF/lib/perfSONAR-xmlls.jar:${ls.axis_home}/WEB-INF/lib/xmldb.jar:${ls.axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ls.axis_home}/WEB-INF/lib/resolver.jar:${ls.axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ls.axis_home}/WEB-INF/lib/exist.jar:${ls.axis_home}/WEB-INF/lib/saaj.jar:${ls.axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ls.axis_home}/WEB-INF/lib/jaxrpc.jar:${ls.axis_home}/WEB-I
NF/lib/wsdl4j-1.5.1.jar:${ls.axis_home}/WEB-INF/lib/xmlsec.jar" />
+ <arg value="${common_javapath}/bin/java" />
+ <arg value="${ls_r_access_point}" />
+ <arg
value=".:${ls_axis_home}/WEB-INF/lib/activation.jar:${ls_axis_home}/WEB-INF/lib/jdom.jar:${ls_axis_home}/WEB-INF/lib/xalan.jar:${ls_axis_home}/WEB-INF/lib/axis-ant.jar:${ls_axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ls_axis_home}/WEB-INF/lib/xercesImpl.jar:${ls_axis_home}/WEB-INF/lib/axis.jar:${ls_axis_home}/WEB-INF/lib/mail.jar:${ls_axis_home}/WEB-INF/lib/xercesSamples.jar:${ls_axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ls_axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ls_axis_home}/WEB-INF/lib/xml-apis.jar:${ls_axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ls_axis_home}/WEB-INF/lib/perfSONAR-xmllsjar:${ls_axis_home}/WEB-INF/lib/xmldb.jar:${ls_axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ls_axis_home}/WEB-INF/lib/resolver.jar:${ls_axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ls_axis_home}/WEB-INF/lib/exist.jar:${ls_axis_home}/WEB-INF/lib/saaj.jar:${ls_axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ls_axis_home}/WEB-INF/lib/jaxrpc.jar:${ls_axis_home}/WEB-IN
F/lib/wsdl4j-1.5.1.jar:${ls_axis_home}/WEB-INF/lib/xmlsec.jar" />
</args>
</executable>
- <executable targetfile="$INSTALL_PATH/client/test-ls.sh"
stage="never"
+ <executable targetfile="$INSTALL_PATH/scripts/test-ls.sh"
stage="never"
os="unix" keep="true" />


@@ -297,57 +307,75 @@

<pack name="perfSONARMA" required="no" os="unix" preselected="no">
<description>Install perfSONAR MA</description>
- <depends packname="perfSONARBase" />
<depends packname="Contribution"/>
- <depends packname="Data"/>
- <file src="lib/perfSONAR-rrdma.jar"
targetdir="${ma.axis_home}/WEB-INF/lib"/>
- <file src="lib/rrdjtool.jar"
targetdir="${ma.axis_home}/WEB-INF/lib"/>
+ <depends packname="Data"/>
+ <file src="lib/activation.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/perfSONAR-generic.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xercesSamples.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xml-apis.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/commons-pool-1.1.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/resolver.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmldb.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/exist.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmlParserAPIs.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/jdom.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xalan.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmlrpc-1.2-patched.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/mail.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xercesImpl.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/xmlsec.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/perfSONAR-rrdma.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>
+ <file src="lib/rrdjtool.jar"
targetdir="${ma_axis_home}/WEB-INF/lib"/>

+ <file src="client/MAQueryKeyRequest.xml"
targetdir="$INSTALL_PATH/xml"/>
+ <file src="client/MAQueryRequest.xml"
targetdir="$INSTALL_PATH/xml"/>
+ <file src="client/MAStore.xml" targetdir="$INSTALL_PATH/xml"/>

+
<!-- handle the log4j file -->
- <file src="log.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/log.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/log.sh" stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/log.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/log.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${common.log4j_properties}" />
- <arg value="${common.logs_dir}" />
+ <arg value="$INSTALL_PATH/conf/log4j.properties" />
+ <arg value="$INSTALL_PATH/log" />
+ <arg value="${common_master_log_size}" />
+ <arg value="${common_sub_log_size}" />
</args>
</executable>



<!-- native libjrdd.so -->
- <file src="libjrrd.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/libjrrd.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/libjrrd.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/libjrrd.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/libjrrd.sh"
stage="postinstall"
failure="warn" keep="false">
<os family="unix" name="Linux" />
<args>
- <arg value="${ma.rrdjdir}" />
- <arg value="${ma.rrdtool_path}" />
- <arg value="${common.javapath}" />

+ <arg value="${ma_rrdjdir}" />
+ <arg value="${ma_rrdtool_path}" />
+ <arg value="${common_javapath}" />

<arg value="Makefile.linux" />
<arg value="$INSTALL_PATH/log/libjrrd.install" />
</args>
</executable>
- <executable targetfile="$INSTALL_PATH/libjrrd.sh"
stage="postinstall"
+ <executable targetfile="$INSTALL_PATH/scripts/libjrrd.sh"
stage="postinstall"
failure="warn" keep="false">
<os family="unix" name="SunOS" />
<args>
- <arg value="${ma.rrdjdir}" />
- <arg value="${ma.rrdtool_path}" />
- <arg value="${common.javapath}" />
+ <arg value="${ma_rrdjdir}" />
+ <arg value="${ma_rrdtool_path}" />
+ <arg value="${common_javapath}" />
<arg value="Makefile.solaris" />
<arg value="$INSTALL_PATH/log/libjrrd.install" />
</args>
</executable>
- <executable targetfile="$INSTALL_PATH/libjrrd.sh"
stage="postinstall"
+ <executable targetfile="$INSTALL_PATH/scripts/libjrrd.sh"
stage="postinstall"
failure="warn" keep="false">
<os family="mac" name="Darwin" />
<args>
- <arg value="${ma.rrdjdir}" />
- <arg value="${ma.rrdtool_path}" />
- <arg value="${common.javapath}" />
+ <arg value="${ma_rrdjdir}" />
+ <arg value="${ma_rrdtool_path}" />
+ <arg value="${common_javapath}" />
<arg value="Makefile.osx" />
<arg value="$INSTALL_PATH/log/libjrrd.install" />
</args>
@@ -356,13 +384,12 @@


<!-- rrdjtool.jar -->
- <file src="rrdjtool.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/rrdjtool.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/rrdjtool.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/rrdjtool.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/rrdjtool.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${ma.rrdjdir}" />
- <arg value="${common.javapath}" />

+ <arg value="${ma_rrdjdir}" />
+ <arg value="${common_javapath}" />

<arg value="$INSTALL_PATH/log/rrdjtool-javac.install" />
<arg value="$INSTALL_PATH/log/rrdjtool-jar.install" />
</args>
@@ -370,9 +397,8 @@


<!-- rrddb -->
- <file src="rrddb.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/rrddb.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/rrddb.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/rrddb.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/rrddb.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
<arg value="$INSTALL_PATH" />
@@ -384,116 +410,124 @@


<!-- exist deployment -->
-
-
- <file src="load-exist.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/load-exist.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/load-exist.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/load-exist.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/load-exist.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${ma.storage_uri}" />
- <arg value="${ma.storage_username}" />
- <arg value="${ma.storage_password}" />
- <arg value="${common.exist_home}" />
- <arg value="${ma.conf_file}" />
- <arg value="${common.basepath}" />
- <arg value="${ma.storage.use}" />

+ <arg value="${ma_storage_uri}" />
+ <arg value="${ma_storage_username}" />
+ <arg value="${ma_storage_password}" />
+ <arg value="${common_exist_home}" />
+ <arg value="$INSTALL_PATH/conf/rrd-database_TEST.xml" />
+ <arg value="no" />
+ <arg value="$INSTALL_PATH" />
+ <arg value="${ma_exist}" />

</args>
</executable>

+

<!-- make client file -->
- <file src="ma-store-key.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ma-store-key.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ma-store-key.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ma-store-key.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ma-store-key.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
<arg value="$INSTALL_PATH" />
- <arg value="${ma.store_dir}" />
+ <arg value="${ma_store_dir}" />
</args>
</executable>



<!-- handle the service file -->
- <file src="ma.service.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ma.service.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ma.service.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ma.service.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ma.service.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">

<args>
<arg value="$INSTALL_PATH" />
- <arg value="${ma.r_access_point}" />
- <arg value="${ma.r_service_name}" />
- <arg value="${ma.r_service_type}" />
- <arg value="${ma.r_description}" />
- <arg value="${ma.r_lookup_service}" />
- <arg value="${common.sax_parser_config}" />
- <arg value="${common.log4j_properties}" />
- <arg value="${ma.conf_file}" />



- <arg value="${ma.storage_uri}" />
- <arg value="${ma.storage_username}" />
- <arg value="${ma.storage_password}" />
- <arg value="${ma.storage.use}" />
- <arg value="${ma.allow.store}" />
- <arg value="${ma.store_dir}" />

+ <arg value="${ma_r_access_point}" />
+ <arg value="${ma_r_service_name}" />
+ <arg value="${ma_r_service_type}" />
+ <arg value="${ma_r_description}" />
+ <arg value="${ma_r_lookup_service}" />
+ <arg value="$INSTALL_PATH/src/objects.config" />

+ <arg value="$INSTALL_PATH/conf/log4j.properties" />
+ <arg value="$INSTALL_PATH/conf/rrd-database_TEST.xml" />



+ <arg value="${ma_storage_uri}" />
+ <arg value="${ma_storage_username}" />
+ <arg value="${ma_storage_password}" />
+ <arg value="${ma_storage.use}" />
+ <arg value="${ma_allowstore}" />
+ <arg value="${ma_store_dir}" />

</args>
</executable>


<!-- handle the components file -->
- <file src="ma.components.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ma.components.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ma.components.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ma.components.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ma.components.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
<arg value="$INSTALL_PATH" />
- <arg value="${ma.r_lookup_service}" />
+ <arg value="${ma_r_lookup_service}" />
</args>
</executable>

<!-- tomcat catalina.properties munging... -->
- <file src="ma.catalina.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/ma.catalina.sh"
type="shell"/>
- <executable targetfile="$INSTALL_PATH/ma.catalina.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/ma.catalina.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/ma.catalina.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${ma.tomcat_home}/conf/catalina.properties" />
+ <arg value="${ma_tomcat_home}/conf/catalina.properties" />
<arg value="$INSTALL_PATH" />
</args>
</executable>

<!-- undelpoy/deploy from axis -->
- <file src="axis.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/axis.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/axis.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/axis.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/axis.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
- <arg value="${common.javapath}/bin/java" />
- <arg value="${common.hostname}" />
- <arg value="${ma.port}" />
+ <arg value="${common_javapath}/bin/java" />
+ <arg value="${common_hostname}" />
+ <arg value="${ma_port}" />
<arg value="$INSTALL_PATH/wsdd/ma-service-undeploy.wsdd" />
<arg value="$INSTALL_PATH/wsdd/ma-service-deploy.wsdd" />

- <arg
value=".:${ma.axis_home}/WEB-INF/lib/activation.jar:${ma.axis_home}/WEB-INF/lib/jdom.jar:${ma.axis_home}/WEB-INF/lib/xalan.jar:${ma.axis_home}/WEB-INF/lib/axis-ant.jar:${ma.axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ma.axis_home}/WEB-INF/lib/xercesImpl.jar:${ma.axis_home}/WEB-INF/lib/axis.jar:${ma.axis_home}/WEB-INF/lib/mail.jar:${ma.axis_home}/WEB-INF/lib/xercesSamples.jar:${ma.axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ma.axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ma.axis_home}/WEB-INF/lib/xml-apis.jar:${ma.axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ma.axis_home}/WEB-INF/lib/perfSONAR-rrdma.jar:${ma.axis_home}/WEB-INF/lib/rrdjtool.jar:${ma.axis_home}/WEB-INF/lib/xmldb.jar:${ma.axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ma.axis_home}/WEB-INF/lib/resolver.jar:${ma.axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ma.axis_home}/WEB-INF/lib/exist.jar:${ma.axis_home}/WEB-INF/lib/saaj.jar:${ma.axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ma.axis_home}/WEB

-INF/lib/jaxrpc.jar:${ma.axis_home}/WEB-INF/lib/wsdl4j-1.5.1.jar:${ma.axis_home}/WEB-INF/lib/xmlsec.jar"
/>
+ <arg
value=".:${ma_axis_home}/WEB-INF/lib/activation.jar:${ma_axis_home}/WEB-INF/lib/jdom.jar:${ma_axis_home}/WEB-INF/lib/xalan.jar:${ma_axis_home}/WEB-INF/lib/axis-ant.jar:${ma_axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ma_axis_home}/WEB-INF/lib/xercesImpl.jar:${ma_axis_home}/WEB-INF/lib/axis.jar:${ma_axis_home}/WEB-INF/lib/mail.jar:${ma_axis_home}/WEB-INF/lib/xercesSamples.jar:${ma_axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ma_axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ma_axis_home}/WEB-INF/lib/xml-apis.jar:${ma_axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ma_axis_home}/WEB-INF/lib/perfSONAR-rrdmajar:${ma_axis_home}/WEB-INF/lib/rrdjtool.jar:${ma_axis_home}/WEB-INF/lib/xmldb.jar:${ma_axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ma_axis_home}/WEB-INF/lib/resolver.jar:${ma_axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ma_axis_home}/WEB-INF/lib/exist.jar:${ma_axis_home}/WEB-INF/lib/saaj.jar:${ma_axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ma_axis_home}/WEB-

INF/lib/jaxrpc.jar:${ma_axis_home}/WEB-INF/lib/wsdl4j-1.5.1.jar:${ma_axis_home}/WEB-INF/lib/xmlsec.jar"
/>
+ <arg value="$INSTALL_PATH" />
+ <arg value="MA" />
</args>
</executable>

-
-
+
<!-- client test -->
- <file src="test_ma.sh" targetdir="$INSTALL_PATH"/>
- <parsable targetfile="$INSTALL_PATH/test_ma.sh" type="shell"/>

- <executable targetfile="$INSTALL_PATH/test_ma.sh"
stage="postinstall"
+ <parsable targetfile="$INSTALL_PATH/scripts/test_ma.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/test_ma.sh"
stage="postinstall"
os="unix" failure="warn" keep="false">
<args>
<arg value="$INSTALL_PATH" />
- <arg value="${common.javapath}/bin/java" />
- <arg value="${ma.r_access_point}" />
- <arg
value=".:${ma.axis_home}/WEB-INF/lib/activation.jar:${ma.axis_home}/WEB-INF/lib/jdom.jar:${ma.axis_home}/WEB-INF/lib/xalan.jar:${ma.axis_home}/WEB-INF/lib/axis-ant.jar:${ma.axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ma.axis_home}/WEB-INF/lib/xercesImpl.jar:${ma.axis_home}/WEB-INF/lib/axis.jar:${ma.axis_home}/WEB-INF/lib/mail.jar:${ma.axis_home}/WEB-INF/lib/xercesSamples.jar:${ma.axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ma.axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ma.axis_home}/WEB-INF/lib/xml-apis.jar:${ma.axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ma.axis_home}/WEB-INF/lib/perfSONAR-rrdma.jar:${ma.axis_home}/WEB-INF/lib/rrdjtool.jar:${ma.axis_home}/WEB-INF/lib/xmldb.jar:${ma.axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ma.axis_home}/WEB-INF/lib/resolver.jar:${ma.axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ma.axis_home}/WEB-INF/lib/exist.jar:${ma.axis_home}/WEB-INF/lib/saaj.jar:${ma.axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ma.axis_home}/WEB

-INF/lib/jaxrpc.jar:${ma.axis_home}/WEB-INF/lib/wsdl4j-1.5.1.jar:${ma.axis_home}/WEB-INF/lib/xmlsec.jar"
/>
+ <arg value="${common_javapath}/bin/java" />
+ <arg value="${ma_r_access_point}" />
+ <arg
value=".:${ma_axis_home}/WEB-INF/lib/activation.jar:${ma_axis_home}/WEB-INF/lib/jdom.jar:${ma_axis_home}/WEB-INF/lib/xalan.jar:${ma_axis_home}/WEB-INF/lib/axis-ant.jar:${ma_axis_home}/WEB-INF/lib/log4j-1.2.8.jar:${ma_axis_home}/WEB-INF/lib/xercesImpl.jar:${ma_axis_home}/WEB-INF/lib/axis.jar:${ma_axis_home}/WEB-INF/lib/mail.jar:${ma_axis_home}/WEB-INF/lib/xercesSamples.jar:${ma_axis_home}/WEB-INF/lib/commons-discovery-0.2.jar:${ma_axis_home}/WEB-INF/lib/perfSONAR-generic.jar:${ma_axis_home}/WEB-INF/lib/xml-apis.jar:${ma_axis_home}/WEB-INF/lib/commons-logging-1.0.4.jar:${ma_axis_home}/WEB-INF/lib/perfSONAR-rrdmajar:${ma_axis_home}/WEB-INF/lib/rrdjtool.jar:${ma_axis_home}/WEB-INF/lib/xmldb.jar:${ma_axis_home}/WEB-INF/lib/commons-pool-1.1.jar:${ma_axis_home}/WEB-INF/lib/resolver.jar:${ma_axis_home}/WEB-INF/lib/xmlParserAPIs.jar:${ma_axis_home}/WEB-INF/lib/exist.jar:${ma_axis_home}/WEB-INF/lib/saaj.jar:${ma_axis_home}/WEB-INF/lib/xmlrpc-1.2-patched.jar:${ma_axis_home}/WEB-

INF/lib/jaxrpc.jar:${ma_axis_home}/WEB-INF/lib/wsdl4j-1.5.1.jar:${ma_axis_home}/WEB-INF/lib/xmlsec.jar"
/>
</args>
</executable>
- <executable targetfile="$INSTALL_PATH/client/test-ma.sh"
stage="never"
+ <executable targetfile="$INSTALL_PATH/scripts/test-ma.sh"
stage="never"
os="unix" keep="true" />


</pack>
+
+ <pack name="Cleanup" required="no" preselected="yes">
+ <description>Cleanup installation files.</description>
+ <!-- cleaup script -->
+ <parsable targetfile="$INSTALL_PATH/scripts/cleanup.sh"
type="shell"/>
+ <executable targetfile="$INSTALL_PATH/scripts/cleanup.sh"
stage="postinstall"
+ os="unix" failure="warn" keep="false">
+ <args>
+ <arg value="$INSTALL_PATH/log/cleanup.log" />
+ <arg value="$INSTALL_PATH/scripts" />
+ </args>
+ </executable>
+ </pack>
+
</packs>
</installation>

Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/lib/perfSONAR-generic.jar
===================================================================
(Binary files differ)

Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/lib/perfSONAR-xmlls.jar
===================================================================
(Binary files differ)

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/libjrrd.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/load-exist.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/log.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ls.catalina.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ls.components.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ls.service.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ma-store-key.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ma.catalina.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ma.components.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/ma.service.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/rrddb.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/rrdjtool-static.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/rrdjtool.sh

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/axis.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/axis.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/libjrrd.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/libjrrd.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/log.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/log.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.catalina.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.catalina.sh
___________________________________________________________________
Name: svn:executable
+ *

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.components.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.components.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.service.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.service.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh
___________________________________________________________________
Name: svn:executable
+ *

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.components.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.components.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.service.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.service.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrddb.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrddb.sh
___________________________________________________________________
Name: svn:executable
+ *

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrdjtool-static.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrdjtool-static.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrdjtool.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/rrdjtool.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ls.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ls.sh
___________________________________________________________________
Name: svn:executable
+ *

Added: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh


Property changes on:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh
___________________________________________________________________
Name: svn:executable
+ *

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/test_ls.sh

Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/test_ma.sh

Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
2006-06-22 21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
2006-06-26 05:04:50 UTC (rev 1326)
@@ -1,64 +1,64 @@
<langpack>
- <str txt="This Panel Asks for Information Common to the LS and MA"
id="common.label"/>
- <str txt="Enter base path for the application:" id="common.basepath.label"
/>
- <str txt="Enter java path for the application:" id="common.javapath.label"
/>
- <str txt="Enter the hostname:" id="common.hostname.label" />
- <str txt="Enter the log4j file:" id="common.log4j_properties.label" />
- <str txt="Enter the log directory:" id="common.logs_dir.label" />
- <str txt="Enter the sax config file:" id="common.sax_parser_config.label"
/>
- <str txt="eXist home directory:" id="common.exist_home.label"/>
+ <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="eXist home directory:" id="common_exist_homelabel"/>

- <str txt="This Panel Asks for Information Specific to the LS"
id="ls.intro.label" />
- <str txt="Tomcat home directory:" id="ls.tomcat_home.label" />
- <str txt="Axis home directory:" id="ls.axis_home.label" />
- <str txt="Enter Tomcat port:" id="ls.port.label" />
- <str txt="Lookup Information of service -- access point (URL):"
id="ls.r_access_point.label" />
- <str txt="Lookup Information of service -- service name:"
id="ls.r_service_name.label" />
- <str txt="Lookup Information of service -- service type:"
id="ls.r_service_type.label" />
- <str txt="Lookup Information of service -- service description:"
id="ls.r_description.label" />
- <str txt="Lookup Service to register Lookup Information:"
id="ls.r_lookup_service.label" />
- <str txt="Enter service name:" id="ls.service_name.label" />

- <str txt="LS Storage -- XML database collection:"
id="ls.storage_uri.label" />
- <str txt="LS Storage -- XML database username:"
id="ls.storage_username.label" />
- <str txt="LS Storage -- XML database password:"
id="ls.storage_password.label" />
- <str txt="LS Storage -- XML Conf File:" id="ls.conf_file.label"/>

- <str txt="LS Cleanup -- cleanup interval (ms):"
id="ls.cleanup_interval.label" />
- <str txt="Register with LS interval (ms):" id="ls.register_interval.label"
/>
- <str txt="Add this path to CLASSPATH:" id="ls.advise1.label"/>
+ <str txt="This Panel Asks for Information Specific to the LS"
id="ls_introlabel" />
+ <str txt="Tomcat home directory:" id="ls_tomcat_homelabel" />
+ <str txt="Axis home directory:" id="ls_axis_homelabel" />
+ <str txt="Enter Tomcat port:" id="ls_portlabel" />
+ <str txt="Lookup Information of service -- access point (URL):"
id="ls_r_access_pointlabel" />
+ <str txt="Lookup Information of service -- service name:"
id="ls_r_service_namelabel" />
+ <str txt="Lookup Information of service -- service type:"
id="ls_r_service_typelabel" />
+ <str txt="Lookup Information of service -- service description:"
id="ls_r_descriptionlabel" />
+ <str txt="Lookup Service to register Lookup Information:"
id="ls_r_lookup_servicelabel" />
+ <str txt="Enter service name:" id="ls_service_namelabel" />

+ <str txt="LS Storage -- XML database collection:" id="ls_storage_urilabel"
/>
+ <str txt="LS Storage -- XML database username:"
id="ls_storage_usernamelabel" />
+ <str txt="LS Storage -- XML database password:"
id="ls_storage_passwordlabel" />
+ <str txt="LS Storage -- XML Conf File:" id="ls_conf_filelabel"/>
+ <str txt="LS Storage -- XML Control Conf File:"
id="ls_control_conf_filelabel"/>
+ <str txt="LS Cleanup -- cleanup interval (ms):"
id="ls_cleanup_intervallabel" />
+ <str txt="Register with LS interval (ms):" id="ls_register_intervallabel"
/>
+ <str txt="Add this path to CLASSPATH:" id="ls_advise1label"/>
<str txt="/AXIS_PATH/WEB-INF/lib/ALL_JAR_FILES"
- id="ls.advise2.label"/>
-
- <str txt="This Panel Asks for Information Specific to the MA"
id="ma.intro.label"/>
- <str txt="Tomcat home directory:" id="ma.tomcat_home.label" />
- <str txt="Axis home directory:" id="ma.axis_home.label" />
- <str txt="Enter Tomcat port:" id="ma.port.label" />
- <str txt="Enter service name:" id="ma.service_name.label" />

- <str txt="Enter rrdj directory:" id="ma.rrdjdir.label" />
- <str txt="Enter rrdtool path:" id="ma.rrdtool_path.label" />

- <str txt="Measurement Archive Information of service -- access point
(URL):" id="ma.r_access_point.label" />
- <str txt="Measurement Archive Information of service -- service name:"
id="ma.r_service_name.label" />
- <str txt="Measurement Archive Information of service -- service type:"
id="ma.r_service_type.label" />
- <str txt="Measurement Archive Information of service -- service
description:" id="ma.r_description.label" />
- <str txt="Measurement Archive Service to register Lookup Information:"
id="ma.r_lookup_service.label" />
- <str txt="MA Conf File:" id="ma.conf_file.label" />
- <str txt="Add this path to CLASSPATH:" id="ma.advise1.label"/>
+ id="ls_advise2label"/>
+ <str txt="Do you want the installer to configure eXist[on/off]:"
id="ls_existlabel"/>
+
+ <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" />
+ <str txt="Enter Tomcat port:" id="ma_portlabel" />
+ <str txt="Enter service name:" id="ma_service_namelabel" />
+ <str txt="Enter rrdj directory:" id="ma_rrdjdirlabel" />
+ <str txt="Enter rrdtool path:" id="ma_rrdtool_pathlabel" />
+ <str txt="Measurement Archive Information of service -- access point
(URL):" id="ma_r_access_pointlabel" />
+ <str txt="Measurement Archive Information of service -- service name:"
id="ma_r_service_namelabel" />
+ <str txt="Measurement Archive Information of service -- service type:"
id="ma_r_service_typelabel" />
+ <str txt="Measurement Archive Information of service -- service
description:" id="ma_r_descriptionlabel" />
+ <str txt="Measurement Archive Service to register Lookup Information:"
id="ma_r_lookup_servicelabel" />
+ <str txt="MA Conf File:" id="ma_conf_filelabel" />
+ <str txt="Add this path to CLASSPATH:" id="ma_advise1label"/>
<str txt="/AXIS_PATH/WEB-INF/lib/ALL_JAR_FILES"
- id="ma.advise2.label"/>
- <str txt="Add these two paths to LD_LIBRARY_PATH:" id="ma.advise3.label"/>
+ id="ma_advise2label"/>
+ <str txt="Add these two paths to LD_LIBRARY_PATH:" id="ma_advise3label"/>
<str txt="/RRDTOOL_PATH/lib and
/PERFSONAR_PATH/contrib/rrdjtool/build"
- id="ma.advise4.label"/>
+ id="ma_advise4label"/>



- <str txt="This Panel Asks for Information Specific to the MA"
id="ma.intro2.label"/>
- <str txt="Do you want to use eXist for the MA:"
id="ma.storage.use.label"/>
- <str txt="MA Storage -- XML database collection:"
id="ma.storage_uri.label" />
- <str txt="MA Storage -- XML database username:"
id="ma.storage_username.label" />
- <str txt="MA Storage -- XML database password:"
id="ma.storage_password.label" />

- <str txt="Do you want to allow storage into the MA:"
id="ma.allow.store.label" />
- <str txt="MA Storage Directory:" id="ma.store_dir.label" />

+ <str txt="This Panel Asks for Information Specific to the MA"
id="ma_intro2label"/>
+ <str txt="Do you want to use eXist for the MA[on/off]:"
id="ma_storage.uselabel"/>
+ <str txt="MA Storage -- XML database collection:" id="ma_storage_urilabel"
/>
+ <str txt="MA Storage -- XML database username:"
id="ma_storage_usernamelabel" />
+ <str txt="MA Storage -- XML database password:"
id="ma_storage_passwordlabel" />

+ <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"/>

-
</langpack>



Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol
2006-06-22 21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol
2006-06-26 05:04:50 UTC (rev 1326)
@@ -1,61 +1,61 @@
<langpack>
- <str txt="POLISH: This Panel Asks for Information Common to the LS and MA"
id="common.label"/>
- <str txt="POLISH: Enter base path for the application:"
id="common.basepath.label" />
- <str txt="POLISH: Enter java path for the application:"
id="common.javapath.label" />
- <str txt="POLISH: Enter the hostname:" id="common.hostname.label" />
- <str txt="POLISH: Enter the log4j file:"
id="common.log4j_properties.label" />
- <str txt="POLISH: Enter the log directory:" id="common.logs_dir.label" />
- <str txt="POLISH: Enter the sax config file:"
id="common.sax_parser_config.label" />
- <str txt="POLISH: eXist home directory:" id="common.exist_home.label"/>
+ <str txt="POLISH: This Panel Asks for Information Common to the LS and MA"
id="common_label"/>
+ <str txt="POLISH: Enter java path for the application:"
id="common_javapathlabel" />
+ <str txt="POLISH: Enter the hostname:" id="common_hostnamelabel" />
+ <str txt="POLISH: Enter the size (in # of lines) of the master log file:"
id="common_master_log_sizelabel" />
+ <str txt="POLISH: Enter the size (in # of lines) of the other log files:"
id="common_sub_log_sizelabel" />
+ <str txt="POLISH: eXist home directory:" id="common_exist_homelabel"/>

- <str txt="POLISH: This Panel Asks for Information Specific to the LS"
id="ls.intro.label" />
- <str txt="POLISH: Tomcat home directory:" id="ls.tomcat_home.label" />
- <str txt="POLISH: Axis home directory:" id="ls.axis_home.label" />
- <str txt="POLISH: Enter Tomcat port:" id="ls.port.label" />
- <str txt="POLISH: Lookup Information of service -- access point (URL):"
id="ls.r_access_point.label" />
- <str txt="POLISH: Lookup Information of service -- service name:"
id="ls.r_service_name.label" />
- <str txt="POLISH: Lookup Information of service -- service type:"
id="ls.r_service_type.label" />
- <str txt="POLISH: Lookup Information of service -- service description:"
id="ls.r_description.label" />
- <str txt="POLISH: Lookup Service to register Lookup Information:"
id="ls.r_lookup_service.label" />
- <str txt="POLISH: Enter service name:" id="ls.service_name.label" />

- <str txt="POLISH: LS Storage -- XML database collection:"
id="ls.storage_uri.label" />
- <str txt="POLISH: LS Storage -- XML database username:"
id="ls.storage_username.label" />
- <str txt="POLISH: LS Storage -- XML database password:"
id="ls.storage_password.label" />
- <str txt="POLISH: LS Storage -- XML Conf File:" id="ls.conf_file.label"/>

- <str txt="POLISH: LS Cleanup -- cleanup interval (ms):"
id="ls.cleanup_interval.label" />
- <str txt="POLISH: Register with LS interval (ms):"
id="ls.register_interval.label" />
- <str txt="POLISH: Add this path to CLASSPATH:" id="ls.advise1.label"/>
+ <str txt="POLISH: This Panel Asks for Information Specific to the LS"
id="ls_introlabel" />
+ <str txt="POLISH: Tomcat home directory:" id="ls_tomcat_homelabel" />
+ <str txt="POLISH: Axis home directory:" id="ls_axis_homelabel" />
+ <str txt="POLISH: Enter Tomcat port:" id="ls_portlabel" />
+ <str txt="POLISH: Lookup Information of service -- access point (URL):"
id="ls_r_access_pointlabel" />
+ <str txt="POLISH: Lookup Information of service -- service name:"
id="ls_r_service_namelabel" />
+ <str txt="POLISH: Lookup Information of service -- service type:"
id="ls_r_service_typelabel" />
+ <str txt="POLISH: Lookup Information of service -- service description:"
id="ls_r_descriptionlabel" />
+ <str txt="POLISH: Lookup Service to register Lookup Information:"
id="ls_r_lookup_servicelabel" />
+ <str txt="POLISH: Enter service name:" id="ls_service_namelabel" />

+ <str txt="POLISH: LS Storage -- XML database collection:"
id="ls_storage_urilabel" />
+ <str txt="POLISH: LS Storage -- XML database username:"
id="ls_storage_usernamelabel" />
+ <str txt="POLISH: LS Storage -- XML database password:"
id="ls_storage_passwordlabel" />
+ <str txt="POLISH: LS Storage -- XML Conf File:" id="ls_conf_filelabel"/>

+ <str txt="POLISH: LS Storage -- XML Control Conf File:"
id="ls_control_conf_filelabel"/>
+ <str txt="POLISH: LS Cleanup -- cleanup interval (ms):"
id="ls_cleanup_intervallabel" />
+ <str txt="POLISH: Register with LS interval (ms):"
id="ls_register_intervallabel" />
+ <str txt="POLISH: Add this path to CLASSPATH:" id="ls_advise1label"/>
<str txt="POLISH: /TOMCAT_PATH/webapps/axis/WEB-INF/lib/ALL_JAR_FILES"
- id="ls.advise2.label"/>
-
- <str txt="POLISH: This Panel Asks for Information Specific to the MA"
id="ma.intro.label"/>
- <str txt="POLISH: Tomcat home directory:" id="ma.tomcat_home.label" />
- <str txt="POLISH: Axis home directory:" id="ma.axis_home.label" />
- <str txt="POLISH: Enter Tomcat port:" id="ma.port.label" />
- <str txt="POLISH: Enter service name:" id="ma.service_name.label" />

- <str txt="POLISH: Enter rrdj directory:" id="ma.rrdjdir.label" />

- <str txt="POLISH: Enter rrdtool path:" id="ma.rrdtool_path.label" />

- <str txt="POLISH: Measurement Archive Information of service -- access
point (URL):" id="ma.r_access_point.label" />
- <str txt="POLISH: Measurement Archive Information of service -- service
name:" id="ma.r_service_name.label" />
- <str txt="POLISH: Measurement Archive Information of service -- service
type:" id="ma.r_service_type.label" />
- <str txt="POLISH: Measurement Archive Information of service -- service
description:" id="ma.r_description.label" />
- <str txt="POLISH: Measurement Archive Service to register Lookup
Information:" id="ma.r_lookup_service.label" />
- <str txt="POLISH: MA Conf File:" id="ma.conf_file.label" />
- <str txt="POLISH: Add this path to CLASSPATH:" id="ma.advise1.label"/>
+ id="ls_advise2label"/>
+ <str txt="POLISH: Do you want the installer to configure eXist[on/off]:"
id="ls_existlabel"/>
+
+ <str txt="POLISH: This Panel Asks for Information Specific to the MA"
id="ma_introlabel"/>
+ <str txt="POLISH: Tomcat home directory:" id="ma_tomcat_homelabel" />
+ <str txt="POLISH: Axis home directory:" id="ma_axis_homelabel" />
+ <str txt="POLISH: Enter Tomcat port:" id="ma_portlabel" />
+ <str txt="POLISH: Enter service name:" id="ma_service_namelabel" />

+ <str txt="POLISH: Enter rrdj directory:" id="ma_rrdjdirlabel" />

+ <str txt="POLISH: Enter rrdtool path:" id="ma_rrdtool_pathlabel" />

+ <str txt="POLISH: Measurement Archive Information of service -- access
point (URL):" id="ma_r_access_pointlabel" />
+ <str txt="POLISH: Measurement Archive Information of service -- service
name:" id="ma_r_service_namelabel" />
+ <str txt="POLISH: Measurement Archive Information of service -- service
type:" id="ma_r_service_typelabel" />
+ <str txt="POLISH: Measurement Archive Information of service -- service
description:" id="ma_r_descriptionlabel" />
+ <str txt="POLISH: Measurement Archive Service to register Lookup
Information:" id="ma_r_lookup_servicelabel" />
+ <str txt="POLISH: MA Conf File:" id="ma_conf_filelabel" />
+ <str txt="POLISH: Add this path to CLASSPATH:" id="ma_advise1label"/>
<str txt="POLISH: /TOMCAT_PATH/webapps/axis/WEB-INF/lib/ALL_JAR_FILES"
- id="ma.advise2.label"/>
- <str txt="POLISH: Add these two paths to LD_LIBRARY_PATH:"
id="ma.advise3.label"/>
+ id="ma_advise2label"/>
+ <str txt="POLISH: Add these two paths to LD_LIBRARY_PATH:"
id="ma_advise3label"/>
<str txt="POLISH: /RRDTOOL_PATH/lib and
/PERFSONAR_PATH/contrib/rrdjtool/build"
- id="ma.advise4.label"/>
+ id="ma_advise4label"/>

- <str txt="POLISH: This Panel Asks for Information Specific to the MA"
id="ma.intro2.label"/>
- <str txt="POLISH: Do you want to use eXist for the MA:"
id="ma.storage.use.label"/>
- <str txt="POLISH: MA Storage -- XML database collection:"
id="ma.storage_uri.label" />
- <str txt="POLISH: MA Storage -- XML database username:"
id="ma.storage_username.label" />
- <str txt="POLISH: MA Storage -- XML database password:"
id="ma.storage_password.label" />

- <str txt="POLISH: Do you want to allow storage into the MA:"
id="ma.allow.store.label" />
- <str txt="POLISH: MA Storage Directory:" id="ma.store_dir.label" />

-
+ <str txt="POLISH: This Panel Asks for Information Specific to the MA"
id="ma_intro2label"/>
+ <str txt="POLISH: Do you want to use eXist for the MA[on/off]:"
id="ma_storage.uselabel"/>
+ <str txt="POLISH: MA Storage -- XML database collection:"
id="ma_storage_urilabel" />
+ <str txt="POLISH: MA Storage -- XML database username:"
id="ma_storage_usernamelabel" />
+ <str txt="POLISH: MA Storage -- XML database password:"
id="ma_storage_passwordlabel" />

+ <str txt="POLISH: Do you want to allow storage into the MA[on/off]:"
id="ma_allow.storelabel" />
+ <str txt="POLISH: MA Storage Directory:" id="ma_store_dirlabel" />

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

</langpack>


Modified: branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
2006-06-22 21:41:49 UTC (rev 1325)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
2006-06-26 05:04:50 UTC (rev 1326)
@@ -1,245 +1,315 @@
<userInput>
<panel order="0">
<field type="staticText" align="center"
- txt="This Panel Asks for Information Common to the LS and MA"
id="common.label"/>
+ txt="This Panel Asks for Information Common to the LS and MA"
id="common_label"/>
<field type="space" />
- <field type="text" variable="common.basepath">
- <spec txt="Enter base path for the application:"
id="common.basepath.label" size="40"
- set="$INSTALL_PATH"/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Basepath!"/>
- </field>
- <field type="text" variable="common.javapath">
- <spec txt="Enter java path for the application:"
id="common.javapath.label" size="40"
- set="${common.javapath}"/>
+
+ <!--
=========================================================================================
-->
+ <!-- Common Variables
-->
+ <!--
=========================================================================================
-->
+
+ <field type="text" variable="common_javapath">
+ <spec txt="Enter java path for the application:"
id="common_javapathlabel" size="40"
+ set="${common_javapath}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Javapath!"/>
</field>
- <field type="text" variable="common.hostname">
- <spec txt="Enter the hostname:" id="common.hostname.label" size="40"
- set="${common.hostname}"/>
+
+ <field type="text" variable="common_hostname">
+ <spec txt="Enter the hostname:" id="common_hostnamelabel" size="40"
+ set="$HOST_NAME"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid hostname!"/>
</field>
- <field type="text" variable="common.log4j_properties">
- <spec txt="Enter the log4j file:" id="common.log4j_properties.label"
size="40"
- set="$INSTALL_PATH/conf/log4j.properties"/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid log4j file!"/>
- </field>
- <field type="text" variable="common.logs_dir">
- <spec txt="Enter the log directory:" id="common.logs_dir.label"
size="40"
- set="$INSTALL_PATH/log"/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid log directory!"/>
- </field>
- <field type="text" variable="common.sax_parser_config">
- <spec txt="Enter the sax config file:"
id="common.sax_parser_config.label" size="40"
- set="$INSTALL_PATH/src/objects.config"/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid sax file!"/>
- </field>
- <field type="text" variable="common.exist_home">
- <spec txt="eXist home directory:" id="common.exist_home.label"
size="40" set="${common.exist_home}"/>
+
+ <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}"/>
+ <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}"/>
+ <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid log size!"/>
+ </field>
+
+ <field type="text" variable="common_exist_home">
+ <spec txt="eXist home directory:" id="common_exist_homelabel"
size="40"
+ set="${common_exist_home}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid eXist Home!"/>
</field>
+
+ <!--
=========================================================================================
-->
+
</panel>
+
+
+

<panel order="1">
<field type="staticText" align="center"
- txt="This Panel Asks for Information Specific to the LS"
id="ls.intro.label"/>
+ txt="This Panel Asks for Information Specific to the LS"
id="ls_introlabel"/>
<field type="space" />
- <field type="text" variable="ls.tomcat_home">
- <spec txt="Tomcat home directory:" id="ls.tomcat_home.label" size="40"
set="${ls.tomcat_home}"/>
+
+ <!--
=========================================================================================
-->
+ <!-- LS Variables
-->
+ <!--
=========================================================================================
-->
+
+ <field type="text" variable="ls_tomcat_home">
+ <spec txt="Tomcat home directory:" id="ls_tomcat_homelabel" size="40"
+ set="${ls_tomcat_home}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Tomcat Home!"/>
</field>
- <field type="text" variable="ls.axis_home">
- <spec txt="Axis home directory:" id="ls.axis_home.label" size="40"
set="${ls.axis_home}"/>
+ <field type="text" variable="ls_axis_home">
+ <spec txt="Axis home directory:" id="ls_axis_homelabel" size="40"
+ set="${ls_axis_home}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Axis Home!"/>
</field>

+
+
<field type="space" />
<field type="staticText" align="center"
- txt="Add this path to CLASSPATH:" id="ls.advise1.label"/>
+ txt="Add this path to CLASSPATH:" id="ls_advise1label"/>
<field type="staticText" align="center"
txt="/AXIS_PATH/WEB-INF/lib/ALL_JAR_FILES"
- id="ls.advise2.label"/>
+ id="ls_advise2label"/>
<field type="space" />

- <field type="text" variable="ls.port">
- <spec txt="Enter Tomcat port:" id="ls.port.label" size="40"
set="${ls.port}"/>
+
+
+ <field type="text" variable="ls_port">
+ <spec txt="Enter Tomcat port:" id="ls_portlabel" size="40"
+ set="${ls_port}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid port!"/>
</field>

- <field type="text" variable="ls.r_access_point">
- <spec txt="Lookup Information of service -- access point (URL):"
id="ls.r_access_point.label" size="40"
-
set="http://${common.hostname}:8080/axis/services/LookupService"/>

+ <field type="text" variable="ls_r_access_point">
+ <spec txt="Lookup Information of service -- access point (URL):"
id="ls_r_access_pointlabel" size="40"
+ set="http://$HOST_NAME:8080/axis/services/LookupService"/>

<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Access Point!"/>
</field>
- <field type="text" variable="ls.r_service_name">
- <spec txt="Lookup Information of service -- service name:"
id="ls.r_service_name.label" size="40" set="${ls.r_service_name}"/>

+ <field type="text" variable="ls_r_service_name">
+ <spec txt="Lookup Information of service -- service name:"
id="ls_r_service_namelabel" size="40"
+ set="${ls_r_service_name}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Service Name!"/>
</field>
- <field type="text" variable="ls.r_service_type">
- <spec txt="Lookup Information of service -- service type:"
id="ls.r_service_type.label" size="40"
- set="${ls.r_service_type}"/>
+ <field type="text" variable="ls_r_service_type">
+ <spec txt="Lookup Information of service -- service type:"
id="ls_r_service_typelabel" size="40"
+ set="${ls_r_service_type}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Service Type!"/>
</field>
- <field type="text" variable="ls.r_description">
- <spec txt="Lookup Information of service -- service description:"
id="ls.r_description.label" size="40"
- set="${ls.r_description}"/>
+ <field type="text" variable="ls_r_description">
+ <spec txt="Lookup Information of service -- service description:"
id="ls_r_descriptionlabel" size="40"
+ set="${ls_r_description}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Description!"/>
</field>
- <field type="text" variable="ls.r_lookup_service">
- <spec txt="Lookup Service to register Lookup Information:"
id="ls.r_lookup_service.label" size="40"
- set="${ls.r_lookup_service}"/>
+ <field type="text" variable="ls_r_lookup_service">
+ <spec txt="Lookup Service to register Lookup Information:"
id="ls_r_lookup_servicelabel" size="40"
+ set="http://$HOST_NAME:8080/axis/services/LookupService"/>

<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Lookup Service URI!"/>
</field>

- <field type="text" variable="ls.service_name">
- <spec txt="Enter service name:" id="ls.service_name.label" size="40"
set="${ls.service_name}"/>
+ <field type="text" variable="ls_service_name">
+ <spec txt="Enter service name:" id="ls_service_namelabel" size="40"
+ set="${ls_service_name}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Service Name!"/>
</field>

- <field type="text" variable="ls.storage_uri">
- <spec txt="LS Storage -- XML database collection:"
id="ls.storage_uri.label" size="40" set="${ls.storage_uri}"/>
+ <field type="text" variable="ls_storage_uri">
+ <spec txt="LS Storage -- XML database collection:"
id="ls_storage_urilabel" size="40"
+ set="xmldb:exist://$HOST_NAME:8680/exist/xmlrpc/db/ls"/>

<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Storage URI!"/>
</field>
- <field type="text" variable="ls.storage_username">
- <spec txt="LS Storage -- XML database username:"
id="ls.storage_username.label" size="40" set="${ls.storage_username}"/>

+ <field type="text" variable="ls_storage_username">
+ <spec txt="LS Storage -- XML database username:"
id="ls_storage_usernamelabel" size="40"
+ set="${ls_storage_username}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Storage Username!"/>
</field>
- <field type="text" variable="ls.storage_password">
- <spec txt="LS Storage -- XML database password:"
id="ls.storage_password.label" size="40" set="${ls.storage_password}"/>

+ <field type="text" variable="ls_storage_password">
+ <spec txt="LS Storage -- XML database password:"
id="ls_storage_passwordlabel" size="40"
+ set="${ls_storage_password}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Storage Password!"/>
</field>
- <field type="text" variable="ls.conf_file">
- <spec txt="LS Storage -- XML Conf File:" id="ls.conf_file.label"
size="40" set="$INSTALL_PATH/conf/LSStore.xml"/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Storage Password!"/>
- </field>
- <field type="text" variable="ls.cleanup_interval">
- <spec txt="LS Cleanup -- cleanup interval (ms):"
id="ls.cleanup_interval.label" size="40" set="${ls.cleanup_interval}"/>

+
+ <field type="text" variable="ls_cleanup_interval">
+ <spec txt="LS Cleanup -- cleanup interval (ms):"
id="ls_cleanup_intervallabel" size="40"
+ set="${ls_cleanup_interval}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Cleanup Interval!"/>
</field>
- <field type="text" variable="ls.register_interval">
- <spec txt="Register with LS interval (ms):"
id="ls.register_interval.label" size="40" set="${ls.register_interval}"/>
+ <field type="text" variable="ls_register_interval">
+ <spec txt="Register with LS interval (ms):"
id="ls_register_intervallabel" size="40"
+ set="${ls_register_interval}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Register Interval!"/>
</field>

+ <field type="text" variable="ls_exist">
+ <spec txt="Do you want the installer to configure eXist[on/off]:"
id="ls_existlabel" size="5"
+ set="${ls_exist}"/>
+ <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Answer!"/>
+ </field>
+
+ <!--
=========================================================================================
-->
+
</panel>

+
+
<panel order="2">
<field type="staticText" align="center"
- txt="This Panel Asks for Information Specific to the MA"
id="ma.intro.label"/>
+ txt="This Panel Asks for Information Specific to the MA"
id="ma_introlabel"/>
<field type="space" />
- <field type="text" variable="ma.tomcat_home">
- <spec txt="Tomcat home directory:" id="ma.tomcat_home.label" size="40"
set="${ma.tomcat_home}"/>
+
+
+ <!--
=========================================================================================
-->
+ <!-- MA Variables
-->
+ <!--
=========================================================================================
-->
+
+
+ <field type="text" variable="ma_tomcat_home">
+ <spec txt="Tomcat home directory:" id="ma_tomcat_homelabel" size="40"
+ set="${ma_tomcat_home}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Tomcat Home!"/>
</field>
- <field type="text" variable="ma.axis_home">
- <spec txt="Axis home directory:" id="ma.axis_home.label" size="40"
set="${ma.axis_home}"/>
+ <field type="text" variable="ma_axis_home">
+ <spec txt="Axis home directory:" id="ma_axis_homelabel" size="40"
+ set="${ma_axis_home}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Axis Home!"/>
</field>
+

<field type="space" />
<field type="staticText" align="center"
- txt="Add this path to CLASSPATH:" id="ma.advise1.label"/>
+ txt="Add this path to CLASSPATH:" id="ma_advise1label"/>
<field type="staticText" align="center"
txt="/AXIS_PATH/WEB-INF/lib/ALL_JAR_FILES"
- id="ma.advise2.label"/>
+ id="ma_advise2label"/>
<field type="space" />
+

- <field type="text" variable="ma.port">
- <spec txt="Enter Tomcat port:" id="ma.port.label" size="40"
set="${ma.port}"/>
+ <field type="text" variable="ma_port">
+ <spec txt="Enter Tomcat port:" id="ma_portlabel" size="40"
+ set="${ma_port}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid port!"/>
</field>

- <field type="text" variable="ma.service_name">
- <spec txt="Enter service name:" id="ma.service_name.label" size="40"
set="${ma.service_name}"/>
+ <field type="text" variable="ma_service_name">
+ <spec txt="Enter service name:" id="ma_service_namelabel" size="40"
+ set="${ma_service_name}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Service Name!"/>
</field>

- <field type="text" variable="ma.rrdjdir">
- <spec txt="Enter rrdj directory:" id="ma.rrdjdir.label" size="40"
+ <field type="text" variable="ma_rrdjdir">
+ <spec txt="Enter rrdtool path:" id="ma_rrdjdirlabel" size="40"
set="$INSTALL_PATH/contrib/rrdjtool"/>
- <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid rrdjdir!"/>
+ <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid rrdjdir path!"/>
</field>
- <field type="text" variable="ma.rrdtool_path">
- <spec txt="Enter rrdtool path:" id="ma.rrdtool_path.label" size="40"
- set="${ma.rrdtool_path}"/>
+
+ <field type="text" variable="ma_rrdtool_path">
+ <spec txt="Enter rrdtool path:" id="ma_rrdtool_pathlabel" size="40"
+ set="${ma_rrdtool_path}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid rrdjtool path!"/>
</field>

-
<field type="space" />
<field type="staticText" align="center"
- txt="Add these two paths to LD_LIBRARY_PATH:"
id="ma.advise3.label"/>
+ txt="Add these two paths to LD_LIBRARY_PATH:"
id="ma_advise3label"/>
<field type="staticText" align="center"
txt="/RRDTOOL_PATH/lib and
/PERFSONAR_PATH/contrib/rrdjtool/build"
- id="ma.advise4.label"/>
+ id="ma_advise4label"/>
<field type="space" />


- <field type="text" variable="ma.r_access_point">
- <spec txt="Measurement Archive Information of service -- access point
(URL):" id="ma.r_access_point.label" size="40"
- set="${ma.r_access_point}"/>
+ <field type="text" variable="ma_r_access_point">
+ <spec txt="Measurement Archive Information of service -- access point
(URL):" id="ma_r_access_pointlabel" size="40"
+
set="http://$HOST_NAME:8080/axis/services/MeasurementArchiveService"/>

<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Access Point!"/>
</field>
- <field type="text" variable="ma.r_service_name">
- <spec txt="Measurement Archive Information of service -- service
name:" id="ma.r_service_name.label" size="40" set="${ma.r_service_name}"/>

+ <field type="text" variable="ma_r_service_name">
+ <spec txt="Measurement Archive Information of service -- service
name:" id="ma_r_service_namelabel" size="40"
+ set="${ma_r_service_name}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Service Name!"/>
</field>
- <field type="text" variable="ma.r_service_type">
- <spec txt="Measurement Archive Information of service -- service
type:" id="ma.r_service_type.label" size="40"
- set="${ma.r_service_type}"/>
+ <field type="text" variable="ma_r_service_type">
+ <spec txt="Measurement Archive Information of service -- service
type:" id="ma_r_service_typelabel" size="40"
+ set="${ma_r_service_type}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Service Type!"/>
</field>
- <field type="text" variable="ma.r_description">
- <spec txt="Measurement Archive Information of service -- service
description:" id="ma.r_description.label" size="40"
- set="${ma.r_description}"/>
+ <field type="text" variable="ma_r_description">
+ <spec txt="Measurement Archive Information of service -- service
description:" id="ma_r_descriptionlabel" size="40"
+ set="${ma_r_description}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Description!"/>
</field>
- <field type="text" variable="ma.r_lookup_service">
- <spec txt="Measurement Archive Service to register Lookup
Information:" id="ma.r_lookup_service.label" size="40"
- set="${ma.r_lookup_service}"/>
+ <field type="text" variable="ma_r_lookup_service">
+ <spec txt="Measurement Archive Service to register Lookup
Information:" id="ma_r_lookup_servicelabel" size="40"
+ set="${ma_r_lookup_service}"/>
</field>

- <field type="text" variable="ma.conf_file">
- <spec txt="MA Conf File:" id="ma.conf_file.label" size="40"
+ <field type="text" variable="ma_conf_file">
+ <spec txt="MA Conf File:" id="ma_conf_filelabel" size="40"
set="$INSTALL_PATH/conf/rrd-database_TEST.xml"/>

<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid conf file!"/>
</field>
-
+
+
+ <!--
=========================================================================================
-->
+
</panel>

+
+
+
<panel order="3">
<field type="staticText" align="center"
- txt="This Panel Asks for Information Specific to the MA"
id="ma.intro2.label"/>
+ txt="This Panel Asks for Information Specific to the MA"
id="ma_intro2label"/>
<field type="space" />

- <field type="text" variable="ma.storage.use">
- <spec txt="Do you want to use eXist for the MA:"
id="ma.storage.use.label" size="40"
- set="${ma.storage.use}"/>
+
+ <!--
=========================================================================================
-->
+ <!-- MA Variables
-->
+ <!--
=========================================================================================
-->
+
+
+ <field type="text" variable="ma_storage.use">
+ <spec txt="Do you want to use eXist for the MA[on/off]:"
id="ma_storage.uselabel" size="40"
+ set="${ma_storage.use}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Answer!"/>
</field>
- <field type="text" variable="ma.storage_uri">
- <spec txt="MA Storage -- XML database collection:"
id="ma.storage_uri.label" size="40" set="${ma.storage_uri}"/>
+ <field type="text" variable="ma_storage_uri">
+ <spec txt="MA Storage -- XML database collection:"
id="ma_storage_urilabel" size="40"
+
set="xmldb:exist://$HOST_NAME:8680/exist/xmlrpc/db/rrdmaconfig"/>

<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Storage URI!"/>
</field>
- <field type="text" variable="ma.storage_username">
- <spec txt="MA Storage -- XML database username:"
id="ma.storage_username.label" size="40" set="${ma.storage_username}"/>

+ <field type="text" variable="ma_storage_username">
+ <spec txt="MA Storage -- XML database username:"
id="ma_storage_usernamelabel" size="40"
+ set="${ma_storage_username}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Storage Username!"/>
</field>
- <field type="text" variable="ma.storage_password">
- <spec txt="MA Storage -- XML database password:"
id="ma.storage_password.label" size="40" set="${ma.storage_password}"/>

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


- <field type="text" variable="ma.allow.store">
- <spec txt="Do you want to allow storage into the MA:"
id="ma.allow.store.label" size="40"
- set="${ma.allow.store}"/>
+ <field type="text" variable="ma_allowstore">
+ <spec txt="Do you want to allow storage into the MA[on/off]:"
id="ma_allowstorelabel" size="40"
+ set="${ma_allowstore}"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Answer!"/>
</field>
- <field type="text" variable="ma.store_dir">
- <spec txt="MA Storage Directory:" id="ma.store_dir.label" size="40"
+
+ <field type="text" variable="ma_store_dir">
+ <spec txt="MA Storage Directory:" id="ma_store_dirlabel" size="40"
set="$INSTALL_PATH/data/rrd/test"/>
<validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid directory!"/>
</field>

+ <field type="text" variable="ma_exist">
+ <spec txt="Do you want the installer to configure eXist[on/off]:"
id="ma_existlabel" size="5"
+ set="${ma_exist}"/>
+ <validator class="com.izforge.izpack.util.NotEmptyValidator"
txt="Invalid Answer!"/>
+ </field>
+
+ <!--
=========================================================================================
-->
+
</panel>

</userInput>


  • r1326 - in branches/release/perfsonar/releng/perfSONAR-1.0: . client conf lib scripts, svnlog, 06/26/2006

Archive powered by MHonArc 2.6.16.

Top of Page