perfsonar development work

Author: roman
Date: 2008-07-09 11:09:42 -0400 (Wed, 09 Jul 2008)
New Revision: 4153

Modified:
   trunk/geant2-java-sql-ma/conf/log4j.properties
   trunk/geant2-java-sql-ma/conf/service.properties
Log:
default values of some properties updated



Modified: trunk/geant2-java-sql-ma/conf/log4j.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/log4j.properties      2008-07-09 14:56:50 
UTC (rev 4152)
+++ trunk/geant2-java-sql-ma/conf/log4j.properties      2008-07-09 15:09:42 
UTC (rev 4153)
@@ -8,7 +8,7 @@
 
 # Group=Logging
 # Description=The location of the log directory.
-logDir=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF
+logDir=/var/lib/tomcat5.5/logs
 
 
 ##
@@ -61,7 +61,7 @@
 
 # Group=Debug message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/lib/tomcat5.5/logs/perfsonar_debug.log
 
 # Group=Debug message logging
 # Description=The class responsible for the logging layout.
@@ -89,7 +89,7 @@
 
 # Group=Info message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/lib/tomcat5.5/logs/perfsonar_info.log
 
 # Group=Info message logging
 # Description=The class responsible for the logging layout.
@@ -117,7 +117,7 @@
 
 # Group=Warn message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/lib/tomcat5.5/logs/perfsonar_warn.log
 
 # Group=Warn message logging
 # Description=The class responsible for the logging layout.
@@ -145,7 +145,7 @@
 
 # Group=Error message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/lib/tomcat5.5/logs/perfsonar_error.log
 
 # Group=Error message logging
 # Description=The class responsible for the logging layout.
@@ -173,7 +173,7 @@
 
 # Group=Fatal message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/lib/tomcat5.5/logs/perfsonar_fatal.log
 
 # Group=Fatal message logging
 # Description=The class responsible for the logging layout.
@@ -201,7 +201,7 @@
 
 # Group=All message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar.log
+log4j.appender.psRootAppender.File=/var/lib/tomcat5.5/logs/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -227,7 +227,7 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/lib/tomcat5.5/logs/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 #log4j.appender.rootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-RRD-MA.%p%% %m%n
 #log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/geant2-java-sql-ma/conf/service.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/service.properties    2008-07-09 14:56:50 
UTC (rev 4152)
+++ trunk/geant2-java-sql-ma/conf/service.properties    2008-07-09 15:09:42 
UTC (rev 4153)
@@ -31,8 +31,20 @@
 # Description=The java class file which implements the base chaining of 
requests.
 
service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
 
+# Group=Internal
+# Description=The path to the file objects.config, including the NMWG 
parser's configuration settings. The parser reads the request or metadata 
configuration files, and creates internally used objects that represent these 
files.
+service.sax_parser.config=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
 
+# Group=Internal
+# Description=The path to the log4j configuration file, including the file's 
name.
+service.log.log4j.config=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
 
+# Group=Internal
+# Description=The path to the metadata configuration file, including the 
file's name.
+service.ma.conf_file=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml
+
+
+
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of storing metadata configuration file in xml db eXist
 
@@ -143,9 +155,3 @@
 # Description=Determines whether new data sent to the service is stored (on) 
or not (off).
 service.ma.xmldb.db_store=off
 
-
-
-
-service.log.log4j.config=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-service.sax_parser.config=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
-service.ma.conf_file=/var/lib/tomcat5.5/webapps/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml