perfsonar development work

Author: roman
Date: 2008-03-03 08:52:50 -0500 (Mon, 03 Mar 2008)
New Revision: 3450

Added:
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/Service_Admin.js
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/b.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/background.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/l.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/lb.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/lt.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/r.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/rb.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/rt.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/stemb.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/stemt.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/t.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/tip_balloon.js
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/top_slice.gif
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/wz_tooltip.js
   
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080303.jar
Removed:
   
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080204.jar
Modified:
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html
   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
Log:

recent changes in the trunke 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-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-03-03 13:52:50 UTC (rev 3450)
@@ -46,8 +46,8 @@
           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.20080226/perfsonar-base-1.0.20080226.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.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-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"/>
 
@@ -65,6 +65,23 @@
     <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"    
todir="${service.home}/${deploy.root}/wsdd"/>
     <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"  
todir="${service.home}/${deploy.root}/wsdd"/>
 
+
+    <!-- start base stuff -->
+    <!-- todo: move to the base -->
+
+    <copy todir="${service.home}/${deploy.root}">
+      <fileset dir="${basedir}/conf/axis-1.4">
+        <exclude name="*.gif"/>
+      </fileset>
+    </copy>
+    <copy todir="${service.home}/${deploy.root}">
+      <fileset dir="${basedir}/conf/axis-1.4">
+        <exclude name="*.js"/>
+      </fileset>
+    </copy>
+
+    <!-- end base stuff -->
+
   </target>
 
 
@@ -245,8 +262,8 @@
     <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.20080226/perfsonar-base-1.0.20080226.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.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-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"/>
 

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template    
2008-03-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/const.properties.template    
2008-03-03 13:52:50 UTC (rev 3450)
@@ -11,7 +11,7 @@
 service.name=geant2_java-rrd-ma
 
 jarfilename=perfsonar-rrd-ma
-version=3.0
+version=3.0rc2
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1
@@ -21,7 +21,7 @@
 wsdd.webservice.name=MeasurementArchiveService
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080204.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar
 
 #rrdjtool native library
 lib_name=libjrrd.so

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-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-03-03 13:52:50 UTC (rev 3450)
@@ -55,8 +55,8 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080226"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.6b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080303"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.7b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 
 

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/Service_Admin.js 
(from rev 3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/Service_Admin.js)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/b.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/b.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/background.gif (from 
rev 3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/background.gif)

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css        
2008-03-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/default.css        
2008-03-03 13:52:50 UTC (rev 3450)
@@ -1,162 +1,181 @@
-/* standard elements */
-
-html {min-height: 100%;}
-
-
-* {
-       margin: 0;
-       padding: 0;
-}
-
-
-body{
-     background-color: #ffffff;
-        font-family: arial;
-}
-
-
-/* title */
-
-.top {
-       display: block;
-       font-family: arial;
-       font-weight: bold;
-       margin: 2% 1% 0 1%;
-       border-top: 1px solid green;
-       border-right: 1px solid green;
-       border-left: 1px solid green;
-       padding: 7px;
-       background: #afdfc0;
-}
-
-.properties{
-
-    font-family: arial;
-       border: 1px solid green;
-       padding: 10px;
-       margin: 0% 1% 0 1%;
-}
- .properties p{
-    font-size: 120%;
-       
-}
-
-.properties table{
-       border-bottom: 1px solid green;
-       margin-bottom: 20px;
-}
-
-.properties td{
-       padding: 15px;
-}
-
-.properties em{  
-       display: block;  
-       color: red;  
-       font-size: 95%;  
-}
-
-.info {
-
-       font-family: arial;
-       font-size: 120%;
-}
-
-.info p{
-   position: relative;
-   left: -230px;  
-}
-
-.content{
-       font-family: arial;
-       font-size: 120%;
-       margin:2% 1% 0 1%;
-       background: #ffffff;
-       }
-       
-.content ul {
-       margin-top: 5px;
-       display: block;
-       list-style: none outside;
-       padding: 5px;
-       border-top: 1px solid green;
-       border-left: 1px solid green;
-       border-right: 1px solid green;
-       }
-       
-.content li {
-       margin: 0 0 0 0;
-       padding: 0px;
-       display: block;
-       float: left;
-       position: relative;
-       top: -1.32em;
-       }
-       
-.content a {
-       padding: 5px;
-       text-decoration: none;
-       color: green;
-       background: #ffffff;
-       }
-       
-.content a:hover {
-       background: #3CB371;
-       color: green;
-       }
-       
-.content #selected {
-       }
-       
-.content #selected a {
-               
-       font-weight: bold;
-       color: green;
-       background: #3CB3A1;
-       }
-       
-.manage {
-
-       background: #ffffff;
-       border-bottom: 1px solid green;
-       border-left: 1px solid green;
-       border-right: 1px solid green;
-       margin:0 1% 0 1%;
-       padding: 1em;
-       }
-
-.showResource{ 
-       font-weight: bold;
-       text-indent: 0%;
-       text-align:inherit;
-       background: #ffffff;
-       
-}
-
-.showResource td{
-       padding: 7px;  
-       
-}
-
-.input {
-       padding: 1em;
-       font-size: 110%;
-       font-family: arial;   
-
-}
-
-.input table{
-       padding: 5px;
-
-}
-.input td{
-       padding: 5px; 
-}
-
-.input th{
-       padding: 5px;
-       text-align: left;
-
-}
-
-
+/* standard elements */
+html {
+    min-height: 100%;
+}
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    background-color: #ffffff;
+    font-family: arial;
+}
+/* title */
+.top {
+    display: block;
+    font-family: arial;
+    font-weight: bold;
+    margin: 2% 1% 0 1%;
+    border-top: 1px solid green;
+    border-right: 1px solid green;
+    border-left: 1px solid green;
+    padding: 7px;
+    background: #afdfc0;
+}
+
+.properties {
+    font-family: arial;
+    font-size: 15px;
+    border: 1px solid green;
+    padding: 10px;
+    margin: 0% 1% 0 1%;
+}
+
+.properties p {
+    font-size: 120%;
+}
+
+.properties div{
+ 
+}
+.properties table {
+    margin-bottom: 20px;
+    border-bottom: 1px solid green;
+}
+
+.properties td {
+    padding: 15px;
+    width: 27%;
+}
+
+.properties em {
+    display: block;
+    color: red;
+    font-size: 95%;
+}
+
+.main{
+   padding: 10px;
+}
+.info {
+    font-family: arial;
+    font-size: 120%;
+    padding: 10px;
+    border: 1px solid green;
+}
+
+.info p {
+    position: relative;
+    #left: -30px;
+}
+
+.tablessContent {
+    margin: 2% 1% 0 1%;
+    background: #ffffff;
+    border-top: 1px solid green;
+    border-left: 1px solid green;
+    border-right: 1px solid green;
+}
+
+.content {
+    font-family: arial;
+    font-size: 120%;
+    margin: 2% 1% 0 1%;
+    background: #ffffff;
+}
+
+.content ul {
+    margin-top: 5px;
+    display: block;
+    list-style: none outside;
+    padding: 5px;
+    border-top: 1px solid green;
+    border-left: 1px solid green;
+    border-right: 1px solid green;
+}
+
+.content li {
+    margin: 0 0 0 0;
+    padding: 0px;
+    display: block;
+    float: left;
+    position: relative;
+    top: -1.32em;
+}
+
+.content a {
+    padding: 5px;
+    text-decoration: none;
+    color: green;
+    background: #ffffff;
+}
+
+.content a:hover {
+    background: #3CB371;
+    color: green;
+}
+
+.content #selected {
+}
+
+.content #selected a {
+    font-weight: bold;
+    color: green;
+    background: #3CB3A1;
+}
+
+.manage {
+    background: #ffffff;
+    border-bottom: 1px solid green;
+    border-left: 1px solid green;
+    border-right: 1px solid green;
+    margin: 0 1% 0 1%;
+    padding: 1em;
+}
+
+.manage table {
+    padding: 5px;
+}
+
+.manage td {
+    padding: 5px;
+}
+
+.manage th {
+    padding: 5px;
+    text-align: left;
+}
+
+.showResource {
+    font-weight: bold;
+    text-indent: 0%;
+    text-align: inherit;
+    background: #ffffff;
+}
+
+.showResource td {
+    padding: 7px;
+}
+
+.input {
+    padding: 1em;
+    font-size: 110%;
+    font-family: arial;
+}
+
+.input table {
+    padding: 5px;
+}
+
+.input td {
+    padding: 5px;
+}
+
+.input th {
+    padding: 5px;
+    text-align: left;
+}
+
+

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html 2008-03-03 
13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/index.html 2008-03-03 
13:52:50 UTC (rev 3450)
@@ -33,25 +33,23 @@
 <th>Administration</th>
 </tr>
 <tr>
-  <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
-    <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
-    <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
+       <td>
+    <p><a href="Wizard" target="main" class="navtex" >Service Configuration 
Wizard</a></p></td>
 </tr>
 <tr>
-  <td><p><a href="ServiceAdmin?serviceProperties" target="main" 
class="navtex" >Service</a></p>
-    <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex" 
>configuration</a></p></td>
+       <td>
+    <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex" 
>Service configuration</a></p></td>
 </tr>
 <tr>
   <td>
-    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>logging</a></p>
-    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>configuration</a>
-      </p>
-    </p></td>
+    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>Logging configuration</a></p></td>
 </tr>
-<tr><td><p><a href="eXistAdmin" target="main" class="navtex" >eXist 
Database</a></p>
-  <p><a href="eXistAdmin" target="main" class="navtex" 
>Administration</a></p></td>
+<td>
+  <p><a href="eXistAdmin" target="main" class="navtex" >eXist Database 
Administration</a></p></td>
 </tr>
 </table>
+
+
 <a href="http://www.perfsonar.net/partners.html";></a> <br>
 <img src="partners.gif" alt="perfSONAR project partners" border="0"/> 
</a></div>
 

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/l.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/l.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/lb.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/lb.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/lt.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/lt.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/r.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/r.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/rb.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/rb.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/rt.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/rt.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/stemb.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/stemb.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/stemt.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/stemt.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/t.gif (from rev 
3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/t.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/tip_balloon.js (from 
rev 3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/tip_balloon.js)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/top_slice.gif (from 
rev 3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/top_slice.gif)

Copied: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/axis-1.4/wz_tooltip.js (from 
rev 3448, trunk/geant2_java-rrd-ma/conf/axis-1.4/wz_tooltip.js)

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template   
2008-03-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/log4j.properties.template   
2008-03-03 13:52:50 UTC (rev 3450)
@@ -4,24 +4,44 @@
 ## author: romradz
 
 
+
+# the path of a directory which contains log files
 logDir=_LOGPATH_
 
 
 ##
-## All log levels is one log file.
+## All log levels in one log file.
 ## Dafaultly debug level is switched off (commented).
 ##
+
+# Group=Log levels
+# Description=Assignment of debug log messages to a certain log appender
 #log4j.logger.sonar-debug=DEBUG, psRootAppender
+
+# Group=Log levels
+# Description=Assignment of info log messages to a certain log appender
 log4j.logger.sonar-info=INFO, psRootAppender
+
+# Group=Log levels
+# Description=Assignment of warn log messages to a certain log appender
 log4j.logger.sonar-warn=WARN, psRootAppender
+
+# Group=Log levels
+# Description=Assignment of error log messages to a certain log appender
 log4j.logger.sonar-error=ERROR, psRootAppender
+
+# Group=Log levels
+# Description=Assignment of fatal log messages to a certain log appender
 log4j.logger.sonar-fatal=FATAL, psRootAppender
 
 
+
 ##
 ## 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
+##
 #log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
 #log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
 #log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
@@ -29,56 +49,151 @@
 #log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
 
 
-#DEBUG
+
+
+######################################### DEBUG 
#######################################
+
+# Group=Debug log messages
+# Description=The maximum number of backup files
 log4j.appender.debugAppender.MaxBackupIndex=11
+# Group=Debug log messages
+# Description=Log file name with a path
 log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+# Group=Debug log messages
+# Description=The class responsible for logging layout
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+# Group=Debug log messages
+# Description=Log message format
 log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=Debug log messages
+# Description=The maximum size of log flie
 log4j.appender.debugAppender.MaxFileSize=500KB
+# Group=Debug log messages
+# Description=The class responsible for appending log messages to log file
 log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
 
-#INFO
+
+
+######################################### INFO 
########################################
+
+# Group=Info log messages
+# Description=The maximum number of backup files
 log4j.appender.infoAppender.MaxBackupIndex=11
+# Group=Info log messages
+# Description=Log file name with a path
 log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+# Group=Info log messages
+# Description=The class responsible for logging layout
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+# Group=Info log messages
+# Description=Log message format
 log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=Info log messages
+# Description=The maximum size of log flie
 log4j.appender.infoAppender.MaxFileSize=500KB
+# Group=Info log messages
+# Description=The class responsible for appending log messages to log file
 log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
 
-#WARN
+
+
+######################################### WARN 
########################################
+
+# Group=Warn log messages
+# Description=The maximum number of backup files
 log4j.appender.warnAppender.MaxBackupIndex=11
+# Group=Warn log messages
+# Description=Log file name with a path
 log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+# Group=Warn log messages
+# Description=The class responsible for logging layout
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+# Group=Warn log messages
+# Description=Log message format
 log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=Warn log messages
+# Description=The maximum size of log flie
 log4j.appender.warnAppender.MaxFileSize=500KB
+# Group=Warn log messages
+# Description=The class responsible for appending log messages to log file
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
-#ERROR
+
+
+######################################### ERROR 
#######################################
+
+# Group=Error log messages
+# Description=The maximum number of backup files
 log4j.appender.errorAppender.MaxBackupIndex=11
+# Group=Error log messages
+# Description=Log file name with a path
 log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+# Group=Error log messages
+# Description=The class responsible for logging layout
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
+# Group=Error log messages
+# Description=Log message format
 log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=Error log messages
+# Description=The maximum size of log flie
 log4j.appender.errorAppender.MaxFileSize=500KB
+# Group=Error log messages
+# Description=The class responsible for appending log messages to log file
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
-#FATAL
+
+
+######################################### FATAL 
#######################################
+
+# Group=Fatal log messages
+# Description=The maximum number of backup files
 log4j.appender.fatalAppender.MaxBackupIndex=11
+# Group=Fatal log messages
+# Description=Log file name with a path
 log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+# Group=Fatal log messages
+# Description=The class responsible for logging layout
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+# Group=Fatal log messages
+# Description=Log message format
 log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=Fatal log messages
+# Description=The maximum size of log flie
 log4j.appender.fatalAppender.MaxFileSize=500KB
+# Group=Fatal log messages
+# Description=The class responsible for appending log messages to log file
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
 
-#ALL
+
+
+######################################### ALL 
#########################################
+
+# Group=All log messages
+# Description=The maximum number of backup files
 log4j.appender.psRootAppender.MaxBackupIndex=11
+# Group=All log messages
+# Description=Log file name with a path
 log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+# Group=All log messages
+# Description=The class responsible for logging layout
 log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
+# Group=All log messages
+# Description=Log message format
 log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=All log messages
+# Description=The maximum size of log flie
+log4j.appender.psRootAppender.MaxFileSize=500KB
+# Group=All log messages
+# Description=The class responsible for appending log messages to log file
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.psRootAppender.MaxFileSize=500KB
 
 
-#ROOT
+
+######################################### ROOT 
#########################################
+
+# this section is only for developer's tests
+
+# ROOT
 #log4j.appender.rootAppender.MaxBackupIndex=11
 #log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template 
2008-03-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template 
2008-03-03 13:52:50 UTC (rev 3450)
@@ -25,3 +25,5 @@
 component.registrator.interval=30000
 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-03 13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2     
  2008-03-03 13:52:50 UTC (rev 3450)
@@ -10,19 +10,19 @@
 
 
 # Group=Internals
-# Description=The name of service type which is used to select correct 
message handler implementation
+# Description=The type of service used to select the correct message handler 
implementation.
 service.r.type=ma
 
 # Group=Internals
-# Description=The name of java class file which implements ServiceEngine 
interface
+# Description=The java class file which implements the ServiceEngine 
interface.
 
service.ma.class_name=org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine
 
 # Group=Internals
-# Description=The names of acceptable request message types
+# Description=A CSV of request message types supported by the service.
 
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
 
 # Group=Internals
-# Description=The name of java class file which implements the base chaining 
of requests
+# Description=The java class file which implements the base chaining of 
requests.
 
service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
 
 
@@ -32,33 +32,31 @@
 
 
 # Group=eXist
-# Description=Indicates whether the xmld db (eXsit) is used as a storage for 
the metadata configuration file or not (off)
-#             Currently only the value 'on' is needed to run the service 
correctly.
+# 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.
 component.ma.xmldb.db_status=on
 
 # Group=eXist
-# Description=Indicates the type of connection to the xml db eXist (xmlrpc 
or http)
-#             Http type is not recommended when transfers of many data are 
expected.
+# Description=The type of connection to the eXist DB (xmlrpc or http). The 
http type is not recommended when transfers of many data are expected.
 component.ma.xmldb.db_access=xmlrpc
 
 # Group=eXist
-# Description=URI address of the collection in xml db eXist that contains 
the metadata confiuration file
+# Description=URI address of the collection in the eXist DB that contains 
the metadata configuration file.
 
component.ma.xmldb.db_uri=xmldb:exist://localhost:8080/exist/xmlrpc/db/rrdmaconfig
 
 # Group=eXist
-# Description=User name of xml db eXist
+# Description=The username for the eXist DB.
 component.ma.xmldb.db_username=rrdmaservice
 
 # Group=eXist
-# Description=User's password
+# Description=The user password for the eXist DB.
 component.ma.xmldb.db_password=rrdmaservice
 
 # Group=eXist
-# Description=Adminitrator's password of xml db eXist
+# Description=The administrator password for the eXist DB.
 component.ma.xmldb.db_adminpassword=
 
 # Group=eXist
-# Description=Indicates how xml db eXist is installed (webapp or stand-alone)
+# Description=Determines how the eXist DB is installed (webapp or 
stand-alone).
 component.ma.xmldb.type=webapp
 
 
@@ -68,41 +66,48 @@
 
 
 # Group=LS
-# Description=Indicates the service type
+# Description=The service type.
 service.r.service_type=ma
 
 # Group=LS
-# Description=URL address of LS service
+# Description=The URL address of the LS service.
 service.r.ls_url=http://somewhere
 
 # Group=LS
-# Description=URL address of the service being configured by this 
configuration file
+# Description=The URL address of the service configured by this 
configuration file.
 service.r.access_point=http://somewhere
 
 # Group=LS
-# Description=Organization name owning the service
+# Description=The name of the organisation who who is deploying the service.
 service.r.organization_name=X
 
 # Group=LS
-# Description=Service name (can contain descriptive multiple words)
+# Description=The name of the service (can contain multiple words).
 service.r.service_name=pS java rrd ma
 
 # Group=LS
-# Description=Version number of the service
+# Description=The version number of the service.
 service.r.service_version=3.0
 
 # Group=LS
-# Description=E-mail address of a person who manages the service
+# Description=The email address of the person who manages the service.
 
service.r.contact_email=user@domain
 
 # Group=LS
-# Description=The time (miliseconds) between register requests to the LS 
service
+# Description=The description of the service.
+service.r.service_description=perfSONAR service
+
+# Group=LS
+# Description=The time (miliseconds) between register requests to the LS 
service.
 component.registrator.interval=30000
 
 # Group=LS
-# Description=The name of scheduler component (the implementation of this 
component must be declared also in components.properties file)
+# 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.
+service.ma.conf_file.store_type=xmldb
 
 
 # 
-----------------------------------------------------------------------------------------------
@@ -111,21 +116,21 @@
 
 
 # Group=Store
-# Description=Indicates whether the functionality of storing new data sent 
to the service is switch on or off
+# Description=Determines whether new data sent to the service is stored (on) 
or not (off).
 service.ma.xmldb.db_store=off
 
 # Group=Store
-# Description=RRDTool parameter used while creating new rrd files
+# Description=RRDTool parameter used while creating new rrd files (see 
RRDTool documentation for details).
 
service.ma.rrd.rrd_storage_manager_rrd_DS_type_default=COUNTER:1800:0:10000000000000
 
 # Group=Store
-# Description=RRDTool parameter used while creating new rrd files
+# Description=RRDTool parameter used while creating new rrd files (see 
RRDTool documentation for details).
 service.ma.rrd.rrd_storage_manager_rrd_step_default=300
 
 # Group=Store
-# Description=RRDTool parameter used while creating new rrd files
+# Description=RRDTool parameter used while creating new rrd files (see 
RRDTool documentation for details).
 
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
 
 # Group=Store
-# Description=The directory where new rrd files will be located
+# Description=The directory where new rrd files are stored.
 service.ma.rrd.xmldb.db_store.data_dir=/home/perfsonar

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-03-03 
13:40:02 UTC (rev 3449)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/doc/ChangeLog.txt        2008-03-03 
13:52:50 UTC (rev 3450)
@@ -8,16 +8,22 @@
   (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)
 
+
 2007-11-23 Version 2.3.2
 
 - 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
 
+
 2007-10-24 Version 2.3
 
 - New: support for two additional characteristics: ifErrors and ifDiscards

Deleted: 
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080204.jar

Copied: 
branches/GEANT2_JAVA-RRD-MA-STABLE/lib/misc/perfsonar-base-ant-1.0.20080303.jar
 (from rev 3448, 
trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080303.jar)