perfsonar development work

Author: hans.trompert
Date: 2008-12-17 09:03:08 -0500 (Wed, 17 Dec 2008)
New Revision: 4811

Modified:
   trunk/ps-mdm-flowsub-mp/conf/log4j.properties
   trunk/ps-mdm-flowsub-mp/conf/service.properties
   trunk/ps-mdm-flowsub-mp/pom.xml
Log:
- updated log file paths in log4j.properties to new perfsonar directory 
structure
- cleaned up defaults in service.properties
- removed localName from pom.xml (will use correct name with version number 
by default)



Modified: trunk/ps-mdm-flowsub-mp/conf/log4j.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/log4j.properties       2008-12-17 11:10:38 
UTC (rev 4810)
+++ trunk/ps-mdm-flowsub-mp/conf/log4j.properties       2008-12-17 14:03:08 
UTC (rev 4811)
@@ -7,7 +7,7 @@
 
 # Group=Logging
 # Description=The location of the log directory.
-logDir=/var/lib/tomcat5.5/logs
+logDir=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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=/var/lib/tomcat5.5/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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=/var/lib/tomcat5.5/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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=/var/lib/tomcat5.5/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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=/var/lib/tomcat5.5/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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=/var/lib/tomcat5.5/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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=/var/lib/tomcat5.5/logs/perfsonar.log
+log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/WEB-INF/log/perfsonar.log
 
 # Group=All message logging
 # Description=The class responsible for the logging layout.
@@ -226,9 +226,9 @@
 
 # ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/var/lib/tomcat5.5/logs/perfsonar_root.log
+#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/ps-mdm-flowsub-mp/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
 #log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
\ No newline at end of file
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

Modified: trunk/ps-mdm-flowsub-mp/conf/service.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/service.properties     2008-12-17 11:10:38 
UTC (rev 4810)
+++ trunk/ps-mdm-flowsub-mp/conf/service.properties     2008-12-17 14:03:08 
UTC (rev 4811)
@@ -18,7 +18,7 @@
 
 # Group=ServiceType
 # Description= Type should be MP
-service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService
+service.r.access_point=http://localhost:8080/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService
 
 # === Measurement Archive general properties ===
 
@@ -46,7 +46,7 @@
 
 # Group=LS
 # Description= LS adress
-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=LS
 # Description=Secduler Component should be ma_scheduler
@@ -101,35 +101,35 @@
 service.mp.flow.max_conn=20
 
 ### network layout
-service.common.flow.exporter.0.name=arthur
+service.common.flow.exporter.0.name=router.example.domain
 service.common.flow.exporter.0.enabled=true
-service.common.flow.exporter.0.address=145.145.127.1
+service.common.flow.exporter.0.address=127.0.0.1
 service.common.flow.exporter.0.port=29001
 
-service.common.flow.exporter.1.name=ford
-service.common.flow.exporter.1.enabled=true
-service.common.flow.exporter.1.address=145.145.127.2
+service.common.flow.exporter.1.name=router.example.domain
+service.common.flow.exporter.1.enabled=false
+service.common.flow.exporter.1.address=127.0.0.1
 service.common.flow.exporter.1.port=29002
 
-service.common.flow.exporter.2.name=trillian
-service.common.flow.exporter.2.enabled=true
-service.common.flow.exporter.2.address=145.145.127.3
+service.common.flow.exporter.2.name=router.example.domain
+service.common.flow.exporter.2.enabled=false
+service.common.flow.exporter.2.address=127.0.0.1
 service.common.flow.exporter.2.port=29003
 
-service.common.flow.exporter.3.name=zaphod
-service.common.flow.exporter.3.enabled=true
-service.common.flow.exporter.3.address=145.145.127.4
+service.common.flow.exporter.3.name=router.example.domain
+service.common.flow.exporter.3.enabled=false
+service.common.flow.exporter.3.address=127.0.0.1
 service.common.flow.exporter.3.port=29004
 
-service.common.flow.exporter.4.name=router4
+service.common.flow.exporter.4.name=router.example.domain
 service.common.flow.exporter.4.enabled=false
 service.common.flow.exporter.4.address=127.0.0.1
-service.common.flow.exporter.4.port=6999
+service.common.flow.exporter.4.port=29005
 
-service.common.flow.exporter.5.name=router5
+service.common.flow.exporter.5.name=router.example.domain
 service.common.flow.exporter.5.enabled=false
 service.common.flow.exporter.5.address=127.0.0.1
-service.common.flow.exporter.5.port=6999
+service.common.flow.exporter.5.port=29006
 
 ### application locations
 

Modified: trunk/ps-mdm-flowsub-mp/pom.xml
===================================================================
--- trunk/ps-mdm-flowsub-mp/pom.xml     2008-12-17 11:10:38 UTC (rev 4810)
+++ trunk/ps-mdm-flowsub-mp/pom.xml     2008-12-17 14:03:08 UTC (rev 4811)
@@ -54,7 +54,6 @@
                </testSourceDirectory>
                <outputDirectory>${basedir}/bin</outputDirectory>
                <directory>${basedir}/build</directory>
-               <finalName>ps-mdm-flowsub-mp</finalName>
                <plugins>
                        <plugin>
                                <artifactId>maven-compiler-plugin</artifactId>