perfsonar development work

Author: roman
Date: 2008-07-28 08:18:43 -0400 (Mon, 28 Jul 2008)
New Revision: 4304

Modified:
   trunk/geant2-java-rrd-ma/conf/log4j.properties
   trunk/geant2-java-rrd-ma/conf/service.properties
   trunk/geant2-java-rrd-ma/conf/wizard.properties
Log:
config and log file paths changed



Modified: trunk/geant2-java-rrd-ma/conf/log4j.properties
===================================================================
--- trunk/geant2-java-rrd-ma/conf/log4j.properties      2008-07-25 15:03:34 
UTC (rev 4303)
+++ trunk/geant2-java-rrd-ma/conf/log4j.properties      2008-07-28 12:18:43 
UTC (rev 4304)
@@ -5,12 +5,6 @@
 
 
 
-
-# Group=Logging
-# Description=The location of the log directory.
-logDir=/var/lib/tomcat5.5/logs
-
-
 ##
 ## All log levels in one log file.
 ## By default debug level is switched off (commented).
@@ -61,7 +55,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/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/var/log/geant2-java-rrd-ma/perfsonar_debug.log
 
 # Group=Debug message logging
 # Description=The class responsible for the logging layout.
@@ -89,7 +83,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/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/var/log/geant2-java-rrd-ma/perfsonar_info.log
 
 # Group=Info message logging
 # Description=The class responsible for the logging layout.
@@ -117,7 +111,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/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/var/log/geant2-java-rrd-ma/perfsonar_warn.log
 
 # Group=Warn message logging
 # Description=The class responsible for the logging layout.
@@ -145,7 +139,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/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/var/log/geant2-java-rrd-ma/perfsonar_error.log
 
 # Group=Error message logging
 # Description=The class responsible for the logging layout.
@@ -173,7 +167,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/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/var/log/geant2-java-rrd-ma/perfsonar_fatal.log
 
 # Group=Fatal message logging
 # Description=The class responsible for the logging layout.
@@ -201,7 +195,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/logs/perfsonar.log
+log4j.appender.psRootAppender.File=/var/log/geant2-java-rrd-ma/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -227,7 +221,7 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/lib/tomcat5.5/logs/perfsonar_root.log
+#log4j.appender.rootAppender.File=/var/log/geant2-java-rrd-ma/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-rrd-ma/conf/service.properties
===================================================================
--- trunk/geant2-java-rrd-ma/conf/service.properties    2008-07-25 15:03:34 
UTC (rev 4303)
+++ trunk/geant2-java-rrd-ma/conf/service.properties    2008-07-28 12:18:43 
UTC (rev 4304)
@@ -32,15 +32,15 @@
 
 # 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-rrd-ma/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/etc/geant2-java-rrd-ma/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-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/etc/geant2-java-rrd-ma/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-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml
+service.ma.conf_file=/etc/geant2-java-rrd-ma/rrd-database_TEST.xml
 
 
 

Modified: trunk/geant2-java-rrd-ma/conf/wizard.properties
===================================================================
--- trunk/geant2-java-rrd-ma/conf/wizard.properties     2008-07-25 15:03:34 
UTC (rev 4303)
+++ trunk/geant2-java-rrd-ma/conf/wizard.properties     2008-07-28 12:18:43 
UTC (rev 4304)
@@ -63,9 +63,9 @@
   </property>
 
   <property>
-    <entry key="service.ma.conf_file" 
required="true">/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
+    <entry key="service.ma.conf_file" 
required="true">/etc/geant2-java-rrd-ma/rrd-database_TEST.xml</entry>
     <Comment>Enter the full path of the metadata configuration 
file:</Comment>
-    
<ProposedValue>/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
+    
<ProposedValue>/etc/geant2-java-rrd-ma/rrd-database_TEST.xml</ProposedValue>
     <Group order="6">eXist</Group>
   </property>