perfsonar development work

Author: mac
Date: 2006-09-06 06:39:55 -0400 (Wed, 06 Sep 2006)
New Revision: 1604

Modified:
   trunk/perfsonar/conf/template/components.properties.ls-template
   trunk/perfsonar/conf/template/service.properties.ls-template
Log:
Changes for LS Cleanup

Modified: trunk/perfsonar/conf/template/components.properties.ls-template
===================================================================
--- trunk/perfsonar/conf/template/components.properties.ls-template     
2006-09-06 10:39:00 UTC (rev 1603)
+++ trunk/perfsonar/conf/template/components.properties.ls-template     
2006-09-06 10:39:55 UTC (rev 1604)
@@ -10,6 +10,7 @@
 
logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 # ---------------- Service specific components -------------------
-# simple scheduler
-#ls_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
-#ls_cleanup_loader=org.perfsonar.service.lookupService.xmlType.LSCleanupLoader
+
+# LS Cleanup (loads by LSCleanupLoader, needs scheduler)
+%CLEANUP%ls_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+%CLEANUP%ls_cleanup_loader=org.perfsonar.service.lookupService.xmlType.LSCleanupLoader

Modified: trunk/perfsonar/conf/template/service.properties.ls-template
===================================================================
--- trunk/perfsonar/conf/template/service.properties.ls-template        
2006-09-06 10:39:00 UTC (rev 1603)
+++ trunk/perfsonar/conf/template/service.properties.ls-template        
2006-09-06 10:39:55 UTC (rev 1604)
@@ -1,16 +1,17 @@
 
###############################################################################
 ##
-##  Service configuration file
+##  Service configuration file 
+##  for Lookup Service
 ##
+##  
---------------------------------------------------------------------------
+##  Generated from template written by Maciej Glowiak
+##  
---------------------------------------------------------------------------
+##
 ##  $Id$ $
 ##  Project: perfSONAR
 ##
 
###############################################################################
 
-## name of parameter which starts with "service.r." indicates that 
-## this parameter belongs to the lookup service information set
-
-
 ## --- general service properties  
--------------------------------------------------------
 
 service.name=%SERVICE_NAME%
@@ -22,6 +23,8 @@
 service.sax_parser.config=%SAX_PARSER_CONFIG%
 
 # --- registration 
------------------------------------------------------------------------
+#      name of parameter which starts with "service.r." indicates that 
+#       this parameter belongs to the Lookup Information
 
 service.r.type=ls
 service.r.access_point=%R_ACCESS_POINT%
@@ -29,9 +32,13 @@
 service.r.service_type=%R_SERVICE_TYPE%
 service.r.service_description=%R_DESCRIPTION%
 
-service.r.ls_url=%R_LOOKUP_SERVICE%
+# Lookup Service to register to - only for Registration to LS
+#service.r.ls_url=%R_LOOKUP_SERVICE%
 
+# --- cleanup 
-----------------------------------------------------------------------------
 
+service.ls.ttl=%CLEANUP_TTL%
+
 # --- Lookup Service properties 
--------------------------------------------------------
 
 # Database username and password for ls_storage
@@ -46,11 +53,12 @@
 component.ls_cleanup_loader.scheduler_component=ls_scheduler
 component.ls_cleanup_loader.storage_component=ls_storage
 
-#Registrator loader
-component.registrator.interval=%REGISTER_INTERVAL%
-component.registrator.scheduler_component=ls_scheduler
+#Registrator loader - enable this secion if registration to another LS 
should be enabled
+#component.registrator.interval=%REGISTER_INTERVAL%
+#component.registrator.scheduler_component=ls_scheduler
 
-#updates
+#Updates
+#Allow re-registration (simple update)
 service.ls.allow_replace=yes
 
 # --- Service properties 
---------------------------------------------------------------