perfsonar development work

Author: roman
Date: 2008-03-14 07:34:32 -0400 (Fri, 14 Mar 2008)
New Revision: 3518

Added:
   branches/GEANT2_JAVA-SQL-MA-STABLE/doc/schema/general/ErrorResponse.rnc
Modified:
   branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
   branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
   branches/GEANT2_JAVA-SQL-MA-STABLE/conf/log4j.properties.template
   branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template
   branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template-2
   branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
   branches/GEANT2_JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
Log:
changes done in the trunk (geant2_java-sql-ma) between rev numbers 3479 and 
3517 merged



Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml      
2008-03-14 10:21:20 UTC (rev 3517)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml      
2008-03-14 11:34:32 UTC (rev 3518)
@@ -45,7 +45,7 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <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/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -322,7 +322,7 @@
 
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.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"/>
@@ -366,15 +366,44 @@
              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/sql-database_TEST.xml${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 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"
           append="true" />
 

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml    
2008-03-14 10:21:20 UTC (rev 3517)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml    
2008-03-14 11:34:32 UTC (rev 3518)
@@ -54,7 +54,7 @@
 
     <artifact:dependencies>
 
-      <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="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.0rc2"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/conf/log4j.properties.template
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/log4j.properties.template   
2008-03-14 10:21:20 UTC (rev 3517)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/log4j.properties.template   
2008-03-14 11:34:32 UTC (rev 3518)
@@ -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-SQL-MA-STABLE/conf/service.properties.template
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template 
2008-03-14 10:21:20 UTC (rev 3517)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template 
2008-03-14 11:34:32 UTC (rev 3518)
@@ -16,7 +16,7 @@
 
 service.ma.xmldb.db_store=off
 
-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-SQL-MA-STABLE/conf/service.properties.template-2
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template-2     
  2008-03-14 10:21:20 UTC (rev 3517)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/conf/service.properties.template-2     
  2008-03-14 11:34:32 UTC (rev 3518)
@@ -99,8 +99,8 @@
 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).

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt        2008-03-14 
10:21:20 UTC (rev 3517)
+++ branches/GEANT2_JAVA-SQL-MA-STABLE/doc/ChangeLog.txt        2008-03-14 
11:34:32 UTC (rev 3518)
@@ -1,7 +1,7 @@
 Relational Database MA
 
 
-2008-02-18 Version 2.0
+2008-03-12 Version 2.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
@@ -9,6 +9,10 @@
 - 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).
+- LS register interval time updated (now it's 12 hours).
+- Support of ErrorResponse message type (use of perfsonar-base library 
version 1.0.20080310)
 
 
 2007-11-08 Version 1.3

Modified: branches/GEANT2_JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
===================================================================
(Binary files differ)

Copied: 
branches/GEANT2_JAVA-SQL-MA-STABLE/doc/schema/general/ErrorResponse.rnc (from 
rev 3517, trunk/geant2_java-sql-ma/doc/schema/general/ErrorResponse.rnc)