perfsonar development work

Author: zurawski
Date: 2006-08-09 16:23:59 -0400 (Wed, 09 Aug 2006)
New Revision: 1528

Added:
   branches/release/perfsonar/releng/perfSONAR-1.0/scripts/cleanup.sh
Modified:
   branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES
   branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
   branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
   branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
   branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
   branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
Log:
* Partial fixes for bug #47 and #48 (requires additional testing, POC works)
* Re-configuration of install scripts to allow eXist questions to be 
eliminated in MA installation.  
* Adding the cleanup script which mysteriously disappeared between RC3 and 
1.0.

-jason 



Modified: branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES     2006-08-09 
19:01:50 UTC (rev 1527)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/CHANGES     2006-08-09 
20:23:59 UTC (rev 1528)
@@ -1,3 +1,16 @@
+Changes From perfSONAR-1.0
+--------------------------
+
+* Readme has been updated to reflect new requirements
+
+Installer
+-------------------
+
+* eXist installation script has been corrected for reported errors
+
+
+
+
 Changes From perfSONAR-1.0 RC3
 ------------------------------
 

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.pl  2006-08-09 
19:01:50 UTC (rev 1527)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.pl  2006-08-09 
20:23:59 UTC (rev 1528)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
                        # pS version
-$version = "1.0";
+$version = "1.1";
        
 my %var = ();
 my %var1 = ();
@@ -36,8 +36,9 @@
 $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.log_size"} = &ask("Enter the max file size of the log files 
(indicate KB or MB):", "500KB");
-$var{"common.log_backup_size"} = &ask("Enter the number of backup logs to 
keep:", "10"); 
-$var{"common.exist_home"} = &ask("eXist home directory:", &locate("echo 
\$EXIST_HOME", "/usr/local/eXist")); 
+$var{"common.log_backup_size"} = &ask("Enter the number of backup logs to 
keep:", "10");  
+$var{"common.exist_home"} = "/usr/local/eXist";
+$var{"common.exist_admin_password"} = "";
 
                        # Make these default values (user can twiddle 
                        #  if they are not happy)
@@ -45,9 +46,7 @@
 $var{"common.log4j_properties"} = 
$var{"common.basepath"}."/conf/log4j.properties";
 $var{"common.logs_dir"} = $var{"common.basepath"}."/log";
 $var{"common.sax_parser_config"} = 
$var{"common.basepath"}."/src/objects.config";
-$var{"common.exist_admin_password"} = "";
 
-
                        # RRD MA installation section
 
 $maFlag = 0;
@@ -157,6 +156,9 @@
                   
   $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"));
+    $var{"common.exist_admin_password"} = "";
+
     $var2{"ma.storage_uri"} = &ask("XML database collection:", 
"xmldb:exist://localhost:8680/exist/xmlrpc/db/rrdmaconfig");
     $var2{"ma.storage_username"} = &ask("XML database username:", 
"rrdmaservice");
     $var2{"ma.storage_password"} = &ask("XML database password:", 
"rrdmaservice");
@@ -165,17 +167,19 @@
     $ma_exist_store = &ask("\n\nDo you want the allow the MA to store 
data?", "y/n");
     if ($ma_exist_store eq "y" || $ma_exist_store eq "Y") {
       $var2{"ma.allow.store"} = "on";
+      $var2{"ma.allow.store2"} = "yes";
       $var2{"ma.store_dir"} = &ask("RRD Storage Directory:", 
$var{"common.basepath"}."/data/rrd/test"); 
     }
     else {
       $var2{"ma.allow.store"} = "off";
+      $var2{"ma.allow.store2"} = "no";
       $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") {
     
-      $var{"common.exist_admin_password"} = &ask("eXist admin password", 
"");   
+      $var{"common.exist_admin_password"} = &ask("eXist admin password 
(leave blank if none)", "");   
          
       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";
@@ -183,9 +187,10 @@
       $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 . $var{"common.exist_admin_password"} . "\" \"" . 
$var2{"ma.allow.store"} . "\"";
+      $ARG = $ARG . $var{"common.exist_admin_password"} . "\" 
\"rrdmaconfig\" \"";
+      $ARG = $ARG . $var2{"ma.allow.store2"} . "\"";
       
-      system("./scripts/load-exist.sh " . $ARG);     
+      system("./scripts/load-exist.sh " . $ARG);       
     }
     else {
       print "\nDon't forget to configure the eXist database for the RRD 
MA.\n\n";
@@ -360,10 +365,12 @@
   $var1{"ls.conf_file"} = $var{"common.basepath"}."/conf/LSStore.xml";
   $var1{"ls.control_conf_file"} = 
$var{"common.basepath"}."/conf/LSStore-control.xml";
 
+  $var{"common.exist_home"} = &ask("eXist home directory:", &locate("echo 
\$EXIST_HOME", "/usr/local/eXist"));
+  $var{"common.exist_admin_password"} = "";
 
   $exist_install = &ask("\n\nDo you want the installer to configure eXist 
for you?", "y/n");
   if ($exist_install eq "y" || $exist_install eq "Y") {
-    $var{"common.exist_admin_password"} = &ask("eXist admin password", "");  
    
+    $var{"common.exist_admin_password"} = &ask("eXist admin password (leave 
blank if none)", "");      
     
     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";
@@ -371,7 +378,9 @@
     $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"} . "\" \"" . 
$var{"common.exist_admin_password"} . "\" \"on\"";                    
+    $ARG = $ARG . $var{"common.basepath"} . "\" \"" . 
$var{"common.exist_admin_password"} . "\" \"";
+    $ARG = $ARG . "ls" . "\" \"yes\"";         
+    
     system("./scripts/load-exist.sh " . $ARG);  
   }
     

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-08-09 
19:01:50 UTC (rev 1527)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-08-09 
20:23:59 UTC (rev 1528)
@@ -4,7 +4,7 @@
 
     <info>
         <appname>perfSONAR</appname>
-        <appversion>1.0</appversion>
+        <appversion>1.1</appversion>
 <!--   
         <authors>
             <author name="Some Author" 
email=""/>
@@ -49,9 +49,10 @@
 <!-- Common -->    
         <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_log_size" value="500KB" />      
         <variable name="common_log_backup_size" value="10" />  
+       
+        <variable name="common_exist_home" value="/usr/local/eXist" /> 
         <variable name="common_exist_admin_password" value="" />       
                
 <!-- LS specific -->
@@ -70,7 +71,7 @@
         <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" />        
+        <variable name="ls_exist" value="yes" />       
                
 <!-- MA specific -->                                   
        <variable name="ma_r_type" value="ma" />                
@@ -88,15 +89,17 @@
         <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" />         
 
+
+        <variable name="ma_store_dir" 
value="/usr/local/perfSONAR-1.0/data/rrd/test" /> 
+
         <!-- conditional panels -->
         <variable name="install_ls" value="no" />       
         <variable name="install_ma" value="no" />              
-        
+        <variable name="install_ma_exist" value="no" />
+        <variable name="install_ma_exist_storage" value="off" />
+        <variable name="install_ma_exist_configure" value="no" />
+                
         <variable name="compareToVariable.2" value="install_ls" />           
  
         <variable name="compareToOperator.2" value="=" />      
         <variable name="compareToValue.2" value="yes" />
@@ -105,9 +108,17 @@
         <variable name="compareToOperator.3" value="=" />      
         <variable name="compareToValue.3" value="yes" />                     
                          
 
-        <variable name="compareToVariable.4" value="install_ma" />           
  
+        <variable name="compareToVariable.4" value="install_ma_exist" />     
          
         <variable name="compareToOperator.4" value="=" />      
         <variable name="compareToValue.4" value="yes" />
+
+        <variable name="compareToVariable.5" 
value="install_ma_exist_storage" />               
+        <variable name="compareToOperator.5" value="=" />      
+        <variable name="compareToValue.5" value="on" />
+
+        <variable name="compareToVariable.6" 
value="install_ma_exist_configure" />             
+        <variable name="compareToOperator.6" value="=" />      
+        <variable name="compareToValue.6" value="yes" />
        
     </variables>   
     
@@ -144,6 +155,8 @@
         <panel classname="ConditionalUserInputPanel"/>                 
         <panel classname="ConditionalUserInputPanel"/>                 
         <panel classname="ConditionalUserInputPanel"/> 
+        <panel classname="ConditionalUserInputPanel"/> 
+        <panel classname="ConditionalUserInputPanel"/> 
         <panel classname="InstallPanel"/>
         <panel classname="SimpleFinishPanel"/>
     </panels>
@@ -241,6 +254,7 @@
                <arg value="$INSTALL_PATH/conf/LSStore-control.xml" />        
                  
                <arg value="$INSTALL_PATH" />
                <arg value="${common_exist_admin_password}" />          
+               <arg value="ls" />                      
                <arg value="${ls_exist}" />                                   
                          
               </args>                          
            </executable>               
@@ -440,7 +454,8 @@
                <arg value="no" />                      
                <arg value="$INSTALL_PATH" />
                <arg value="${common_exist_admin_password}" />                
  
-               <arg value="${ma_exist}" />                                   
                                                  
+               <arg value="rrdmaconfig" />     
+               <arg value="${install_ma_exist_configure}" />                 
                                                                  
               </args>                          
            </executable>                       
                        
@@ -475,8 +490,8 @@
                <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="${install_ma_exist}" />     
+               <arg value="${install_ma_exist_storage}" />     
                <arg value="${ma_store_dir}" />                               
                                                  
              </args>
            </executable>

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


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

Modified: 
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh     
  2006-08-09 19:01:50 UTC (rev 1527)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/load-exist.sh     
  2006-08-09 20:23:59 UTC (rev 1528)
@@ -1,7 +1,80 @@
 #!/bin/sh
 
-if [ "${9}" = "on" ];
+# ####################################################################### #
+# Argument List:                                                          #
+#                                                                         #
+#   ${1} = Storage uri: xmldb:exist://$HOST:$PORT/exist/xmlrpc/db/$DBNAME #
+#   ${2} = Storage username                                               #
+#   ${3} = Storage password                                               #
+#   ${4} = $EXIST_HOME                                                    #
+#   ${5} = Path to upload file                                            #
+#   ${6} = Second Path to upload file (or 'no' for none)                 #
+#   ${7} = $PERFSONAR_HOME                                                #
+#   ${8} = eXist admin password (or blank for none)                      #
+#   ${9} = service name                                                   #
+#   ${10}= 'yes' if we are to run the script (really just a hack for the  #
+#          GUI installer)                                                 #
+#                                                                         #
+# ####################################################################### #
 
+if [ "${10}" = "yes" ];
+
 then
-  echo ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} | perl -ne '@array=split(/ 
/,$_);foreach $a (@array){$a =~ 
s/\n//;}@exist
 = split(/xmldb:exist:\/\/\w+:\d+\/exist\/xmlrpc/, $array[0]);@exist2 = 
split(/\//, $exist[1]);$pre = $exist[1];$pre =~ s/\/$exist2[$exist2-1]//;$db 
= $array[0];$db =~ s/$exist[1]//;if($array[7]) 
{system($array[3]."/bin/backup.sh -ouri=".$db." -u admin -p ".$array[7]." -d 
".$array[6]."/conf/old-".$exist2[$exist2-1]." -b 
".$pre."/".$exist2[$exist2-1]." &> 
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");}else 
{system($array[3]."/bin/backup.sh -ouri=".$db." -u admin -d 
".$array[6]."/conf/old-".$exist2[$exist2-1]." -b 
".$pre."/".$exist2[$exist2-1]." &> 
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");}open(RESTORE, 
">".$array[6]."/scripts/restore-".$exist2[$exist2-1].".sh");if($array[7]) 
{print RESTORE "#!/bin/sh\n\n";print RESTORE $array[3]."/bin/backup.sh 
-ouri=".$db." -u admin -p ".$array[7]." -r 
".$array[6]."/conf/old-".$exist2[$exist2-1]."
 /db/__contents__.xml\n";}else {print RESTORE "#!/bin/sh\n\n";print RESTORE 
$array[3]."/bin/backup.sh -ouri=".$db." -u admin -r 
".$array[6]."/conf/old-".$exist2[$exist2-1]."/db/__contents__.xml\n";}close(RESTORE);system("chmod
 755 
".$array[6]."/scripts/restore-".$exist2[$exist2-1].".sh");system($array[3]."/bin/client.sh
 -l -ouri=".$db." -u ".$array[1]." -P ".$array[2]." -c ".$pre." -R 
".$exist2[$exist2-1]." &> 
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");system($array[3]."/bin/client.sh
 -l -ouri=".$db." -u ".$array[1]." -P ".$array[2]." -m ".$exist[1]." -p 
".$array[4]." &> 
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");if($array[5] ne 
"no"){system($array[3]."/bin/client.sh -l -ouri=".$db." -u ".$array[1]." -P 
".$array[2]." -m ".$exist[1]." -p ".$array[5]." &> 
".$array[6]."/log/exist.".$exist2[$exist2-1].".install");}'
+  echo "${1}" "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" | perl 
-ne '
+    @array=split(/ /,$_);
+    foreach $a (@array){
+      $a =~ s/\n//;
+    }    
+    if(!($array[0]) || !($array[1]) || !($array[2]) || !($array[3]) || 
+       !($array[4]) || !($array[6]) || !($array[8])) {
+      open(ERROR, ">./log/exist.install.log");
+      print ERROR "Incomplete Information to eXist installer script\n";      
+      close(ERROR);
+      exit(1);
+    }    
+    @exist = split(/xmldb:exist:\/\/\w+:\d+\/exist\/xmlrpc/, $array[0]);
+    if($exist[1]) {
+      @exist2 = split(/\//, $exist[1]);
+      if(!($exist2[$exist2-1])) {
+        $exist2[$exist2-1] = $array[8];
+      }     
+      $db = $array[0];
+      $db =~ s/$exist[1]//;
+    }
+    else {
+      open(ERROR, ">".$array[6]."/log/exist.".$array[8].".install");
+      print ERROR "Database URL is malformed: " , $array[0] , "\n";        
+      close(ERROR);
+      exit(1);
+    }
+    $pre = $exist[1];
+    $pre =~ s/\/$exist2[$exist2-1]//;    
+    if(!($pre)) {
+      open(ERROR, ">".$array[6]."/log/exist.".$array[8].".install");
+      print ERROR "Database URL is malformed: " , $array[0] , "\n";        
+      close(ERROR);
+      exit(1);
+    }        
+    if($array[7]) {
+      system($array[3]."/bin/backup.sh -ouri=".$db." -u admin -p 
".$array[7]." -d ".$array[6]."/conf/old-".$array[8]." -b 
".$pre."/".$exist2[$exist2-1]." >> 
".$array[6]."/log/exist.".$array[8].".install 2>&1");
+    }
+    else {
+      system($array[3]."/bin/backup.sh -ouri=".$db." -u admin -d 
".$array[6]."/conf/old-".$array[8]." -b ".$pre."/".$exist2[$exist2-1]." >> 
".$array[6]."/log/exist.".$array[8].".install 2>&1");
+    }        
+    open(RESTORE, ">".$array[6]."/scripts/restore-".$array[8].".sh");        
+    if($array[7]) {
+      print RESTORE "#!/bin/sh\n\n";
+      print RESTORE $array[3]."/bin/backup.sh -ouri=".$db." -u admin -p 
".$array[7]." -r ".$array[6]."/conf/old-".$array[8]."/db/__contents__.xml\n";
+    }
+    else {
+      print RESTORE "#!/bin/sh\n\n";
+      print RESTORE $array[3]."/bin/backup.sh -ouri=".$db." -u admin -r 
".$array[6]."/conf/old-".$array[8]."/db/__contents__.xml\n";
+    }
+    close(RESTORE);
+    system("chmod 755 ".$array[6]."/scripts/restore-".$array[8].".sh");
+    system($array[3]."/bin/client.sh -l -ouri=".$db." -u ".$array[1]." -P 
".$array[2]." -c ".$pre." -R ".$exist2[$exist2-1]." >> 
".$array[6]."/log/exist.".$array[8].".install 2>&1");
+    system($array[3]."/bin/client.sh -l -ouri=".$db." -u ".$array[1]." -P 
".$array[2]." -m ".$exist[1]." -p ".$array[4]." >> 
".$array[6]."/log/exist.".$array[8].".install 2>&1");  
+    if($array[5] ne "no"){
+      system($array[3]."/bin/client.sh -l -ouri=".$db." -u ".$array[1]." -P 
".$array[2]." -m ".$exist[1]." -p ".$array[5]." >> 
".$array[6]."/log/exist.".$array[8].".install 2>&1");
+    }'
 fi

Modified: 
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng     
  2006-08-09 19:01:50 UTC (rev 1527)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng     
  2006-08-09 20:23:59 UTC (rev 1528)
@@ -1,8 +1,8 @@
 <langpack>
 
   <str txt="Which components will you be installing?" id="install_label"/> 
-  <str txt="Are you installing the LS[yes/no]:" id="install_lslabel" />  
-  <str txt="Are you installing the MA[yes/no]:" id="install_malabel" />  
+  <str txt="Install the LS" id="install_lslabel" />  
+  <str txt="Install the MA" id="install_malabel" />  
 
   <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" 
/>
@@ -32,7 +32,7 @@
   <str txt="/AXIS_PATH/WEB-INF/lib/ALL_JAR_FILES" 
           id="ls_advise2label"/>
   <str txt="Do you want the installer to configure eXist[on/off]:" 
id="ls_existlabel"/>           
-  <str txt="XML database password:" id="common_exist_admin_passwordlabel" />
+  <str txt="XML database password (leave blank if none):" 
id="common_exist_admin_passwordlabel" />
                   
   <str txt="This Panel Asks for Information Specific to the MA" 
id="ma_introlabel"/> 
   <str txt="Tomcat home directory:" id="ma_tomcat_homelabel" />   
@@ -53,18 +53,18 @@
   <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_advise4label"/>
+  <str txt="Use eXist for the MA" id="install_ma_existlabel" />
           
           
-          
   <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="Allow storage into the MA" id="install_ma_exist_storagelabel" /> 
  
   <str txt="MA Storage Directory:" id="ma_store_dirlabel" />                 
 
-  <str txt="Do you want the installer to configure eXist[on/off]:" 
id="ma_existlabel"/>           
-  <str txt="XML database password:" id="common_exist_admin_passwordlabel" />
+  <str txt="Allow the installer to configure eXist" 
id="install_ma_exist_configurelabel" />
+  <str txt="XML database password (leave blank if none):" 
id="common_exist_admin_passwordlabel" />
           
 </langpack>
 

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml   
2006-08-09 19:01:50 UTC (rev 1527)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml   
2006-08-09 20:23:59 UTC (rev 1528)
@@ -5,11 +5,11 @@
     <field type="space" />     
     
     <field type="check" variable="install_ls">
-      <spec txt="Are you installing the LS" id="install_lslabel" true="yes" 
false="no" 
+      <spec txt="Install the LS" id="install_lslabel" true="yes" false="no" 
             set="false"/>
     </field>    
     <field type="check" variable="install_ma">
-      <spec txt="Are you installing the MA" id="install_malabel" true="yes" 
false="no" 
+      <spec txt="Install the MA" id="install_malabel" true="yes" false="no" 
             set="false"/>
     </field>        
   </panel>   
@@ -49,12 +49,7 @@
       <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>
@@ -132,6 +127,12 @@
       <validator class="com.izforge.izpack.util.NotEmptyValidator" 
txt="Invalid Service Name!"/>
     </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> 
+
     <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"/>         
 
@@ -166,7 +167,7 @@
     </field>     
 
     <field type="text" variable="common_exist_admin_password">
-      <spec txt="XML database password:" 
id="common_exist_admin_passwordlabel" size="40" 
+      <spec txt="XML database password (leave blank if none):" 
id="common_exist_admin_passwordlabel" size="40" 
             set="${common_exist_admin_password}"/>            
       <validator class="com.izforge.izpack.util.NotEmptyValidator" 
txt="Invalid Password!"/>
     </field>   
@@ -274,6 +275,11 @@
     </field>      
              
 
+    <field type="check" variable="install_ma_exist">
+      <spec txt="Use eXist for the MA" id="install_ma_existlabel" true="yes" 
false="no" 
+            set="false"/>
+    </field>        
+
     <!-- 
=========================================================================================
 --> 
 
   </panel>
@@ -282,21 +288,12 @@
   
   
   <panel order="4">  
-    <field type="staticText" align="center" 
-           txt="This Panel Asks for Information Specific to the MA" 
id="ma_intro2label"/>   
-    <field type="space" />
 
-
-    <!-- 
=========================================================================================
 -->     
-    <!--                                        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="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>     
     <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"/>             
    
@@ -312,33 +309,41 @@
             set="${ma_storage_password}"/>            
       <validator class="com.izforge.izpack.util.NotEmptyValidator" 
txt="Invalid Storage Password!"/>
     </field>    
-                                                                             
  
-    <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="check" variable="install_ma_exist_storage">
+      <spec txt="Allow storage into the MA" 
id="install_ma_exist_storagelabel" true="on" false="off" 
+            set="false"/>
+    </field>    
+    
+  </panel>  
+
+
+
+  <panel order="5">                                                          
                  
+
     <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>        
+    <field type="check" variable="install_ma_exist_configure">
+      <spec txt="Allow the installer to configure eXist" 
id="install_ma_exist_configurelabel" true="yes" false="no" 
+            set="false"/>
+    </field>   
     
-    <field type="text" variable="common_exist_admin_password">
-      <spec txt="XML database password:" 
id="common_exist_admin_passwordlabel" size="40" 
+  </panel>  
+
+
+
+  <panel order="6">                                                  
+    
+    <field type="text" variable="common_exist_admin_password" >
+      <spec txt="XML database password (leave blank if none):" 
id="common_exist_admin_passwordlabel" size="40" 
             set="${common_exist_admin_password}"/>            
       <validator class="com.izforge.izpack.util.NotEmptyValidator" 
txt="Invalid Password!"/>
     </field>        
-    
-    <!-- 
=========================================================================================
 -->     
-    
+
   </panel>  
 
 </userInput>