perfsonar development work

Author: roman
Date: 2008-07-28 09:45:44 -0400 (Mon, 28 Jul 2008)
New Revision: 4306

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/ant/webapp-package-targets.xml
   branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties
   branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
   branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties
   branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
   branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
   branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4257:4305)



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-07-28 12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-07-28 13:45:44 UTC (rev 4306)
@@ -46,7 +46,7 @@
           depends="copy-dep-base-service-jars">
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.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"/>
@@ -263,7 +263,7 @@
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-07-28 12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-07-28 13:45:44 UTC (rev 4306)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080630"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080721"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.3b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>
 

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml   
2008-07-28 12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/ant/webapp-package-targets.xml   
2008-07-28 13:45:44 UTC (rev 4306)
@@ -84,7 +84,7 @@
     <!-- copy jar files -->
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"           
                                     todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties    2008-07-28 
12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.properties    2008-07-28 
13:45:44 UTC (rev 4306)
@@ -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: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties     
2008-07-28 12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/log4j.syslog.properties     
2008-07-28 13:45:44 UTC (rev 4306)
@@ -54,7 +54,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.
@@ -82,7 +82,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.
@@ -110,7 +110,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.
@@ -138,7 +138,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.
@@ -166,7 +166,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.
@@ -194,7 +194,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.
@@ -240,7 +240,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: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties  2008-07-28 
12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/service.properties  2008-07-28 
13:45:44 UTC (rev 4306)
@@ -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: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties   2008-07-28 
12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/wizard.properties   2008-07-28 
13:45:44 UTC (rev 4306)
@@ -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>
 

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-07-28 
12:37:22 UTC (rev 4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-07-28 
13:45:44 UTC (rev 4306)
@@ -1,14 +1,17 @@
 RRD MA ChangeLog
 
-2008-07-17 Version 3.1
+2008-07-23 Version 3.1
 
+- New: available as deb package
 - New: EchoRequest message allows now checking: if eXist database is running 
and the count the content of metadata configuration file; access data from 
random RRD file. It is also possible to request a self-test including all 
above.
 - New: parameter keyword introduced in metadata block to indicate 
project/organisation name
 - New: new request MeasurementArchiveStoreRequest switched off by default
 - New: performance improvements for MetadataKeyRequest message which fetches 
all metadata elements
+- Change: eXist default port is 8180
 - Change: format of log messages changed
-- Change: use of pSbase v1.0.20080630
+- Change: use of pSbase v1.0.20080721
 - Change: obsolete authRealm removed from metadata configuration file
+- Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)
 
 2008-03-10 Version 3.0
 
@@ -21,6 +24,8 @@
 - 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)
 - Change: service name has changed (now it is geant2-java-rrd-ma)
+- Fixed Bug #304: SetupDataResponse documentation not consistent
+- Fixed Bug #348: LS registration failed
 
 
 2007-11-23 Version 2.3.2
@@ -31,7 +36,7 @@
 
 2007-10-26 Version 2.3.1
 
-- Fixed Bug #243: 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
 
 
 2007-10-24 Version 2.3
@@ -59,7 +64,15 @@
 - Fixed Bug #157: namespace declaration
 - Fixed Bug #195: directories structure
 - Fixed Bug #198: exist database installation and initialisation limitations
+- Fixed Bug #205: collection name inside eXist is "rrdmaconfig" by default
 - Fixed Bug #221: supportedEventType vs eventType compatibility issue
+- Fixed Bug #222: overwriting parameter elements in the key
+- Fixed Bug #224: schema incomplete for LookupInfoResponse
+- Fixed Bug #225: chained metadata accepted in LookupInfo in contrary to rnc
+- Fixed Bug #226: LookupInfoRequest with no id in Data element accepted
+- Fixed Bug #234: proper strings handling
+- Fixed Bug #236: store - missing interface element
+- Fixed Bug #240: LookupInfo documentation not updated
 
 
 2007-05-22 Version 2.2

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml  2008-07-28 12:37:22 UTC (rev 
4305)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/pom.xml  2008-07-28 13:45:44 UTC (rev 
4306)
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-base</artifactId>
-      <version>1.0.20080630</version>
+      <version>1.0.20080721</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>