perfsonar development work

Author: mac
Date: 2008-04-04 05:47:45 -0400 (Fri, 04 Apr 2008)
New Revision: 3610

Modified:
   trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties
Log:
new groupings and comments (done by Gina)


Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties        
2008-04-04 09:42:42 UTC (rev 3609)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties        
2008-04-04 09:47:45 UTC (rev 3610)
@@ -3,21 +3,22 @@
 
 # --------------- Common components -----------------------------
 
-# Group=Configuration
-# Description=Configuration component - must be declared as the first one in 
this configuration!
+# Group=PropertiesConfiguration
+# Description=The configuration component (this component must be loaded 
first).
 
config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
 # Group=Logging
-# Description=Logger component - must be decalred as the second one in this 
configuration!
+# Description=The logger component (this component must be loaded second).
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 # ---------------- Service specific components -------------------
 
 # Group=Scheduler
-# Description=Lookup service scheduler, needed for other functionalities 
such as LS Cleanup, dLS
+# Description=The Lookup service scheduler, needed for other functionalities 
such as LS Cleanup and dLS.
 
ls_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
 # Group=Scheduler
-# Description=LS Cleanup component (loads by LSCleanupLoader, needs 
scheduler)
+# Description=LS Cleanup component (loaded by LSCleanupLoader, needs 
scheduler).
 ls_cleanup_loader=org.perfsonar.service.lookupService.xmlType.LSCleanupLoader
 
+

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties     2008-04-04 
09:42:42 UTC (rev 3609)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties     2008-04-04 
09:47:45 UTC (rev 3610)
@@ -15,27 +15,26 @@
 ##
 
 # Group=Log levels
-# Description=Assignment of debug log messages to a certain log appender
+# Description=Assigns debug log messages to the specified log appender.
 #log4j.logger.sonar-debug=DEBUG, psRootAppender
 
 # Group=Log levels
-# Description=Assignment of info log messages to a certain log appender
+# Description=Assigns info log messages to the specified log appender.
 log4j.logger.sonar-info=INFO, psRootAppender
 
 # Group=Log levels
-# Description=Assignment of warn log messages to a certain log appender
+# Description=Assigns warn log messages to the specified log appender.
 log4j.logger.sonar-warn=WARN, psRootAppender
 
 # Group=Log levels
-# Description=Assignment of error log messages to a certain log appender
+# Description=Assigns error log messages to the specified log appender.
 log4j.logger.sonar-error=ERROR, psRootAppender
 
 # Group=Log levels
-# Description=Assignment of fatal log messages to a certain log appender
+# Description=Assigns fatal log messages to the specified log appender.
 log4j.logger.sonar-fatal=FATAL, psRootAppender
 
 
-
 ##
 ## Uncomment this block (and comment the one above)
 ## if you want to have log levels in separate log files
@@ -53,138 +52,166 @@
 
 ######################################### DEBUG 
#######################################
 
-# Group=Debug log messages
-# Description=The maximum number of backup files
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=Debug log messages
-# Description=Log file name with a path
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
 
log4j.appender.debugAppender.File=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar_debug.log
-# Group=Debug log messages
-# Description=The class responsible for logging layout
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=Debug log messages
-# Description=Log message format
+
+# Group=Debug message logging
+# Description=The log message format.
 log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Debug log messages
-# Description=The maximum size of log flie
+
+# Group=Debug message logging
+# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
 log4j.appender.debugAppender.MaxFileSize=500KB
-# Group=Debug log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Debug message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
 
 
-
 ######################################### INFO 
########################################
 
-# Group=Info log messages
-# Description=The maximum number of backup files
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=Info log messages
-# Description=Log file name with a path
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
 
log4j.appender.infoAppender.File=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar_info.log
-# Group=Info log messages
-# Description=The class responsible for logging layout
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=Info log messages
-# Description=Log message format
+
+# Group=Info message logging
+# Description=The log message format.
 log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Info log messages
-# Description=The maximum size of log flie
+
+# Group=Info message logging
+# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
 log4j.appender.infoAppender.MaxFileSize=500KB
-# Group=Info log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Info message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
+       
 
 
-
 ######################################### WARN 
########################################
 
-# Group=Warn log messages
-# Description=The maximum number of backup files
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=Warn log messages
-# Description=Log file name with a path
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
 
log4j.appender.warnAppender.File=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar_warn.log
-# Group=Warn log messages
-# Description=The class responsible for logging layout
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=Warn log messages
-# Description=Log message format
+
+# Group=Warn message logging
+# Description=The log message format.
 log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Warn log messages
-# Description=The maximum size of log flie
+
+# Group=Warn message logging
+# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
 log4j.appender.warnAppender.MaxFileSize=500KB
-# Group=Warn log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages the log file.
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
 
-
 ######################################### ERROR 
#######################################
 
-# Group=Error log messages
-# Description=The maximum number of backup files
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=Error log messages
-# Description=Log file name with a path
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
 
log4j.appender.errorAppender.File=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar_error.log
-# Group=Error log messages
-# Description=The class responsible for logging layout
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=Error log messages
-# Description=Log message format
+
+# Group=Error message logging
+# Description=The log message format.
 log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Error log messages
-# Description=The maximum size of log flie
+
+# Group=Error message logging
+# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
 log4j.appender.errorAppender.MaxFileSize=500KB
-# Group=Error log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages the log file.
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
 
 
 ######################################### FATAL 
#######################################
 
-# Group=Fatal log messages
-# Description=The maximum number of backup files
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=Fatal log messages
-# Description=Log file name with a path
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
 
log4j.appender.fatalAppender.File=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar_fatal.log
-# Group=Fatal log messages
-# Description=The class responsible for logging layout
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=Fatal log messages
-# Description=Log message format
+
+# Group=Fatal message logging
+# Description=The log message format.
 log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Fatal log messages
-# Description=The maximum size of log flie
+
+# Group=Fatal message logging
+# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
 log4j.appender.fatalAppender.MaxFileSize=500KB
-# Group=Fatal log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages the log file.
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
 
 
 
 ######################################### ALL 
#########################################
 
-# Group=All log messages
-# Description=The maximum number of backup files
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.psRootAppender.MaxBackupIndex=11
-# Group=All log messages
-# Description=Log file name with a path
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
 
log4j.appender.psRootAppender.File=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar.log
-# Group=All log messages
-# Description=The class responsible for logging layout
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-# Group=All log messages
-# Description=Log message format
+
+# Group=All message logging
+# Description=The log message format.
 log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=All log messages
-# Description=The maximum size of log flie
+
+# Group=All message logging
+# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
 log4j.appender.psRootAppender.MaxFileSize=500KB
-# Group=All log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=All message logging
+# Description=The class responsible for appending log messages the log file.
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 
 

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-04-04 
09:42:42 UTC (rev 3609)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-04-04 
09:47:45 UTC (rev 3610)
@@ -1,112 +1,131 @@
-# this template file is prepared for the releases with web admin stuff and 
packaged in rpm form
-# $Id$
-# romradz, mac
+#Modified at Tue Apr 01 12:58:28 GMT+01:00 2008
 
+
+
 # 
-----------------------------------------------------------------------------------------------
-# Configuration of the LS Cleanup
+# Configuration of Cleanup functionality
 
+
 # Group=Cleanup
-# Description=Action run interval in seconds
-component.ls_cleanup_loader.interval=300
+# Description=The name of the storage component (do not change it).
+component.ls_cleanup_loader.storage_component=ls_storage
 
 # Group=Cleanup
-# Description=The name of scheduler component (do not change it)
-component.ls_cleanup_loader.scheduler_component=ls_scheduler
+# Description=The default TTL (in seconds).
+service.ls.ttl=86400
 
 # Group=Cleanup
-# Description=The name of the storage component (do not change it)
-component.ls_cleanup_loader.storage_component=ls_storage
+# Description=The name of the scheduler component (do not change it).
+component.ls_cleanup_loader.scheduler_component=ls_scheduler
 
 # Group=Cleanup
-# Description=Maximal acceptable TTL (unused)
-service.ls.max_ttl=
+# Description=The interval in which the action is executed (in seconds).
+component.ls_cleanup_loader.interval=300
 
 # Group=Cleanup
-# Description=Minimal acceptable TTL (unused)
+# Description=The minimal acceptable TTL (unused).
 service.ls.min_ttl=1200
 
+# Group=Database
+# Description=The URI of the database.
+service.ls.db_uri=http://localhost:8080/exist/rest/db/ls
+
 # Group=Cleanup
-# Description=Default TTL (in seconds)
-service.ls.ttl=86400
+# Description=The maximum acceptable TTL (unused).
+service.ls.max_ttl=
 
-# 
-----------------------------------------------------------------------------------------------
-# Configuration of paths
 
-# Group=Paths
-# Description=The path for log4j properties file
-service.log.log4j.config=/home/perfsonar/webapps/XML-LS/WEB-INF/classes/perfsonar/conf/log4j.properties
-
-# Group=Paths
-# Description=The path for NMWG parser properties file
-service.sax_parser.config=/home/perfsonar/webapps/XML-LS/WEB-INF/classes/perfsonar/conf/objects.config
-
 # 
-----------------------------------------------------------------------------------------------
-# Configuration of various options
+# Configuration of the internal implementation structures
 
-# Group=Options
-# Description=Allow replace
-service.ls.allow_replace=yes
 
-# Group=Options
-# Description=Service type 1
-service.r.service_type=ls
-
-# Group=Options
-# Description=Service type 2
+# Group=Internal
+# Description=The type of service used to select the correct message handler 
implementation.
 service.r.type=ls
 
-# Group=Options
-# Description=Service Engine classname
+# Group=Internal
+# Description=The java class file which implements the ServiceEngine 
interface.
 
service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
 
-# Group=Options
-# Description=Accepted message types
+# Group=Internal
+# Description=A CSV of request message types supported by the service.
 
service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest,LSCleanup
 
+# Group=Internal
+# Description=Determines whether services can re-register with LS (yes) or 
have to unregister before they can register with it again or perform update 
operation (no).
+service.ls.allow_replace=yes
+
+
 # 
-----------------------------------------------------------------------------------------------
-# Configuration of Database access
+# Configuration of Database functionality
 
+
 # Group=Database
-# Description=Create username and collection for the database (by LS 
WebAdmin Wizard servlet)
-initialize.db=yes
+# Description=The admin password.
+service.ls.db_adminpassword=
 
 # Group=Database
-# Description=Database URI
-service.ls.db_uri=http\://localhost\:8080/exist/rest/db/ls
+# Description=Determines whether to create a username and collection for the 
database (using the LS WebAdmin Wizard servlet).
+initialize.db=yes
 
 # Group=Database
-# Description=Database access (http/xmlrpc)
-service.ls.db_access=http
+# Description=The database status (do not change).
+service.ls.db_status=on
 
 # Group=Database
-# Description=The name of the collection
-service.ls.db_username=lookupservice
+# Description=The default URL of the XML RPC connector.
+service.ls.db_uri.xmlrpc=xmldb:exist://localhost:8080/exist/xmlrpc/db/ls
 
 # Group=Database
-# Description=Database password for selected username
+# Description=The database password for the selected username.
 service.ls.db_password=sonar
 
 # Group=Database
-# Description=Admin password
-service.ls.db_adminpassword=
+# Description=The name of the collection.
+service.ls.db_username=lookupservice
 
 # Group=Database
-# Description=Class of the connector
+# Description=The java class file which implements the connector.
 
service.ls.db_type=org.perfsonar.service.lookupService.xmlType.storage.exist.XQueryExistDAOImpl
 
 # Group=Database
-# Description=Default uri for HTTP connector
-service.ls.db_uri.http=http\://localhost\:8080/exist/rest/db/ls
+# Description=The database access (http or xmlrpc).
+service.ls.db_access=http
 
 # Group=Database
-# Description=Default url for XML RPC connector
-service.ls.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db/ls
+# Description=The default URI of the HTTP connector.
+service.ls.db_uri.http=http://localhost:8080/exist/rest/db/ls
 
 # Group=Database
-# Description=DB status (do not change)
-service.ls.db_status=on
-
-# Group=Database
-# Description=Database configuration type (do not change)
+# Description=The database configuration type (do not change).
 service.ls.exist_type=webapp
 
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of LS functionality
+
+
+# Group=LS
+# Description=The service type.
+service.r.service_type=ls
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of Logging functionality
+
+
+#Group=Logging
+#Description=The location of the the log4j logger configuration file.
+service.log.log4j.config=/home/perfsonar/webapps/XML-LS-1.2/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of SAX functionality
+
+
+#Group=SAX
+#Description=The location of the SAX parser configuration.
+service.sax_parser.config=/home/perfsonar/webapps/XML-LS-1.2/WEB-INF/classes/perfsonar/conf/objects.config

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties   2008-04-04 
09:42:42 UTC (rev 3609)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/servlet.properties   2008-04-04 
09:47:45 UTC (rev 3610)
@@ -1,16 +1,16 @@
-#The type of the service
+#The service type.
 servlet.service_type=rrdma
 
-#The ConfigurationHandler interface implementation used by the Wizard Servlet
+#The ConfigurationHandler interface implementation used by the Wizard 
Servlet.
 
servlet.wizard.external_handler=org.perfsonar.service.lookupService.xmlType.webadmin.LSWizardHandler
 
-#The username used for authentication reasons when accessing properties 
configuration and Wizard servlets
+#The username used for authentication when accessing property configuration 
and Wizard servlets.
 servlet.username=perfsonaruser
 
-#The password used for authentication reasons when accessing properties 
configuration and Wizard servlets
+#The password used for authentication when accessing property configuration 
and Wizard servlets.
 servlet.password=perfsonarpass
 
-# properties names for accessing eXist database configuration in 
service.properties 
+# Property names for accessing the eXist database configuration in 
service.properties. 
 servlet.exist_adminpass.property=service.ls.db_adminpassword
 servlet.exist_location.property=service.ls.db_uri.xmlrpc