perfsonar-dev - perfsonar: r3517 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf doc doc/schema
Subject: perfsonar development work
List archive
perfsonar: r3517 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf doc doc/schema
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3517 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf doc doc/schema
- Date: Fri, 14 Mar 2008 06:21:21 -0400
Author: roman
Date: 2008-03-14 06:21:20 -0400 (Fri, 14 Mar 2008)
New Revision: 3517
Added:
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/schema/ErrorResponse.rnc
Modified:
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2_JAVA-RRD-MA-STABLE/doc/Interface_Specification.doc
Log:
chenges done in the trunk (geant2_java-rrd-ma) between rev numbers 3466 and
3516 merged
Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-03-14 08:42:49 UTC (rev 3516)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
2008-03-14 10:21:20 UTC (rev 3517)
@@ -46,7 +46,7 @@
depends="copy-dep-base-service-jars">
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080303/perfsonar-base-1.0.20080303.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -262,7 +262,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080303/perfsonar-base-1.0.20080303.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
@@ -308,17 +308,45 @@
token="_LOGPATH_"
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
+
+ <!-- ======================================== -->
+
<echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+ message="${line.separator}${line.separator}# --------properties
generated by Ant
script-----------------------------------------------------${line.separator}"
+ append="true" />
+
+ <!-- ======================================== -->
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+ message="${line.separator}${line.separator}#
Group=Internal${line.separator}"
+ append="true" />
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+ message="# 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.${line.separator}"
+ append="true" />
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
append="true" />
+ <!-- ======================================== -->
<echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+ message="${line.separator}# Group=Internal${line.separator}"
+ append="true" />
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+ message="# Description=The path to the metadata configuration
file, including the file's name.${line.separator}"
+ append="true" />
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
append="true" />
+ <!-- ======================================== -->
<echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ message="${line.separator}# Group=Internal${line.separator}"
append="true" />
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+ message="# Description=The path to the log4j configuration file,
including the file's name.${line.separator}"
+ append="true" />
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties${line.separator}"
+ append="true" />
<mkdir dir="${tmpdir}/WEB-INF/logs"/>
Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-03-14 08:42:49 UTC (rev 3516)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
2008-03-14 10:21:20 UTC (rev 3517)
@@ -55,7 +55,7 @@
<artifact:dependencies>
<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080303"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080310"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.7b"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>
Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template
2008-03-14 08:42:49 UTC (rev 3516)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template
2008-03-14 10:21:20 UTC (rev 3517)
@@ -11,27 +11,27 @@
##
## All log levels in one log file.
-## Dafaultly debug level is switched off (commented).
+## By default debug level is switched off (commented).
##
# Group=Log levels
-# Description=Assignment of debug log messages to a certain log appender
+# Description=Assigns debug log messages to the specified log appender.
#log4j.logger.sonar-debug=DEBUG, psRootAppender
# Group=Log levels
-# Description=Assignment of info log messages to a certain log appender
+# Description=Assigns info log messages to the specified log appender.
log4j.logger.sonar-info=INFO, psRootAppender
# Group=Log levels
-# Description=Assignment of warn log messages to a certain log appender
+# Description=Assigns warn log messages to the specified log appender.
log4j.logger.sonar-warn=WARN, psRootAppender
# Group=Log levels
-# Description=Assignment of error log messages to a certain log appender
+# Description=Assigns error log messages to the specified log appender.
log4j.logger.sonar-error=ERROR, psRootAppender
# Group=Log levels
-# Description=Assignment of fatal log messages to a certain log appender
+# Description=Assigns fatal log messages to the specified log appender.
log4j.logger.sonar-fatal=FATAL, psRootAppender
@@ -40,7 +40,7 @@
## 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's tests
+## this section is only for developer tests
##
#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
@@ -53,138 +53,168 @@
######################################### DEBUG
#######################################
-# Group=Debug log messages
-# Description=The maximum number of backup files
+# Group=Debug message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.debugAppender.MaxBackupIndex=11
-# Group=Debug log messages
-# Description=Log file name with a path
+
+# 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 log messages
-# Description=The class responsible for logging layout
+
+# Group=Debug message logging
+# Description=The class responsible for the logging layout.
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-# Group=Debug log messages
-# Description=Log message format
+
+# Group=Debug message logging
+# Description=The log message format.
log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Debug log messages
-# Description=The maximum size of log flie
+
+# 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=Debug log messages
-# Description=The class responsible for appending log messages to log file
+
+# 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=Info log messages
-# Description=The maximum number of backup files
+# Group=Info message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.infoAppender.MaxBackupIndex=11
-# Group=Info log messages
-# Description=Log file name with a path
+
+# 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 log messages
-# Description=The class responsible for logging layout
+
+# Group=Info message logging
+# Description=The class responsible for the logging layout.
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-# Group=Info log messages
-# Description=Log message format
+
+# Group=Info message logging
+# Description=The log message format.
log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Info log messages
-# Description=The maximum size of log flie
+
+# 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=Info log messages
-# Description=The class responsible for appending log messages to log file
+
+# 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=Warn log messages
-# Description=The maximum number of backup files
+# Group=Warn message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.warnAppender.MaxBackupIndex=11
-# Group=Warn log messages
-# Description=Log file name with a path
+
+# 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 log messages
-# Description=The class responsible for logging layout
+
+# Group=Warn message logging
+# Description=The class responsible for the logging layout.
log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-# Group=Warn log messages
-# Description=Log message format
+
+# Group=Warn message logging
+# Description=The log message format.
log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Warn log messages
-# Description=The maximum size of log flie
+
+# 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=Warn log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Warn message logging
+# Description=The class responsible for appending log messages the log file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
######################################### ERROR
#######################################
-# Group=Error log messages
-# Description=The maximum number of backup files
+# Group=Error message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.errorAppender.MaxBackupIndex=11
-# Group=Error log messages
-# Description=Log file name with a path
+
+# 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 log messages
-# Description=The class responsible for logging layout
+
+# Group=Error message logging
+# Description=The class responsible for the logging layout.
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-# Group=Error log messages
-# Description=Log message format
+
+# Group=Error message logging
+# Description=The log message format.
log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Error log messages
-# Description=The maximum size of log flie
+
+# 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=Error log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Error message logging
+# Description=The class responsible for appending log messages the log file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
######################################### FATAL
#######################################
-# Group=Fatal log messages
-# Description=The maximum number of backup files
+# Group=Fatal message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.fatalAppender.MaxBackupIndex=11
-# Group=Fatal log messages
-# Description=Log file name with a path
+
+# 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 log messages
-# Description=The class responsible for logging layout
+
+# Group=Fatal message logging
+# Description=The class responsible for the logging layout.
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-# Group=Fatal log messages
-# Description=Log message format
+
+# Group=Fatal message logging
+# Description=The log message format.
log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=Fatal log messages
-# Description=The maximum size of log flie
+
+# 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=Fatal log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=Fatal message logging
+# Description=The class responsible for appending log messages the log file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
######################################### ALL
#########################################
-# Group=All log messages
-# Description=The maximum number of backup files
+# Group=All message logging
+# Description=The maximum number of backup log files to create.
log4j.appender.psRootAppender.MaxBackupIndex=11
-# Group=All log messages
-# Description=Log file name with a path
+
+# 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 log messages
-# Description=The class responsible for logging layout
+
+# Group=All message logging
+# Description=The class responsible for the logging layout.
log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-# Group=All log messages
-# Description=Log message format
+
+# Group=All message logging
+# Description=The log message format.
log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
-# Group=All log messages
-# Description=The maximum size of log flie
+
+# 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 log messages
-# Description=The class responsible for appending log messages to log file
+
+# Group=All message logging
+# Description=The class responsible for appending log messages the log file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template
2008-03-14 08:42:49 UTC (rev 3516)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template
2008-03-14 10:21:20 UTC (rev 3517)
@@ -22,7 +22,7 @@
service.ma.rrd.rrd_storage_manager_rrd_RRA_default=MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600
-component.registrator.interval=900000
+component.registrator.interval=43200000
component.registrator.scheduler_component=ma_scheduler
service.ma.conf_file.store_type=xmldb
Modified:
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
2008-03-14 08:42:49 UTC (rev 3516)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
2008-03-14 10:21:20 UTC (rev 3517)
@@ -9,19 +9,19 @@
# Configuration of the internal implementation structures
-# Group=Internals
+# Group=Internal
# Description=The type of service used to select the correct message handler
implementation.
service.r.type=ma
-# Group=Internals
+# Group=Internal
# Description=The java class file which implements the ServiceEngine
interface.
service.ma.class_name=org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine
-# Group=Internals
+# Group=Internal
# Description=A CSV of request message types supported by the service.
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
-# Group=Internals
+# Group=Internal
# Description=The java class file which implements the base chaining of
requests.
service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
@@ -32,7 +32,7 @@
# Group=eXist
-# Description=Determines whether the xmld db (eXsit) is used as a storage
for the metadata configuration file (on) or not (off). Currently only the
value 'on' is needed to run the service correctly.
+# Description=Determines whether the xmld db (eXist) is used as a storage
for the metadata configuration file (on) or not (off). Currently only the
value 'on' is needed to run the service correctly.
component.ma.xmldb.db_status=on
# Group=eXist
@@ -98,15 +98,15 @@
service.r.service_description=perfSONAR service
# Group=LS
-# Description=The time (miliseconds) between register requests to the LS
service (default value is 900000 ms; 15 minutes).
-component.registrator.interval=900000
+# Description=The time (miliseconds) between register requests to the LS
service (default value is 43200000 ms; 12 hours).
+component.registrator.interval=43200000
# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).
component.registrator.scheduler_component=ma_scheduler
# Group=LS
-# Description='xmldb' value says that metadata elements for register
requests are taken from xml database. 'file' value means that they are taken
from xml metadata configuration file.
+# Description=Enter 'xmldb' to take metadata elements for register requests
from the XML database, or 'file' to take them from the XML metadata
configuration file.
service.ma.conf_file.store_type=xmldb
Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-03-14
08:42:49 UTC (rev 3516)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-03-14
10:21:20 UTC (rev 3517)
@@ -1,27 +1,27 @@
RRD MA ChangeLog
-2008-02-07 Version 3.0
+2008-03-10 Version 3.0
-- New namespace (netutil) of datum element in the response containing
utilization value is used
-- supportedEventTypes parameter in metadata element (in metadata
cofiguration file) replaced with eventType element
- (the parameter is still supported).
-- Web administration (set of servlets) added.
-- RPM is used as the installation package.
-- AuthN functionality supported.
-- LS register component can now take metadata elements from xml database
directly
- (not only from xml metadata config file)
+- New: support of ErrorResponse message type (use of perfsonar-base library
version 1.0.20080310)
+- New: netutil namespace of datum element in the response containing
utilization value is used.
+- New: WebAdmin administration (set of servlets) added
+- New: RPM is used as the installation package
+- New: Support of AuthN functionality
+- Change: supportedEventTypes parameter in metadata element (in metadata
cofiguration file) replaced with eventType element (the parameter is still
supported)
+- Change: LS register component can now take metadata elements from xml
database directly (not only from XML metadata config file)
+- Change: LS register interval time updated (now it's 12 hours)
2007-11-23 Version 2.3.2
+- New: the dump of rrd test file added
- Fixed Bug #264: bulding the rrdjtool library for 64 bit arch fixed
-- New: the dump of rrd test file added
2007-10-26 Version 2.3.1
-- Fixed Bug: problem with static default context name of eXist in URL
address fixed
+- Fixed Bug #243: problem with static default context name of eXist in URL
address fixed
2007-10-24 Version 2.3
@@ -48,6 +48,8 @@
- Fixed Bug #150: time interval shifted
- Fixed Bug #157: namespace declaration
- Fixed Bug #195: directories structure
+- Fixed Bug #198: exist database installation and initialisation limitations
+- Fixed Bug #221: supportedEventType vs eventType compatibility issue
2007-05-22 Version 2.2
Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/Interface_Specification.doc
===================================================================
(Binary files differ)
Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/schema/ErrorResponse.rnc (from
rev 3516, trunk/geant2_java-rrd-ma/doc/schema/ErrorResponse.rnc)
- perfsonar: r3517 - in branches/GEANT2_JAVA-RRD-MA-STABLE: ant conf doc doc/schema, svnlog, 03/14/2008
Archive powered by MHonArc 2.6.16.