perfsonar development work

Author: zurawski
Date: 2006-06-26 11:57:03 -0400 (Mon, 26 Jun 2006)
New Revision: 1332

Modified:
   branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
   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:
LS/MA configuration panels are now optional.  Since this is also a minor 
change, this will appear in the next release.

-jason



Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-06-26 
14:33:44 UTC (rev 1331)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-06-26 
15:57:03 UTC (rev 1332)
@@ -95,6 +95,23 @@
         <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" />         
+
+        <!-- conditional panels -->
+        <variable name="install_ls" value="no" />       
+        <variable name="install_ma" value="no" />              
+        
+        <variable name="compareToVariable.2" value="install_ls" />           
  
+        <variable name="compareToOperator.2" value="=" />      
+        <variable name="compareToValue.2" value="yes" />
+        
+        <variable name="compareToVariable.3" value="install_ma" />           
  
+        <variable name="compareToOperator.3" value="=" />      
+        <variable name="compareToValue.3" value="yes" />                     
                          
+
+        <variable name="compareToVariable.4" value="install_ma" />           
  
+        <variable name="compareToOperator.4" value="=" />      
+        <variable name="compareToValue.4" value="yes" />
+       
     </variables>   
     
     
@@ -122,11 +139,12 @@
         <panel classname="InfoPanel"/>
         <panel classname="LicencePanel"/>
         <panel classname="TargetPanel"/> 
+        <panel classname="UserInputPanel"/>
         <panel classname="PacksPanel"/>
         <panel classname="UserInputPanel"/> 
-        <panel classname="UserInputPanel"/>            
-        <panel classname="UserInputPanel"/>            
-        <panel classname="UserInputPanel"/> 
+        <panel classname="ConditionalUserInputPanel"/>                 
+        <panel classname="ConditionalUserInputPanel"/>                 
+        <panel classname="ConditionalUserInputPanel"/> 
         <panel classname="InstallPanel"/>
         <panel classname="SimpleFinishPanel"/>
     </panels>
@@ -329,7 +347,7 @@
                                
             <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"/>   
                                  
+            <file src="client/MAStoreRequest.xml" 
targetdir="$INSTALL_PATH/xml"/>                                      
                                
            <!-- handle the log4j file -->
             <parsable targetfile="$INSTALL_PATH/scripts/log.sh" 
type="shell"/>                 

Modified: 
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng     
  2006-06-26 14:33:44 UTC (rev 1331)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_eng     
  2006-06-26 15:57:03 UTC (rev 1332)
@@ -1,4 +1,9 @@
 <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="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" />

Modified: 
branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol     
  2006-06-26 14:33:44 UTC (rev 1331)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputLang.xml_pol     
  2006-06-26 15:57:03 UTC (rev 1332)
@@ -1,4 +1,9 @@
 <langpack>
+
+  <str txt="POLISH: Which components will you be installing?" 
id="install_label"/> 
+  <str txt="POLISH: Are you installing the LS[yes/no]:" id="install_lslabel" 
/>  
+  <str txt="POLISH: Are you installing the MA[yes/no]:" id="install_malabel" 
/>  
+
   <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" />

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml   
2006-06-26 14:33:44 UTC (rev 1331)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/userInputSpec.xml   
2006-06-26 15:57:03 UTC (rev 1332)
@@ -1,6 +1,21 @@
 <userInput>
   <panel order="0">   
     <field type="staticText" align="center" 
+           txt="Which components will you be installing?" 
id="install_label"/> 
+    <field type="space" />     
+    
+    <field type="check" variable="install_ls">
+      <spec txt="Are you installing 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" 
+            set="false"/>
+    </field>        
+  </panel>   
+    
+  <panel order="1">   
+    <field type="staticText" align="center" 
            txt="This Panel Asks for Information Common to the LS and MA" 
id="common_label"/> 
     <field type="space" />         
             
@@ -45,7 +60,7 @@
    
    
     
-  <panel order="1">  
+  <panel order="2">  
     <field type="staticText" align="center" 
            txt="This Panel Asks for Information Specific to the LS" 
id="ls_introlabel"/>  
     <field type="space" />
@@ -154,7 +169,7 @@
   
   
   
-  <panel order="2">  
+  <panel order="3">  
     <field type="staticText" align="center" 
            txt="This Panel Asks for Information Specific to the MA" 
id="ma_introlabel"/>   
     <field type="space" />
@@ -258,7 +273,7 @@
   
   
   
-  <panel order="3">  
+  <panel order="4">  
     <field type="staticText" align="center" 
            txt="This Panel Asks for Information Specific to the MA" 
id="ma_intro2label"/>   
     <field type="space" />