perfsonar development work

Author: melis
Date: 2008-08-29 09:22:41 -0400 (Fri, 29 Aug 2008)
New Revision: 4411

Added:
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
   trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties
   trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties.template
Modified:
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
   trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
   trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/service.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
Log:
updated the properties files, so they reflect the changes proposed by Gina

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
        2008-08-29 08:48:58 UTC (rev 4410)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
        2008-08-29 13:22:41 UTC (rev 4411)
@@ -1,147 +1,234 @@
-
 ## $Id$
 ## project : perfSONAR
 ## author: romradz
 
-# Group=Logger
-# Description=location of the log directory
-logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs
 
 
-#ROOT
-# Group=RootLogger
-# Description=The maximum backup index for the root logger
-log4j.appender.rootAppender.MaxBackupIndex=11
-# Group=RootLogger
-# Description=The file for the root logger
-log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
-# Group=RootLogger
-# Description=The class responsible for the layout of the root logger
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-# Group=RootLogger
-# Description=The conversion pattern for the root logger
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=RootLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.rootLogger=DEBUG, rootAppender
-# Group=RootLogger
-# Description=The maximum file size for the root logger
-#og4j.appender.rootAppender.MaxFileSize=500KB
-# Group=RootLogger
-# Description=The class responsible for appending text in the root logger
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
-#DEBUG
-# Group=DebugLogger
-# Description=The maximum backup index for the debug logger
+# Group=Logging
+# Description=The location of the log directory.
+logDir=_LOGPATH_
+
+
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##
+
+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, psRootAppender
+
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# 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
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG 
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=DebugLogger
-# Description=The file for the debug logger
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
-# Group=DebugLogger
-# Description=The class responsible for the layout of the debug logger
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=DebugLogger
-# Description=The conversion pattern for the debug logger
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=DebugLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-debug=DEBUG, debugAppender
-# Group=DebugLogger
-# Description=The maximum file size for the debug logger
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=DebugLogger
-# Description=The class responsible for appending text in the debug logger
+
+# 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=InfoLogger
-# Description=The maximum backup index for the info logger
+
+
+######################################### INFO 
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=InfoLogger
-# Description=The file for the info logger
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
-# Group=InfoLogger
-# Description=The class responsible for the layout of the info logger
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=InfoLogger
-# Description=The conversion pattern for the info logger
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=InfoLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-info=INFO, infoAppender
-# Group=InfoLogger
-# Description=The maximum file size for the info logger
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=InfoLogger
-# Description=The class responsible for appending text in the info logger
+
+# 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=WarnLogger
-# Description=The maximum backup index for the warning logger
+
+
+######################################### WARN 
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=WarnLogger
-# Description=The file for the warning logger
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
-# Group=WarnLogger
-# Description=The class responsible for the layout of the warning logger
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=WarnLogger
-# Description=The conversion pattern for the warning logger
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=WarnLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-warn=WARN, warnAppender
-# Group=WarnLogger
-# Description=The maximum file size for the warning logger
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=WarnLogger
-# Description=The class responsible for appending text in the warning logger
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
-#ERROR
-# Group=ErrorLogger
-# Description=The maximum backup index for the error logger
+
+
+######################################### ERROR 
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=ErrorLogger
-# Description=The file for the error logger
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
-# Group=ErrorLogger
-# Description=The class responsible for the layout of the error logger
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=ErrorLogger
-# Description=The conversion pattern for the error logger
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=ErrorLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-error=ERROR, errorAppender
-# Group=ErrorLogger
-# Description=The maximum file size for the error logger
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=ErrorLogger
-# Description=The class responsible for appending text in the error logger
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
-#FATAL
-# Group=FatalLogger
-# Description=The maximum backup index for the fatal logger
+
+
+######################################### FATAL 
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=FatalLogger
-# Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
-# Group=FatalLogger
-# Description=The class responsible for the layout of the fatal logger
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=FatalLogger
-# Description=The conversion pattern for the fatal logger
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=FatalLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-# Group=FatalLogger
-# Description=The maximum file size for the fatal logger
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=FatalLogger
-# Description=The class responsible for appending text in the fatal logger
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL 
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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 message logging
+# Description=The class responsible for appending log messages to the log 
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ROOT 
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Added: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
      2008-08-29 08:48:58 UTC (rev 4410)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
      2008-08-29 13:22:41 UTC (rev 4411)
@@ -5,15 +5,15 @@
 #----------------
 
 # Group=eXist
-# Description=The password for the admin account for eXist
+# Description=The administrator password for the eXist DB.
 component.mp.xmldb.db_adminpassword=admin
 
 # Group=eXist
-# Description=The username for eXist
+# Description=The username for the eXist DB.
 component.mp.xmldb.db_username=sshtelnet
 
 # Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist
 component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
 
 #Group=eXist
@@ -21,11 +21,11 @@
 
component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 
 # Group=eXist
-# Description=The url of the eXist db
+# Description=The URL to the eXist DB.
 component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
 
 # Group=eXist
-# Description=The password for the eXist database
+# Description=The user password for the eXist DB.
 component.mp.xmldb.db_password=sshtelnet
 
 # Group=eXist
@@ -36,7 +36,7 @@
 #-------------------
 
 # Group=Internal
-# Description=The location of the configuration file for the log4j logger
+# Description=The path to the log4j.properties  configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
 
service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 # Group=Internal
@@ -48,7 +48,7 @@
 
service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
 
 # Group=Internal
-# Description=Types of messages supported by this service
+# Description=A CSV of request message types supported by the service.
 service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
 
 # Group=Internal

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
       2008-08-29 08:48:58 UTC (rev 4410)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
       2008-08-29 13:22:41 UTC (rev 4411)
@@ -44,7 +44,7 @@
 
   <property>
     <entry key="service.r.organization_name">Institution</entry>
-    <Comment>Enter the name of the organization running this 
service:</Comment>
+    <Comment>Enter the name of the organisation running this 
service:</Comment>
     <ProposedValue>Institution</ProposedValue>
     <Group order="4">LS</Group>
   </property>
@@ -73,7 +73,7 @@
   <!--
   <property>
     <entry key="service.ls.registration_file" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
-    <Comment>Give the path to the metadataconfiguration file which needs to 
be uploaded to the LS</Comment>
+    <Comment>Enter the path to the metadata configuration file which needs 
to be uploaded to the LS:</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
     <Group order="8">LS</Group>
   </property>
@@ -82,42 +82,42 @@
   
   <property>
     <entry key="component.mp.xmldb.db_adminpassword" required="true" 
password="true" />
-    <Comment>Give the admin password for the eXist database</Comment>
+    <Comment>Enter the eXist administration password:</Comment>
     <ProposedValue />
     <Group order="7">eXist</Group>
   </property>
   
   <property>
     <entry key="old_adminpassword" required="true" 
password="true">admin</entry>
-    <Comment>Give the old admin password for the eXist database</Comment>
+    <Comment>Enter the old eXist administration password:</Comment>
     <ProposedValue>admin</ProposedValue>
   <Group order="6">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.db_uri" 
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
-    <Comment>Give the URI for the eXist database</Comment>
+    <Comment>Enter the URI location of the eXist database:</Comment>
     
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
     <Group order="3">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.db_username" 
required="true">sshtelnet</entry>
-    <Comment>Give the username for the eXist database</Comment>
+    <Comment>Enter the service username for the eXist user:</Comment>
     <ProposedValue>sshtelnet</ProposedValue>
     <Group order="4">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.metadata_file_name" 
required="true">sshtelnetmetadata.xml</entry>
-    <Comment>Give the name of the metadata configuration file</Comment>
+    <Comment>Enter the name of the metadata configuration file:</Comment>
     <ProposedValue>sshtelnetmetadata.xml</ProposedValue>
     <Group order="1">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.metadata_file_path" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
-    <Comment>Give the path to the metadata configuration file (needed for 
uploading the file into eXist)</Comment>
+    <Comment>Enter the path to the metadata configuration file:</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
     <Group order="2">eXist</Group>
   </property>
@@ -132,14 +132,14 @@
   
   <property>
     <entry key="servlet.username" required="true">perfsonaruser</entry>
-    <Comment>Give the username to use for logging in to the admin 
pages</Comment>
+    <Comment>Enter the username for logging in to the admin pages:</Comment>
     <ProposedValue>perfsonaruser</ProposedValue>
     <Group order="1" check="false">Administration</Group>
   </property>
   
   <property>
     <entry key="servlet.password" required="true" 
password="true">perfsonarpass</entry>
-    <Comment>Give the password to use for logging in to the admin 
pages</Comment>
+    <Comment>Enter the password for logging in to the admin pages:</Comment>
     <ProposedValue>perfsonarpass</ProposedValue>
     <Group order="2">Administration</Group>
   </property>

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties        2008-08-29 
08:48:58 UTC (rev 4410)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties        2008-08-29 
13:22:41 UTC (rev 4411)
@@ -1,147 +1,234 @@
-
 ## $Id$
 ## project : perfSONAR
 ## author: romradz
 
-# Group=Logger
-# Description=location of the log directory
-logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs
 
 
-#ROOT
-# Group=RootLogger
-# Description=The maximum backup index for the root logger
-log4j.appender.rootAppender.MaxBackupIndex=11
-# Group=RootLogger
-# Description=The file for the root logger
-log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
-# Group=RootLogger
-# Description=The class responsible for the layout of the root logger
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-# Group=RootLogger
-# Description=The conversion pattern for the root logger
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=RootLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.rootLogger=DEBUG, rootAppender
-# Group=RootLogger
-# Description=The maximum file size for the root logger
-#og4j.appender.rootAppender.MaxFileSize=500KB
-# Group=RootLogger
-# Description=The class responsible for appending text in the root logger
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
-#DEBUG
-# Group=DebugLogger
-# Description=The maximum backup index for the debug logger
+# Group=Logging
+# Description=The location of the log directory.
+logDir=_LOGPATH_
+
+
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##
+
+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, psRootAppender
+
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# 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
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG 
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=DebugLogger
-# Description=The file for the debug logger
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
-# Group=DebugLogger
-# Description=The class responsible for the layout of the debug logger
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=DebugLogger
-# Description=The conversion pattern for the debug logger
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=DebugLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-debug=DEBUG, debugAppender
-# Group=DebugLogger
-# Description=The maximum file size for the debug logger
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=DebugLogger
-# Description=The class responsible for appending text in the debug logger
+
+# 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=InfoLogger
-# Description=The maximum backup index for the info logger
+
+
+######################################### INFO 
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=InfoLogger
-# Description=The file for the info logger
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
-# Group=InfoLogger
-# Description=The class responsible for the layout of the info logger
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=InfoLogger
-# Description=The conversion pattern for the info logger
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=InfoLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-info=INFO, infoAppender
-# Group=InfoLogger
-# Description=The maximum file size for the info logger
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=InfoLogger
-# Description=The class responsible for appending text in the info logger
+
+# 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=WarnLogger
-# Description=The maximum backup index for the warning logger
+
+
+######################################### WARN 
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=WarnLogger
-# Description=The file for the warning logger
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
-# Group=WarnLogger
-# Description=The class responsible for the layout of the warning logger
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=WarnLogger
-# Description=The conversion pattern for the warning logger
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=WarnLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-warn=WARN, warnAppender
-# Group=WarnLogger
-# Description=The maximum file size for the warning logger
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=WarnLogger
-# Description=The class responsible for appending text in the warning logger
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
-#ERROR
-# Group=ErrorLogger
-# Description=The maximum backup index for the error logger
+
+
+######################################### ERROR 
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=ErrorLogger
-# Description=The file for the error logger
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
-# Group=ErrorLogger
-# Description=The class responsible for the layout of the error logger
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=ErrorLogger
-# Description=The conversion pattern for the error logger
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=ErrorLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-error=ERROR, errorAppender
-# Group=ErrorLogger
-# Description=The maximum file size for the error logger
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=ErrorLogger
-# Description=The class responsible for appending text in the error logger
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
-#FATAL
-# Group=FatalLogger
-# Description=The maximum backup index for the fatal logger
+
+
+######################################### FATAL 
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=FatalLogger
-# Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
-# Group=FatalLogger
-# Description=The class responsible for the layout of the fatal logger
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=FatalLogger
-# Description=The conversion pattern for the fatal logger
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=FatalLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-# Group=FatalLogger
-# Description=The maximum file size for the fatal logger
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=FatalLogger
-# Description=The class responsible for appending text in the fatal logger
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL 
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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 message logging
+# Description=The class responsible for appending log messages to the log 
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ROOT 
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template       
2008-08-29 08:48:58 UTC (rev 4410)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template       
2008-08-29 13:22:41 UTC (rev 4411)
@@ -1,147 +1,234 @@
-
 ## $Id$
 ## project : perfSONAR
 ## author: romradz
 
-# Group=Logger
-# Description=location of the log directory
-logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs
 
 
-#ROOT
-# Group=RootLogger
-# Description=The maximum backup index for the root logger
-log4j.appender.rootAppender.MaxBackupIndex=11
-# Group=RootLogger
-# Description=The file for the root logger
-log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
-# Group=RootLogger
-# Description=The class responsible for the layout of the root logger
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-# Group=RootLogger
-# Description=The conversion pattern for the root logger
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=RootLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.rootLogger=DEBUG, rootAppender
-# Group=RootLogger
-# Description=The maximum file size for the root logger
-#og4j.appender.rootAppender.MaxFileSize=500KB
-# Group=RootLogger
-# Description=The class responsible for appending text in the root logger
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
-#DEBUG
-# Group=DebugLogger
-# Description=The maximum backup index for the debug logger
+# Group=Logging
+# Description=The location of the log directory.
+logDir=_LOGPATH_
+
+
+##
+## All log levels in one log file.
+## By default debug level is switched off (commented).
+##
+
+# Group=Log levels
+# Description=Assigns debug log messages to the specified log appender.
+#log4j.logger.sonar-debug=DEBUG, psRootAppender
+
+# Group=Log levels
+# Description=Assigns info log messages to the specified log appender.
+log4j.logger.sonar-info=INFO, psRootAppender
+
+# Group=Log levels
+# Description=Assigns warn log messages to the specified log appender.
+log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assigns error log messages to the specified log appender.
+log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# 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
+##
+## this section is only for developer tests
+##
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+
+
+
+
+######################################### DEBUG 
#######################################
+
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=DebugLogger
-# Description=The file for the debug logger
-log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
-# Group=DebugLogger
-# Description=The class responsible for the layout of the debug logger
+
+# Group=Debug message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=DebugLogger
-# Description=The conversion pattern for the debug logger
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=DebugLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-debug=DEBUG, debugAppender
-# Group=DebugLogger
-# Description=The maximum file size for the debug logger
+
+# Group=Debug message logging
+# Description=The log message format.
+log4j.appender.debugAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=DebugLogger
-# Description=The class responsible for appending text in the debug logger
+
+# 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=InfoLogger
-# Description=The maximum backup index for the info logger
+
+
+######################################### INFO 
########################################
+
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=InfoLogger
-# Description=The file for the info logger
-log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
-# Group=InfoLogger
-# Description=The class responsible for the layout of the info logger
+
+# Group=Info message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=InfoLogger
-# Description=The conversion pattern for the info logger
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=InfoLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-info=INFO, infoAppender
-# Group=InfoLogger
-# Description=The maximum file size for the info logger
+
+# Group=Info message logging
+# Description=The log message format.
+log4j.appender.infoAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=InfoLogger
-# Description=The class responsible for appending text in the info logger
+
+# 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=WarnLogger
-# Description=The maximum backup index for the warning logger
+
+
+######################################### WARN 
########################################
+
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=WarnLogger
-# Description=The file for the warning logger
-log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
-# Group=WarnLogger
-# Description=The class responsible for the layout of the warning logger
+
+# Group=Warn message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=WarnLogger
-# Description=The conversion pattern for the warning logger
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=WarnLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-warn=WARN, warnAppender
-# Group=WarnLogger
-# Description=The maximum file size for the warning logger
+
+# Group=Warn message logging
+# Description=The log message format.
+log4j.appender.warnAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=WarnLogger
-# Description=The class responsible for appending text in the warning logger
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
-#ERROR
-# Group=ErrorLogger
-# Description=The maximum backup index for the error logger
+
+
+######################################### ERROR 
#######################################
+
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=ErrorLogger
-# Description=The file for the error logger
-log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
-# Group=ErrorLogger
-# Description=The class responsible for the layout of the error logger
+
+# Group=Error message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=ErrorLogger
-# Description=The conversion pattern for the error logger
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=ErrorLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-error=ERROR, errorAppender
-# Group=ErrorLogger
-# Description=The maximum file size for the error logger
+
+# Group=Error message logging
+# Description=The log message format.
+log4j.appender.errorAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=ErrorLogger
-# Description=The class responsible for appending text in the error logger
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
-#FATAL
-# Group=FatalLogger
-# Description=The maximum backup index for the fatal logger
+
+
+######################################### FATAL 
#######################################
+
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
 log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=FatalLogger
-# Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
-# Group=FatalLogger
-# Description=The class responsible for the layout of the fatal logger
+
+# Group=Fatal message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=FatalLogger
-# Description=The conversion pattern for the fatal logger
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=FatalLogger
-# Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-# Group=FatalLogger
-# Description=The maximum file size for the fatal logger
+
+# Group=Fatal message logging
+# Description=The log message format.
+log4j.appender.fatalAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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=FatalLogger
-# Description=The class responsible for appending text in the fatal logger
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ALL 
#########################################
+
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
+log4j.appender.psRootAppender.MaxBackupIndex=11
+
+# Group=All message logging
+# Description=The path to the log file, including the log file's name.
+log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
+log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+
+# Group=All message logging
+# Description=The log message format.
+log4j.appender.psRootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+
+# 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 message logging
+# Description=The class responsible for appending log messages to the log 
file.
+log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
+
+
+
+######################################### ROOT 
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=11
+#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SSHTELNET-MP.%p%% %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Added: trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties

Added: trunk/geant2_java-sshtelnet-mp/conf/log4j.syslog.properties.template

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-08-29 
08:48:58 UTC (rev 4410)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-08-29 
13:22:41 UTC (rev 4411)
@@ -5,15 +5,15 @@
 #----------------
 
 # Group=eXist
-# Description=The password for the admin account for eXist
+# Description=The administrator password for the eXist DB.
 component.mp.xmldb.db_adminpassword=admin
 
 # Group=eXist
-# Description=The username for eXist
+# Description=The username for the eXist DB.
 component.mp.xmldb.db_username=sshtelnet
 
 # Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist
 component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
 
 #Group=eXist
@@ -21,11 +21,11 @@
 
component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 
 # Group=eXist
-# Description=The url of the eXist db
+# Description=The URL to the eXist DB.
 component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
 
 # Group=eXist
-# Description=The password for the eXist database
+# Description=The user password for the eXist DB.
 component.mp.xmldb.db_password=sshtelnet
 
 # Group=eXist
@@ -36,7 +36,7 @@
 #-------------------
 
 # Group=Internal
-# Description=The location of the configuration file for the log4j logger
+# Description=The path to the log4j.properties  configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
 
service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 # Group=Internal
@@ -48,7 +48,7 @@
 
service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
 
 # Group=Internal
-# Description=Types of messages supported by this service
+# Description=A CSV of request message types supported by the service.
 service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
 
 # Group=Internal

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-08-29 08:48:58 UTC (rev 4410)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-08-29 13:22:41 UTC (rev 4411)
@@ -5,15 +5,15 @@
 #----------------
 
 # Group=eXist
-# Description=The password for the admin account for eXist
+# Description=The administrator password for the eXist DB.
 component.mp.xmldb.db_adminpassword=admin
 
 # Group=eXist
-# Description=The username for eXist
+# Description=The username for the eXist DB.
 component.mp.xmldb.db_username=sshtelnet
 
 # Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist
 component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
 
 #Group=eXist
@@ -21,11 +21,11 @@
 
component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 
 # Group=eXist
-# Description=The url of the eXist db
+# Description=The URL to the eXist DB.
 component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
 
 # Group=eXist
-# Description=The password for the eXist database
+# Description=The user password for the eXist DB.
 component.mp.xmldb.db_password=sshtelnet
 
 # Group=eXist
@@ -36,7 +36,7 @@
 #-------------------
 
 # Group=Internal
-# Description=The location of the configuration file for the log4j logger
+# Description=The path to the log4j.properties  configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
 
service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 # Group=Internal
@@ -48,7 +48,7 @@
 
service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
 
 # Group=Internal
-# Description=Types of messages supported by this service
+# Description=A CSV of request message types supported by the service.
 service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
 
 # Group=Internal

Modified: trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/wizard.properties       2008-08-29 
08:48:58 UTC (rev 4410)
+++ trunk/geant2_java-sshtelnet-mp/conf/wizard.properties       2008-08-29 
13:22:41 UTC (rev 4411)
@@ -44,7 +44,7 @@
 
   <property>
     <entry key="service.r.organization_name">Institution</entry>
-    <Comment>Enter the name of the organization running this 
service:</Comment>
+    <Comment>Enter the name of the organisation running this 
service:</Comment>
     <ProposedValue>Institution</ProposedValue>
     <Group order="4">LS</Group>
   </property>
@@ -73,7 +73,7 @@
   <!--
   <property>
     <entry key="service.ls.registration_file" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
-    <Comment>Give the path to the metadataconfiguration file which needs to 
be uploaded to the LS</Comment>
+    <Comment>Enter the path to the metadata configuration file which needs 
to be uploaded to the LS:</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
     <Group order="8">LS</Group>
   </property>
@@ -82,42 +82,42 @@
   
   <property>
     <entry key="component.mp.xmldb.db_adminpassword" required="true" 
password="true" />
-    <Comment>Give the admin password for the eXist database</Comment>
+    <Comment>Enter the eXist administration password:</Comment>
     <ProposedValue />
     <Group order="7">eXist</Group>
   </property>
   
   <property>
     <entry key="old_adminpassword" required="true" 
password="true">admin</entry>
-    <Comment>Give the old admin password for the eXist database</Comment>
+    <Comment>Enter the old eXist administration password:</Comment>
     <ProposedValue>admin</ProposedValue>
   <Group order="6">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.db_uri" 
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
-    <Comment>Give the URI for the eXist database</Comment>
+    <Comment>Enter the URI location of the eXist database:</Comment>
     
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
     <Group order="3">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.db_username" 
required="true">sshtelnet</entry>
-    <Comment>Give the username for the eXist database</Comment>
+    <Comment>Enter the service username for the eXist user:</Comment>
     <ProposedValue>sshtelnet</ProposedValue>
     <Group order="4">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.metadata_file_name" 
required="true">sshtelnetmetadata.xml</entry>
-    <Comment>Give the name of the metadata configuration file</Comment>
+    <Comment>Enter the name of the metadata configuration file:</Comment>
     <ProposedValue>sshtelnetmetadata.xml</ProposedValue>
     <Group order="1">eXist</Group>
   </property>
   
   <property>
     <entry key="component.mp.xmldb.metadata_file_path" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
-    <Comment>Give the path to the metadata configuration file (needed for 
uploading the file into eXist)</Comment>
+    <Comment>Enter the path to the metadata configuration file:</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
     <Group order="2">eXist</Group>
   </property>
@@ -132,14 +132,14 @@
   
   <property>
     <entry key="servlet.username" required="true">perfsonaruser</entry>
-    <Comment>Give the username to use for logging in to the admin 
pages</Comment>
+    <Comment>Enter the username for logging in to the admin pages:</Comment>
     <ProposedValue>perfsonaruser</ProposedValue>
     <Group order="1" check="false">Administration</Group>
   </property>
   
   <property>
     <entry key="servlet.password" required="true" 
password="true">perfsonarpass</entry>
-    <Comment>Give the password to use for logging in to the admin 
pages</Comment>
+    <Comment>Enter the password for logging in to the admin pages:</Comment>
     <ProposedValue>perfsonarpass</ProposedValue>
     <Group order="2">Administration</Group>
   </property>