perfsonar development work

Author: mac
Date: 2008-03-12 07:18:29 -0400 (Wed, 12 Mar 2008)
New Revision: 3491

Added:
   trunk/geant2_java-xml-ls/ant/rpm-all.sh
   trunk/geant2_java-xml-ls/conf/axis-1.4/Service_Admin.js
   trunk/geant2_java-xml-ls/conf/axis-1.4/b.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/background.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/l.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/lb.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/lt.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/r.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/rb.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/rt.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/sqlma_admin_script.js
   trunk/geant2_java-xml-ls/conf/axis-1.4/stemb.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/stemt.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/t.gif
   trunk/geant2_java-xml-ls/conf/axis-1.4/tip_balloon.js
   trunk/geant2_java-xml-ls/conf/axis-1.4/tip_centerwindow.js
   trunk/geant2_java-xml-ls/conf/axis-1.4/tip_followscroll.js
   trunk/geant2_java-xml-ls/conf/axis-1.4/wizard.properties
   trunk/geant2_java-xml-ls/conf/axis-1.4/wizardproperties.dtd
   trunk/geant2_java-xml-ls/conf/axis-1.4/wz_tooltip.js
Modified:
   trunk/geant2_java-xml-ls/ant/const.properties.template
   trunk/geant2_java-xml-ls/ant/release-targets.xml
   trunk/geant2_java-xml-ls/conf/axis-1.4/default.css
   trunk/geant2_java-xml-ls/conf/axis-1.4/index.html
   trunk/geant2_java-xml-ls/conf/axis-1.4/perfsonar.png
   trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
   trunk/geant2_java-xml-ls/conf/servlet.properties
   trunk/geant2_java-xml-ls/doc/changelog.txt
   
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/webadmin/LSWizardHandler.java
Log:
- new WebAdmin library 0.7
- new Wizard handler serving comments
- comments in configuration files
- scripts for RPM generation
- new webadmin webpage (webadmin 0.7)



Modified: trunk/geant2_java-xml-ls/ant/const.properties.template
===================================================================
--- trunk/geant2_java-xml-ls/ant/const.properties.template      2008-03-12 
08:55:21 UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/ant/const.properties.template      2008-03-12 
11:18:29 UTC (rev 3491)
@@ -26,6 +26,5 @@
 
 nmwg-jar-ver=1.0.20080124
 ps-antxml-ver=1.0.20080204
-ps-jar-ver=1.0.20080207
-ps-webadmin=0.6b
-
+ps-jar-ver=1.0.20080310
+ps-webadmin=0.7b
\ No newline at end of file

Modified: trunk/geant2_java-xml-ls/ant/release-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/release-targets.xml    2008-03-12 08:55:21 
UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/ant/release-targets.xml    2008-03-12 11:18:29 
UTC (rev 3491)
@@ -44,6 +44,7 @@
     <delete dir="tmp/XML-LS-${release.version}/build/org"/>
     <delete dir="tmp/XML-LS-${release.version}/bin"/>
     <delete dir="tmp/XML-LS-${release.version}/release"/>
+    <delete dir="tmp/XML-LS-${release.version}/rpm"/>
 
     <delete file="tmp/XML-LS-${release.version}/conf/components.properties"/>
     <delete file="tmp/XML-LS-${release.version}/conf/service.properties"/>

Added: trunk/geant2_java-xml-ls/ant/rpm-all.sh


Property changes on: trunk/geant2_java-xml-ls/ant/rpm-all.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/Service_Admin.js

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/b.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/b.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/background.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/background.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/geant2_java-xml-ls/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2_java-xml-ls/conf/axis-1.4/default.css  2008-03-12 08:55:21 
UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/conf/axis-1.4/default.css  2008-03-12 11:18:29 
UTC (rev 3491)
@@ -1,171 +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;
-}
-
-.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;
-}
-
-
+/* 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: trunk/geant2_java-xml-ls/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-xml-ls/conf/axis-1.4/index.html   2008-03-12 08:55:21 
UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/conf/axis-1.4/index.html   2008-03-12 11:18:29 
UTC (rev 3491)
@@ -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>
 

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/l.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/l.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/lb.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/lb.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/lt.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/lt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/geant2_java-xml-ls/conf/axis-1.4/perfsonar.png
===================================================================
(Binary files differ)

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/r.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/r.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/rb.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/rb.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/rt.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/rt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/sqlma_admin_script.js

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/stemb.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/stemb.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/stemt.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/stemt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/t.gif


Property changes on: trunk/geant2_java-xml-ls/conf/axis-1.4/t.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/tip_balloon.js

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/tip_centerwindow.js

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/tip_followscroll.js

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/wizard.properties

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/wizardproperties.dtd

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/wz_tooltip.js

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties        
2008-03-12 08:55:21 UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties        
2008-03-12 11:18:29 UTC (rev 3491)
@@ -3,21 +3,21 @@
 
 # --------------- Common components -----------------------------
 
-#Configuration component - must be the first one!
+# Group=Configuration
+# Description=Configuration component - must be declared as the first one in 
this configuration!
 
config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
-#Logger component - must be the second one!
+# Group=Logging
+# Description=Logger component - must be decalred as the second one in this 
configuration!
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 # ---------------- Service specific components -------------------
 
-#Lookup service scheduler, needs for other functionalities such as LS 
Cleanup, MLS
+# Group=Scheduler
+# Description=Lookup service scheduler, needed for other functionalities 
such as LS Cleanup, dLS
 
ls_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
-# LS Cleanup (loads by LSCleanupLoader, needs scheduler)
-# To enable remove "" prefix
+# Group=Scheduler
+# Description=LS Cleanup component (loads by LSCleanupLoader, needs 
scheduler)
 ls_cleanup_loader=org.perfsonar.service.lookupService.xmlType.LSCleanupLoader
 
-# Multidomain LS
-# To enable remove "#MULTILS:" prefix
-#...

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties     2008-03-12 
08:55:21 UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/log4j.properties     2008-03-12 
11:18:29 UTC (rev 3491)
@@ -4,24 +4,44 @@
 ## author: romradz
 
 
+
+# the path of a directory which contains log files
 logDir=/home/perfsonar/webapps/XML-LS/WEB-INF/logs
 
 
 ##
-## All log levels is one log file.
+## All log levels in one log file.
 ## Dafaultly debug level is switched off (commented).
 ##
-log4j.logger.sonar-debug=DEBUG, psRootAppender
+
+# 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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/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=/home/perfsonar/webapps/XML-LS/WEB-INF/logs/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-03-12 
08:55:21 UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-03-12 
11:18:29 UTC (rev 3491)
@@ -1,24 +1,112 @@
-#Wed Jan 30 15:28:06 GMT+01:00 2008
-service.r.service_type=ls
+# this template file is prepared for the releases with web admin stuff and 
packaged in rpm form
+# $Id$
+# romradz, mac
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of the LS Cleanup
+
+# Group=Cleanup
+# Description=Action run interval in seconds
+component.ls_cleanup_loader.interval=300
+
+# Group=Cleanup
+# Description=The name of scheduler component (do not change it)
+component.ls_cleanup_loader.scheduler_component=ls_scheduler
+
+# Group=Cleanup
+# Description=The name of the storage component (do not change it)
 component.ls_cleanup_loader.storage_component=ls_storage
-service.ls.db_adminpassword=
+
+# Group=Cleanup
+# Description=Maximal acceptable TTL (unused)
+service.ls.max_ttl=
+
+# Group=Cleanup
+# Description=Minimal acceptable TTL (unused)
+service.ls.min_ttl=1200
+
+# Group=Cleanup
+# Description=Default TTL (in seconds)
 service.ls.ttl=86400
-component.ls_cleanup_loader.scheduler_component=ls_scheduler
-service.ls.db_status=on
-service.ls.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db/ls
-service.ls.db_password=sonar
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of paths
+
+# Group=Paths
+# Description=The path for log4j properties file
 
service.log.log4j.config=/home/perfsonar/webapps/XML-LS/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+# Group=Paths
+# Description=The path for NMWG parser properties file
+service.sax_parser.config=/home/perfsonar/webapps/XML-LS/WEB-INF/classes/perfsonar/conf/objects.config
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of various options
+
+# Group=Options
+# Description=Allow replace
+service.ls.allow_replace=yes
+
+# Group=Options
+# Description=Service type 1
+service.r.service_type=ls
+
+# Group=Options
+# Description=Service type 2
 service.r.type=ls
+
+# Group=Options
+# Description=Service Engine classname
+service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
+
+# Group=Options
+# Description=Accepted message types
+service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest,LSCleanup
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of Database access
+
+# Group=Database
+# Description=Create username and collection for the database (by LS 
WebAdmin Wizard servlet)
+initialize.db=yes
+
+# Group=Database
+# Description=Database URI
+service.ls.db_uri=http\://localhost\:8080/exist/rest/db/ls
+
+# Group=Database
+# Description=Database access (http/xmlrpc)
+service.ls.db_access=http
+
+# Group=Database
+# Description=The name of the collection
 service.ls.db_username=lookupservice
-component.ls_cleanup_loader.interval=300
-service.ls.min_ttl=1200
-service.sax_parser.config=/home/perfsonar/webapps/XML-LS/WEB-INF/classes/perfsonar/conf/objects.config
-service.ls.db_uri=http\://localhost\:8080/exist/rest/db/ls
+
+# Group=Database
+# Description=Database password for selected username
+service.ls.db_password=sonar
+
+# Group=Database
+# Description=Admin password
+service.ls.db_adminpassword=
+
+# Group=Database
+# Description=Class of the connector
 
service.ls.db_type=org.perfsonar.service.lookupService.xmlType.storage.exist.XQueryExistDAOImpl
-service.ls.max_ttl=
-service.ls.db_access=http
+
+# Group=Database
+# Description=Default uri for HTTP connector
 service.ls.db_uri.http=http\://localhost\:8080/exist/rest/db/ls
+
+# Group=Database
+# Description=Default url for XML RPC connector
+service.ls.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db/ls
+
+# Group=Database
+# Description=DB status (do not change)
+service.ls.db_status=on
+
+# Group=Database
+# Description=Database configuration type (do not change)
 service.ls.exist_type=webapp
-service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest,LSCleanup
-service.ls.allow_replace=yes
-service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
+

Modified: trunk/geant2_java-xml-ls/conf/servlet.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/servlet.properties    2008-03-12 08:55:21 
UTC (rev 3490)
+++ trunk/geant2_java-xml-ls/conf/servlet.properties    2008-03-12 11:18:29 
UTC (rev 3491)
@@ -2,8 +2,6 @@
 servlet.service_type=rrdma
 
 #The ConfigurationHandler interface implementation used by the Wizard Servlet
-#servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler
 
-
 
servlet.wizard.external_handler=org.perfsonar.service.lookupService.xmlType.webadmin.LSWizardHandler
 
 #The username used for authentication reasons when accessing properties 
configuration and Wizard servlets

Modified: trunk/geant2_java-xml-ls/doc/changelog.txt
===================================================================
--- trunk/geant2_java-xml-ls/doc/changelog.txt  2008-03-12 08:55:21 UTC (rev 
3490)
+++ trunk/geant2_java-xml-ls/doc/changelog.txt  2008-03-12 11:18:29 UTC (rev 
3491)
@@ -28,7 +28,12 @@
 - webadmin servlets
 - new documentation
 
+XML LS 1.2 RC4
+- web admin comments, wizard changes
+- helper scripts for creating RPMs
+- comments in config files
 
+
 XML LS 1.3-planned functionality:
 - manual TTL for registration
 - LSCleanup time in new format!

Modified: 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/webadmin/LSWizardHandler.java
===================================================================
--- 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/webadmin/LSWizardHandler.java
    2008-03-12 08:55:21 UTC (rev 3490)
+++ 
trunk/geant2_java-xml-ls/src/main/java/org/perfsonar/service/lookupService/xmlType/webadmin/LSWizardHandler.java
    2008-03-12 11:18:29 UTC (rev 3491)
@@ -1,6 +1,7 @@
 package org.perfsonar.service.lookupService.xmlType.webadmin;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Calendar;
@@ -9,6 +10,9 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import perfSONARWebAdmin.auxiliary.PerfsonarProperties;
+import perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl;
+import perfSONARWebAdmin.auxiliary.PerfsonarProperty;
 import perfSONARWebAdmin.auxiliary.ServiceProperties;
 import perfSONARWebAdmin.auxiliary.ServicePropertiesImpl;
 import perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler;
@@ -18,12 +22,20 @@
 import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBManager;
 import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBManagerImpl;
 
-
+/**
+ * Class handling LS WebAdmin wizard
+ * 
+ * @author Michalis Michael
+ * @author Maciej Glowiak
+ *
+ */
 public class LSWizardHandler implements ConfigurationHandler {
 
+    
         // 
-----------------------------------------------------------------------
         // class fields
 
+    
         // Hashtable containg Wizard Properties as values and the various 
groups in
         // which the properties are divided to as keys
         private Hashtable<String, WizardProperties> groupedProperties = null;
@@ -48,7 +60,8 @@
                 + "log4j.properties";
 
         // The path to the componenets.properties file
-        private static final String ComponentsPropertiesPath = confPath
+        @SuppressWarnings("unused")
+               private static final String ComponentsPropertiesPath = 
confPath
                 + "components.properties";
 
         // The path to the objects properties file
@@ -69,6 +82,8 @@
         // Bollean that states if the configuration process is finished
         private static boolean configured = false;
         
+        
+        
         // 
-----------------------------------------------------------------------
         // constructors
 
@@ -79,9 +94,14 @@
 
         }
 
+        
+        
         // 
-----------------------------------------------------------------------
         // public methods
 
+        
+        
+        
         /*
          * (non-Javadoc)
          * 
@@ -181,9 +201,14 @@
 
         }
 
+        
+        
+        
         // 
-----------------------------------------------------------------------
         // private methods
 
+        
+        
 
         /**
          * Method used for handling eXist database configuration
@@ -224,16 +249,28 @@
                 groupedProperties.put("eXist", existProperties);
                 try {
                     // Using the serviceProperties class for setting the 
property
-                    ServiceProperties serviceProperties;
-
-                    serviceProperties = new ServicePropertiesImpl(ServicePath
-                            + ServicePropertiesPath);
                     
-                    // Property set
-                    serviceProperties.setProperty(useExistProperty.getKey(),
-                            useExistProperty.getValue());
+                       //Changing to PerfsonarProperties to maintain 
grouping and description
+                       PerfsonarProperties serviceProperties = new 
PerfsonarPropertiesImpl();
+                    
+                    //Loading properties from service.properties file 
+                    serviceProperties.loadProperties(new 
FileInputStream(ServicePath
+                                               + ServicePropertiesPath));
+                    
+                    String key = useExistProperty.getKey();
+                    // Retrieve the PerfsonarProperty from service.properties
+                    PerfsonarProperty property = 
serviceProperties.getProperty(key);
+                               // If key property does not exist the throw 
an exception
+                               if (property == null) {
+                                       throw new IOException("Key is invalid 
" + statusKey + " ");
+                               } else {
+                                       // Change the value of the property
+                                       
property.setValue(useExistProperty.getValue());
+                                       serviceProperties.setProperty(key, 
property);
+                               }
                     // new Properties stored
-                    serviceProperties.storeProperties();
+                               serviceProperties.storeProperties(new 
FileOutputStream(ServicePath
+                                               + ServicePropertiesPath));
                     // Set done to true
                     done = true;
                     
@@ -300,21 +337,33 @@
         private void existActions(WizardProperties finalProperties)
                 throws Exception {
 
-           
             // Initiating ServiceProperties classes for handling input to the
             // service.properties and servlet.properties file
-            ServiceProperties serviceProperties = new ServicePropertiesImpl(
-                    ServicePath + ServicePropertiesPath);
+
+               
+               //Change from ServicePropereties to PerfsonarProperties
+               //This is necessay to keep grouping and description for 
properties
+               PerfsonarProperties serviceProperties = new 
PerfsonarPropertiesImpl();
+               serviceProperties.loadProperties(new 
FileInputStream(ServicePath
+                               + ServicePropertiesPath));
+
             // Any changes happening to the URL of the exist db and on the 
admin
             // password should be reflected on the servlet.properties as well
+               
+               //The change to PerfsonarProperties in to necessary for 
servlet.properties because
+               //no  grouping or description is needed there
             ServiceProperties servletProperties = new ServicePropertiesImpl(
                     ServicePath + ServletPropertiesPath);
+            
             // Get an iterator for all service properties
-            Iterator it = 
serviceProperties.getProperties().keySet().iterator();
+            Iterator it = serviceProperties.getKeysIterator();
+                        
             // Get the type of the service. Will be used for making the new 
db
             // collection
-            String serviceName = servletProperties.getProperty(
+            @SuppressWarnings("unused")
+                       String serviceName = servletProperties.getProperty(
                     "servlet.service_type").trim();
+                        
             // Naming the new collection on exist db
             //String dbCollection = serviceName + "config";
             // Initializing all necessary fileds
@@ -324,11 +373,15 @@
             String username = null;
             String password = null;
             // Need to get the new xmlDBURI and old and new admin password 
so that
-            // we can make the changes
+            // we can make the changes            
+            
             while (it.hasNext()) {
+                
                 String key = (String) it.next();
+                        
                 if (key.endsWith(".db_adminpassword")) {
-                    adminPass = serviceProperties.getProperty(key).trim();
+                       adminPass = 
serviceProperties.getProperty(key).getValue()
+                                       .trim();
                     newAdminPass = finalProperties.getProperty(key).trim();
                 }
                 if (key.endsWith(".db_uri")) {
@@ -341,21 +394,32 @@
                 adminPass = "";
             }
 
-            it = finalProperties.orderedKeys();
+            it = finalProperties.orderedKeys();            
             // Iterating though tthe users input
             while (it.hasNext()) {
                 String key = (String) it.next();
                 // The input from the user is also set in service properties 
with a
                 // slight modification for tyhe xmldb uri. We need to add the
                 // collection at the end of the URI
-                
-                serviceProperties.setProperty(key, finalProperties
-                        .getProperty(key));
+                PerfsonarProperty property = new PerfsonarProperty();
+                property = serviceProperties.getProperty(key);
+                property.setValue(finalProperties.getProperty(key));
+                serviceProperties.setProperty(key,property);
 
                 if (key.endsWith(".db_uri")) {
-                    serviceProperties.setProperty(key, existURI);
-                    serviceProperties.setProperty(key+".xmlrpc", 
getXMLDBUri(existURI));
-                    serviceProperties.setProperty(key+".http", 
getHTTPUri(existURI));
+                       property = new PerfsonarProperty();
+                       property = serviceProperties.getProperty(key);
+                       property.setValue(existURI);
+                       serviceProperties.setProperty(key,property);
+
+                       property = 
serviceProperties.getProperty(key+".xmlrpc");
+                       property.setValue(getXMLDBUri(existURI));
+                       serviceProperties.setProperty(key+".xmlrpc",property);
+                       
+                       property = serviceProperties.getProperty(key+".http");
+                       property.setValue(getHTTPUri(existURI));
+                       serviceProperties.setProperty(key+".http",property);
+        
                 }
                 
                 // Setting also the wizard properties
@@ -372,13 +436,22 @@
                 }
                 
                 //mac
-                serviceProperties.storeProperties();
+                serviceProperties.storeProperties(new 
FileOutputStream(ServicePath
+                                       + ServicePropertiesPath));
 
             }
 
+            log("results: ");
+            log("  username="+username);
+            log("  password="+password);
+            log("  adminPass="+adminPass);
+            log("  newAdminPass="+newAdminPass);
+            log("  existURI="+existURI);
+            
             //if not to initialize db, don't do it!
             String initDb = finalProperties.getProperty("initialize.db");
             if ("yes".equals(initDb)) {
+                log("  initdb=yes");
             
                 //System.out.println("[ ] Initialize DB "+existURI+", 
"+adminPass);
                 
@@ -389,7 +462,8 @@
                     //xmldb:exist://localhost:8080/exist/xmlrpc/db/ls
                     //http://localhost:8080/exist/rest/db/ls
                     String uri = getXMLDBUri(existURI);
-                    
+                    log("  uri1="+uri);
+
                     //remove /db/anything
                     String dbCollection="";
                     int a = uri.indexOf("/db/");
@@ -403,10 +477,11 @@
                             ex.printStackTrace();        
                         }
                     }
-                    
+                    log("  uri2="+uri);
+
                     xmlDBManager manager = new xmlDBManagerImpl(uri, "admin",
                             adminPass);
-                    
+
                     // Creating collection and users
                     manager.createCollection(dbCollection);
                     manager.createUser(dbCollection, username, password, 
null);
@@ -419,12 +494,15 @@
                     manager.getCollection(dbCollection).addDocument(file, 
username);
                     file = new 
File(this.getClass().getResource("/perfsonar/conf/LSStore-control.xml").toURI());
                     manager.getCollection(dbCollection).addDocument(file, 
username);
+
                 }
                 //Modifying the admin user password
                 //manager.modifyUser("admin", newAdminPass, null, null);
                 
                 //mac - moved here, check it!!
-                serviceProperties.storeProperties();
+                serviceProperties.storeProperties(new 
FileOutputStream(ServicePath
+                                       + ServicePropertiesPath));
+
                 
             }
             
@@ -442,15 +520,25 @@
          * @throws Exception
          */
         public boolean finishConfiguration() throws Exception {
+          
+               PerfsonarProperties serviceProperties = new 
PerfsonarPropertiesImpl();
+               serviceProperties.loadProperties(new 
FileInputStream(ServicePath
+                               + ServicePropertiesPath));
+               PerfsonarProperty property = new PerfsonarProperty();
+               property.setKey("service.sax_parser.config");
+               property.setValue(ServicePath + ObjectsConfigPath);
+               property.setGroup("Internals");
+               property.setDescription("Sax parser configuration parameter");
+               serviceProperties.setProperty(property.getKey(), property);
+               property = new PerfsonarProperty();
+               property.setKey("service.log.log4j.config");
+               property.setValue(ServicePath + LoggingPropertiesPath);
+               property.setGroup("Internals");
+               property.setDescription("Logging Properties path");
+               serviceProperties.setProperty(property.getKey(), property);
+               serviceProperties.storeProperties(new 
FileOutputStream(ServicePath
+                               + ServicePropertiesPath));
 
-            ServiceProperties serviceProperties = new ServicePropertiesImpl(
-                    ServicePath + ServicePropertiesPath);
-            serviceProperties.setProperty("service.sax_parser.config", 
ServicePath
-                    + ObjectsConfigPath);
-            serviceProperties.setProperty("service.log.log4j.config", 
ServicePath
-                    + LoggingPropertiesPath);
-            serviceProperties.storeProperties();
-
             return true;
 
         }
@@ -498,22 +586,9 @@
             return uri;
         }
         
-
-        private void showServiceProperties(ServiceProperties 
serviceProperties) {
-          System.out.println("==finishConfiguration.serviceProperties==");
-          for (Object key : serviceProperties.getProperties().keySet()) {
-              System.out.println(key+"  =  
"+serviceProperties.getProperty((String)key));
-          }
-          System.out.println();
-
+       
+        private void log(String s) {
+            //System.out.println("[LS Wizard] "+s);
         }
-
-        private void showServiceProperties(WizardProperties wizProperties) {
-            System.out.println("==handleExist.existProperties==");
-            for (Object key : wizProperties.keySet()) {
-                System.out.println(key+"  =  
"+wizProperties.getProperty((String)key));
-            }
-            System.out.println();
-        }
         
 } //LSWizardHandler