perfsonar development work

Author: hans.trompert
Date: 2008-12-17 05:47:45 -0500 (Wed, 17 Dec 2008)
New Revision: 4807

Modified:
   trunk/ps-mdm-flowsa-ma/conf/log4j.properties
   trunk/ps-mdm-flowsa-ma/conf/service.properties
Log:
- corrected log file paths in log4j.properties
- supplied some more sensible defaults in service.properties (eq. removed 
SURFnet specifice stuff)



Modified: trunk/ps-mdm-flowsa-ma/conf/log4j.properties
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/log4j.properties        2008-12-17 10:37:18 
UTC (rev 4806)
+++ trunk/ps-mdm-flowsa-ma/conf/log4j.properties        2008-12-17 10:47:45 
UTC (rev 4807)
@@ -7,7 +7,7 @@
 
 # Group=Logging
 # Description=The location of the log directory.
-logDir=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log
+logDir=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/
 
 
 ##
@@ -60,7 +60,7 @@
 
 # Group=Debug message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar_debug.log
 
 # Group=Debug message logging
 # Description=The class responsible for the logging layout.
@@ -88,7 +88,7 @@
 
 # Group=Info message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar_info.log
 
 # Group=Info message logging
 # Description=The class responsible for the logging layout.
@@ -116,7 +116,7 @@
 
 # Group=Warn message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar_warn.log
 
 # Group=Warn message logging
 # Description=The class responsible for the logging layout.
@@ -144,7 +144,7 @@
 
 # Group=Error message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar_error.log
 
 # Group=Error message logging
 # Description=The class responsible for the logging layout.
@@ -172,7 +172,7 @@
 
 # Group=Fatal message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar_fatal.log
 
 # Group=Fatal message logging
 # Description=The class responsible for the logging layout.
@@ -200,7 +200,7 @@
 
 # Group=All message logging
 # Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -226,7 +226,7 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsa-ma/WEB-INF/log/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 #log4j.appender.rootAppender.layout.ConversionPattern=%d 
%%PS-MDM-FLOWSA-MA.%p%% %m%n
 #log4j.rootLogger=DEBUG, rootAppender

Modified: trunk/ps-mdm-flowsa-ma/conf/service.properties
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/service.properties      2008-12-17 10:37:18 
UTC (rev 4806)
+++ trunk/ps-mdm-flowsa-ma/conf/service.properties      2008-12-17 10:47:45 
UTC (rev 4807)
@@ -18,11 +18,11 @@
 
 # Group=ServiceType
 # Description= no description
-service.r.ls_url=http://localhost:8080/XML-LS-1.1.2/services/LookupService
+service.r.ls_url=http://localhost:8080/geant2-java-xml-ls/services/LookupService
 
 # Group=ServiceType
 # Description= This is send to the LS
-service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/surfnet_java-flowsa-ma/services/FlowsaMeasurementArchiveService
+service.r.access_point=http://localhost:8080/ps-mdm-flowsa-ma/services/FlowsaMeasurementArchiveService
 
 # === Measurement Archive general properties ===
 
@@ -53,58 +53,58 @@
 # service.common.flow.exporter.1.location.longitude - optional
 
 service.common.flow.exporter.1.enabled=true
-service.common.flow.exporter.1.address=xsr01.asd001a.surf.net
+service.common.flow.exporter.1.address=router.example.domain
 service.common.flow.exporter.1.port=29001
-service.common.flow.exporter.1.description=SURFnet6 Core Router Amsterdam1
+service.common.flow.exporter.1.description=NREN Core Router at Location
 service.common.flow.exporter.1.flow-version=netflow_v9
 service.common.flow.exporter.1.sample-rate=100
 
-service.common.flow.exporter.2.enabled=true
-service.common.flow.exporter.2.address=xsr01.asd002a.surf.net
-service.common.flow.exporter.2.port=29003
-service.common.flow.exporter.2.description=SURFnet6 Core Router Amsterdam2
+service.common.flow.exporter.2.enabled=false
+service.common.flow.exporter.2.address=router.example.domain
+service.common.flow.exporter.2.port=29002
+service.common.flow.exporter.2.description=NREN Core Router at Location
 service.common.flow.exporter.2.flow-version=netflow_v9
 service.common.flow.exporter.2.sample-rate=100
 
-service.common.flow.exporter.3.enabled=true
-service.common.flow.exporter.3.address=xsr03.asd001a.surf.net
-service.common.flow.exporter.3.port=29002
-service.common.flow.exporter.3.description=SURFnet6 Border Router Amsterdam1
+service.common.flow.exporter.3.enabled=false
+service.common.flow.exporter.3.address=router.example.domain
+service.common.flow.exporter.3.port=29003
+service.common.flow.exporter.3.description=NREN Core Router at Location
 service.common.flow.exporter.3.flow-version=netflow_v9
 service.common.flow.exporter.3.sample-rate=100
 
-service.common.flow.exporter.4.enabled=true
-service.common.flow.exporter.4.address=xsr03.asd002a.surf.net
+service.common.flow.exporter.4.enabled=false
+service.common.flow.exporter.4.address=router.example.domain
 service.common.flow.exporter.4.port=29004
-service.common.flow.exporter.4.description=SURFnet6 Border Router Amsterdam2
+service.common.flow.exporter.4.description=NREN Core Router at Location
 service.common.flow.exporter.4.flow-version=netflow_v9
 service.common.flow.exporter.4.sample-rate=100
 
-service.common.flow.exporter.5.enabled=true
-service.common.flow.exporter.5.address=jnr01.asd001a.surf.net
+service.common.flow.exporter.5.enabled=false
+service.common.flow.exporter.5.address=router.example.domain
 service.common.flow.exporter.5.port=27005
-service.common.flow.exporter.5.description=SURFnet6 Core Router Amsterdam1
+service.common.flow.exporter.5.description=NREN Core Router at Location
 service.common.flow.exporter.5.flow-version=netflow_v9
 service.common.flow.exporter.5.sample-rate=100
 
-service.common.flow.exporter.6.enabled=true
-service.common.flow.exporter.6.address=jnr01.asd002a.surf.net
+service.common.flow.exporter.6.enabled=false
+service.common.flow.exporter.6.address=router.example.domain
 service.common.flow.exporter.6.port=27007
-service.common.flow.exporter.6.description=SURFnet6 Core Router Amsterdam2
+service.common.flow.exporter.6.description=NREN Core Router at Location
 service.common.flow.exporter.6.flow-version=netflow_v9
 service.common.flow.exporter.6.sample-rate=100
 
-service.common.flow.exporter.7.enabled=true
-service.common.flow.exporter.7.address=jnr02.asd001a.surf.net
+service.common.flow.exporter.7.enabled=false
+service.common.flow.exporter.7.address=router.example.domain
 service.common.flow.exporter.7.port=27006
-service.common.flow.exporter.7.description=SURFnet6 Border Router Amsterdam1
+service.common.flow.exporter.7.description=NREN Core Router at Location
 service.common.flow.exporter.7.flow-version=netflow_v9
 service.common.flow.exporter.7.sample-rate=100
 
-service.common.flow.exporter.8.enabled=true
-service.common.flow.exporter.8.address=jnr02.asd002a.surf.net
+service.common.flow.exporter.8.enabled=false
+service.common.flow.exporter.8.address=router.example.domain
 service.common.flow.exporter.8.port=29008
-service.common.flow.exporter.8.description=SURFnet6 Border Router Amsterdam2
+service.common.flow.exporter.8.description=NREN Core Router at Location
 service.common.flow.exporter.8.flow-version=netflow_v9
 service.common.flow.exporter.8.sample-rate=100