perfsonar development work

Author: mac
Date: 2006-09-06 06:40:53 -0400 (Wed, 06 Sep 2006)
New Revision: 1605

Modified:
   trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml
Log:
Changes for LSCleanup - additional configuration options

Modified: trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml       2006-09-06 
10:39:55 UTC (rev 1604)
+++ trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml       2006-09-06 
10:40:53 UTC (rev 1605)
@@ -14,14 +14,21 @@
 
 <project name="xmlls-configure-targets">
 
+
+
     <!-- DEFINES -->
 
      <target name="xmlls-config-define">
 
        <!-- temp -->
-        <property name="base_path" 
-                 value="/temp"/>
+        <!-- property name="base_path" 
+                 value="/temp"/ -->
 
+        <exec executable="pwd"
+             dir="."
+             outputproperty="base_path" />
+
+
        <!-- services.properties -->
 
         <property name="default_hostname" 
@@ -41,12 +48,12 @@
         <property name="default_in.ls_storage_password" 
                  value="sonar"/>
         <property name="default_in.cleanup_interval" 
-                 value="180000"/>
-        <property name="default_in.register_interval" 
-                 value="600000"/>                
+                 value="300" /><!-- seconds -->
+        <property name="default_in.cleanup_ttl" 
+                 value="3600" /><!-- seconds -->
+                 
         <property name="default_in.axis_home" 
                  value="/usr/local/tomcat/webapps/axis"/>                
-                 
     </target>
  
  
@@ -64,6 +71,10 @@
 
        <delete file="${template_file_components}"/>      
        <copy 
file="${in.service_basepath}/conf/template/components.properties.ls-template" 
tofile="${template_file_components}" />
+
+        <replace file="${template_file_components}" 
+                token="%CLEANUP%" 
+                value="${cleanup_string}"/>
        
     </target>
  
@@ -81,6 +92,8 @@
        <delete file="${template_file_service}"/>         
         <copy 
file="${in.service_basepath}/conf/template/service.properties.ls-template" 
tofile="${template_file_service}" />
 
+        <!-- General information -->
+
         <replace file="${template_file_service}" 
                 token="%SERVICE_NAME%" 
                 value="${in.service_name}"/>
@@ -93,6 +106,9 @@
         <replace file="${template_file_service}" 
                 token="%SAX_PARSER_CONFIG%" 
                 value="${in.sax_parser_config}"/>
+                
+       <!-- Lookup Information -->
+                
         <replace file="${template_file_service}" 
                 token="%R_ACCESS_POINT%" 
                 value="${in.r_access_point}"/>
@@ -109,28 +125,29 @@
                 token="%R_LOOKUP_SERVICE%"      
                 value="${in.r_lookup_service}"/>
 
+        <!-- LS Storage -->
+
         <replace file="${template_file_service}" 
                 token="%LS_STORAGE_TYPE%" 
                 value="${in.ls_storage_type}"/>
-
         <replace file="${template_file_service}" 
                 token="%LS_STORAGE_URI%" 
-                value="${in.ls_storage_uri}"/>
-                
-                
-                
+                value="${in.ls_storage_uri}"/>                               
   
         <replace file="${template_file_service}" 
                 token="%LS_STORAGE_USERNAME%" 
                 value="${in.ls_storage_username}"/>
         <replace file="${template_file_service}" 
                 token="%LS_STORAGE_PASSWORD%" 
                 value="${in.ls_storage_password}"/>
+
+        <!-- LS Cleanup -->
+
         <replace file="${template_file_service}" 
                 token="%CLEANUP_INTERVAL%" 
                 value="${in.cleanup_interval}"/>
         <replace file="${template_file_service}" 
-                token="%REGISTER_INTERVAL%" 
-                value="${in.register_interval}"/>
+                token="%CLEANUP_TTL%" 
+                value="${in.cleanup_ttl}"/>
        
     </target>
  
@@ -233,7 +250,7 @@
               addproperty="in.r_description" 
               defaultvalue="${default_in.r_description}" />
               
-        <input message="Lookup Service to register Lookup Information 
[http://${hostname}:8080/axis/services/LookupService]";
+        <input message="Lookup Service to register Lookup Information 
[http://${hostname}:8080/axis/services/LookupService] - this functionality 
will be disabled. To enable it uncomment the proper section in 
service.properties file."
               addproperty="in.r_lookup_service" 
               
defaultvalue="http://${hostname}:8080/axis/services/LookupService"; />
               
@@ -265,14 +282,27 @@
               addproperty="in.ls_storage_password" 
               defaultvalue="${default_in.ls_storage_password}" />
               
-        <input message="LS Cleanup -- cleanup interval 
[${default_in.cleanup_interval}] (milliseconds)"
+       <input message="LS Cleanup -- enable LS Cleanup (removing old entries 
when TTL exceeded)?"
+              addproperty="in.cleanup"
+              defaultvalue="n"
+              validargs="y,n"/>       
+              
+       <condition property="cleanup_string" value="">
+            <equals arg1="y" arg2="${in.cleanup}"/>
+        </condition>
+                      
+       <condition property="cleanup_string" value="#">
+            <equals arg1="n" arg2="${in.cleanup}"/>
+        </condition>
+              
+        <input message="LS Cleanup -- cleanup interval: how often to search 
old entries in DB [${default_in.cleanup_interval}] (seconds)"
               addproperty="in.cleanup_interval" 
               defaultvalue="${default_in.cleanup_interval}" />
-              
-        <input message="Register with LS interval 
[${default_in.register_interval}] (milliseconds)"
-              addproperty="in.register_interval" 
-              defaultvalue="${default_in.register_interval}"/>
 
+        <input message="LS Cleanup -- TTL of lookup informationB 
[${default_in.cleanup_ttl}] (seconds)"
+              addproperty="in.cleanup_ttl" 
+              defaultvalue="${default_in.cleanup_ttl}" />
+
         <input message="Axis home directory (inside tomcat) 
[${default_in.axis_home}]"
               addproperty="in.axis_home" 
               defaultvalue="${default_in.axis_home}"/>
@@ -304,8 +334,8 @@
         <echo message="XML database collection [${in.ls_storage_uri}]" />    
         
         <echo message="XML database username [${in.ls_storage_username}]" /> 
         
         <echo message="XML database password [${in.ls_storage_password}]" />
-        <echo message="Cleanup interval [${in.cleanup_interval}] ms" />
-        <echo message="LS Registration interval [${in.register_interval}] 
ms" />
+        <echo message="Cleanup interval [${in.cleanup_interval}] seconds" />
+        <echo message="Cleanup TTL [${in.cleanup_ttl}] seconds" />
         <echo message="Axis home dir [${in.axis_home}]" />
 
         <echo message="" />