perfsonar development work

Author: melis
Date: 2008-02-06 10:15:39 -0500 (Wed, 06 Feb 2008)
New Revision: 3318

Added:
   trunk/geant2_java-sshtelnet-mp/conf/servlet.properties
   trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
   trunk/geant2_java-sshtelnet-mp/doc/commands/
   
trunk/geant2_java-sshtelnet-mp/doc/commands/commands-complete-list-v5-SM.xls
   trunk/geant2_java-sshtelnet-mp/doc/commands/commands_minimum_set-v5-SM.xls
Modified:
   trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
   trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
   trunk/geant2_java-sshtelnet-mp/ant/const.properties
   trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
   trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
   trunk/geant2_java-sshtelnet-mp/conf/components.properties
   trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
   trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/service.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
   
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
   
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/MetadataConfiguration.java
Log:
added development for 1.3RC1

Modified: trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml  2008-02-06 
14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml  2008-02-06 
15:15:39 UTC (rev 3318)
@@ -54,8 +54,8 @@
 
     <copy file="${basedir}/conf/eventType-map.xml"                           
     todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
     <copy file="${basedir}/conf/eventType-rules.xml"                         
     todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+       <copy file="${basedir}/conf/metadata.xml"                             
            
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
 
-
     <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"/>
 

Modified: trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml    2008-02-06 
14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/ant/configure-targets.xml    2008-02-06 
15:15:39 UTC (rev 3318)
@@ -82,7 +82,7 @@
                      <entry  key="service.sax_parser.config"   
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
                      <entry  key="service.log.log4j.config"    
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
 
-                         <entry key="service.ls.registration_file" value=""/>
+                         <entry key="service.ls.registration_file" 
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/metadata.xml"/>
                          
                      <!-- for LookupInfoRequest message -->
                      <entry  key="service.r.service_type"    value="mp"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-02-06 14:50:06 
UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-02-06 15:15:39 
UTC (rev 3318)
@@ -8,10 +8,10 @@
 
 target.server=127.0.0.1
 
-service.name=JAVA-SSHTELNET-MP
+service.name=geant2_java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3-RC1
+version=1.3RC1
 
 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

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-02-06 14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-02-06 15:15:39 UTC (rev 3318)
@@ -8,10 +8,10 @@
 
 target.server=127.0.0.1
 
-service.name=JAVA-SSHTELNET-MP
+service.name=geant2_java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3-RC1
+version=1.3RC1
 
 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

Modified: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml        
2008-02-06 14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml        
2008-02-06 15:15:39 UTC (rev 3318)
@@ -59,10 +59,11 @@
 
     <artifact:dependencies>
 
-      <dependency groupId="rrdjtool"  artifactId="rrdjtool"       
version="1.0"/>
-      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20080115"/>
-      <dependency groupId="nmwg"      artifactId="nmwg"           
version="1.0.20071008"/>
+      <dependency groupId="rrdjtool"  artifactId="rrdjtool"            
version="1.0"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-base"      
version="1.0.20080115"/>
+      <dependency groupId="nmwg"      artifactId="nmwg"                
version="1.0.20071008"/>
 
+
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>
 

Modified: trunk/geant2_java-sshtelnet-mp/conf/components.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/components.properties   2008-02-06 
14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/conf/components.properties   2008-02-06 
15:15:39 UTC (rev 3318)
@@ -1,20 +1,24 @@
 # File contains components to load
 # Config and logger MUST be load as first!
 
-
-#Configuration component - must be the first one!
+#Group=PropertiesConfiguration
+#Description=Configuration component - must be the first one!
 
config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
-#Logger component - must be the second one!
+#Group=Logging
+#Description=Logger component - must be the second one!
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
-# Simple scheduler
+#Group=Scheduler
+#Description=Simple scheduler
 #scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
-# Registration in LS
+#Group=LS
+#Description=Registration in LS
 
#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
 
-# Authentication
+#Group=AuthN
+#Description=Authentication component
 authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
 
 #Service specific components

Modified: trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/components.properties.template  
2008-02-06 14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/conf/components.properties.template  
2008-02-06 15:15:39 UTC (rev 3318)
@@ -1,20 +1,24 @@
 # File contains components to load
 # Config and logger MUST be load as first!
 
-
-#Configuration component - must be the first one!
+#Group=PropertiesConfiguration
+#Description=Configuration component - must be the first one!
 
config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
-#Logger component - must be the second one!
+#Group=Logging
+#Description=Logger component - must be the second one!
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
-# Simple scheduler
+#Group=Scheduler
+#Description=Simple scheduler
 #scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
-# Registration in LS
+#Group=LS
+#Description=Registration in LS
 
#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
 
-# Authentication
+#Group=AuthN
+#Description=Authentication component
 authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
 
 #Service specific components

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties        2008-02-06 
14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties        2008-02-06 
15:15:39 UTC (rev 3318)
@@ -3,60 +3,145 @@
 ## project : perfSONAR
 ## author: romradz
 
+#Group=Logger
+#Description=location of the log directory
+logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs
 
-logDir=${service.home}/${deploy.root}/WEB-INF/logs
 
-
 #ROOT
+#Group=RootLogger
+#Description=The maximum backup index for the root logger
 #log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=${service.home}/${deploy.root}/WEB-INF/logs/perfsonar.log
+#Group=RootLogger
+#Description=The file for the root logger
+#log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar.log
+#Group=RootLogger
+#Description=The class responsible for the layout of the root logger
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#Group=RootLogger
+#Description=The conversion pattern for the root logger
 #log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=RootLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 #log4j.rootLogger=DEBUG, rootAppender
+#Group=RootLogger
+#Description=The maximum file size for the root logger
 #log4j.appender.rootAppender.MaxFileSize=500KB
+#Group=RootLogger
+#Description=The class responsible for appending text in the root logger
 #log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
 #DEBUG
+#Group=DebugLogger
+#Description=The maximum backup index for the debug logger
 log4j.appender.debugAppender.MaxBackupIndex=11
-log4j.appender.debugAppender.File=${service.home}/${deploy.root}/WEB-INF/logs/perfsonar_debug.log
+#Group=DebugLogger
+#Description=The file for the debug logger
+log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_debug.log
+#Group=DebugLogger
+#Description=The class responsible for the layout of the debug logger
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+#Group=DebugLogger
+#Description=The conversion pattern for the debug logger
 log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=DebugLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-debug=DEBUG, debugAppender
+#Group=DebugLogger
+#Description=The maximum file size for the debug logger
 log4j.appender.debugAppender.MaxFileSize=500KB
+#Group=DebugLogger
+#Description=The class responsible for appending text in the debug logger
 log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
 
 #INFO
+#Group=InfoLogger
+#Description=The maximum backup index for the info logger
 log4j.appender.infoAppender.MaxBackupIndex=11
-log4j.appender.infoAppender.File=${service.home}/${deploy.root}/WEB-INF/logs/perfsonar_info.log
+#Group=InfoLogger
+#Description=The file for the info logger
+log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_info.log
+#Group=InfoLogger
+#Description=The class responsible for the layout of the info logger
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+#Group=InfoLogger
+#Description=The conversion pattern for the info logger
 log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=InfoLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-info=INFO, infoAppender
+#Group=InfoLogger
+#Description=The maximum file size for the info logger
 log4j.appender.infoAppender.MaxFileSize=500KB
+#Group=InfoLogger
+#Description=The class responsible for appending text in the info logger
 log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
 
 #WARN
+#Group=WarnLogger
+#Description=The maximum backup index for the warning logger
 log4j.appender.warnAppender.MaxBackupIndex=11
-log4j.appender.warnAppender.File=${service.home}/${deploy.root}/WEB-INF/logs/perfsonar_warn.log
+#Group=WarnLogger
+#Description=The file for the warning logger
+log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_warn.log
+#Group=WarnLogger
+#Description=The class responsible for the layout of the warning logger
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+#Group=WarnLogger
+#Description=The conversion pattern for the warning logger
 log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=WarnLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-warn=WARN, warnAppender
+#Group=WarnLogger
+#Description=The maximum file size for the warning logger
 log4j.appender.warnAppender.MaxFileSize=500KB
+#Group=WarnLogger
+#Description=The class responsible for appending text in the warning logger
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
 #ERROR
+#Group=ErrorLogger
+#Description=The maximum backup index for the error logger
 log4j.appender.errorAppender.MaxBackupIndex=11
-log4j.appender.errorAppender.File=${service.home}/${deploy.root}/WEB-INF/logs/perfsonar_error.log
+#Group=ErrorLogger
+#Description=The file for the error logger
+log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_error.log
+#Group=ErrorLogger
+#Description=The class responsible for the layout of the error logger
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
+#Group=ErrorLogger
+#Description=The conversion pattern for the error logger
 log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=ErrorLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-error=ERROR, errorAppender
+#Group=ErrorLogger
+#Description=The maximum file size for the error logger
 log4j.appender.errorAppender.MaxFileSize=500KB
+#Group=ErrorLogger
+#Description=The class responsible for appending text in the error logger
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
 #FATAL
+#Group=FatalLogger
+#Description=The maximum backup index for the fatal logger
 log4j.appender.fatalAppender.MaxBackupIndex=11
-log4j.appender.fatalAppender.File=${service.home}/${deploy.root}/WEB-INF/logs/perfsonar_fatal.log
+#Group=FatalLogger
+#Description=The file for the fatal logger
+log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_fatal.log
+#Group=FatalLogger
+#Description=The class responsible for the layout of the fatal logger
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+#Group=FatalLogger
+#Description=The conversion pattern for the fatal logger
 log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=FatalLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-fatal=FATAL, fatalAppender
+#Group=FatalLogger
+#Description=The maximum file size for the fatal logger
 log4j.appender.fatalAppender.MaxFileSize=500KB
+#Group=FatalLogger
+#Description=The class responsible for appending text in the fatal logger
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template       
2008-02-06 14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template       
2008-02-06 15:15:39 UTC (rev 3318)
@@ -3,60 +3,145 @@
 ## project : perfSONAR
 ## author: romradz
 
+#Group=Logger
+#Description=location of the log directory
+logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs
 
-logDir=_LOGPATH_
 
-
 #ROOT
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar.log
-#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-#log4j.rootLogger=DEBUG, rootAppender
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+#Group=RootLogger
+#Description=The maximum backup index for the root logger
+log4j.appender.rootAppender.MaxBackupIndex=11
+#Group=RootLogger
+#Description=The file for the root logger
+log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar.log
+#Group=RootLogger
+#Description=The class responsible for the layout of the root logger
+log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#Group=RootLogger
+#Description=The conversion pattern for the root logger
+log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=RootLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
+log4j.rootLogger=DEBUG, rootAppender
+#Group=RootLogger
+#Description=The maximum file size for the root logger
+#og4j.appender.rootAppender.MaxFileSize=500KB
+#Group=RootLogger
+#Description=The class responsible for appending text in the root logger
+log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
 #DEBUG
+#Group=DebugLogger
+#Description=The maximum backup index for the debug logger
 log4j.appender.debugAppender.MaxBackupIndex=11
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+#Group=DebugLogger
+#Description=The file for the debug logger
+log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_debug.log
+#Group=DebugLogger
+#Description=The class responsible for the layout of the debug logger
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+#Group=DebugLogger
+#Description=The conversion pattern for the debug logger
 log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=DebugLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-debug=DEBUG, debugAppender
+#Group=DebugLogger
+#Description=The maximum file size for the debug logger
 log4j.appender.debugAppender.MaxFileSize=500KB
+#Group=DebugLogger
+#Description=The class responsible for appending text in the debug logger
 log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
 
 #INFO
+#Group=InfoLogger
+#Description=The maximum backup index for the info logger
 log4j.appender.infoAppender.MaxBackupIndex=11
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+#Group=InfoLogger
+#Description=The file for the info logger
+log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_info.log
+#Group=InfoLogger
+#Description=The class responsible for the layout of the info logger
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+#Group=InfoLogger
+#Description=The conversion pattern for the info logger
 log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=InfoLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-info=INFO, infoAppender
+#Group=InfoLogger
+#Description=The maximum file size for the info logger
 log4j.appender.infoAppender.MaxFileSize=500KB
+#Group=InfoLogger
+#Description=The class responsible for appending text in the info logger
 log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
 
 #WARN
+#Group=WarnLogger
+#Description=The maximum backup index for the warning logger
 log4j.appender.warnAppender.MaxBackupIndex=11
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+#Group=WarnLogger
+#Description=The file for the warning logger
+log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_warn.log
+#Group=WarnLogger
+#Description=The class responsible for the layout of the warning logger
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+#Group=WarnLogger
+#Description=The conversion pattern for the warning logger
 log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=WarnLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-warn=WARN, warnAppender
+#Group=WarnLogger
+#Description=The maximum file size for the warning logger
 log4j.appender.warnAppender.MaxFileSize=500KB
+#Group=WarnLogger
+#Description=The class responsible for appending text in the warning logger
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
 #ERROR
+#Group=ErrorLogger
+#Description=The maximum backup index for the error logger
 log4j.appender.errorAppender.MaxBackupIndex=11
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+#Group=ErrorLogger
+#Description=The file for the error logger
+log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_error.log
+#Group=ErrorLogger
+#Description=The class responsible for the layout of the error logger
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
+#Group=ErrorLogger
+#Description=The conversion pattern for the error logger
 log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=ErrorLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-error=ERROR, errorAppender
+#Group=ErrorLogger
+#Description=The maximum file size for the error logger
 log4j.appender.errorAppender.MaxFileSize=500KB
+#Group=ErrorLogger
+#Description=The class responsible for appending text in the error logger
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
 #FATAL
+#Group=FatalLogger
+#Description=The maximum backup index for the fatal logger
 log4j.appender.fatalAppender.MaxBackupIndex=11
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+#Group=FatalLogger
+#Description=The file for the fatal logger
+log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_fatal.log
+#Group=FatalLogger
+#Description=The class responsible for the layout of the fatal logger
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+#Group=FatalLogger
+#Description=The conversion pattern for the fatal logger
 log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
+#Group=FatalLogger
+#Description=Information specific to the perfsonar debugger (not sure of 
this one at all really)
 log4j.logger.sonar-fatal=FATAL, fatalAppender
+#Group=FatalLogger
+#Description=The maximum file size for the fatal logger
 log4j.appender.fatalAppender.MaxFileSize=500KB
+#Group=FatalLogger
+#Description=The class responsible for appending text in the fatal logger
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-02-06 
14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-02-06 
15:15:39 UTC (rev 3318)
@@ -1,11 +1,102 @@
-#This file was created by the ant script.
-#Thu Feb 01 10:28:02 CET 2007
-service.r.type=mp
-component.registrator.interval=30000
-service.r.service_name=Java SSH Telnet MP
-service.ls.registration_file=
-service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
-service.r.service_type=SSH/Telnet MP
-service.r.ls_url=
-service.r.service_description=Java SSH/Telnet MP, perfSONAR project
-component.registrator.scheduler_component=scheduler
\ No newline at end of file
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+#Group=Global
+#Description=Type of service
+service.r.service_type=mp
+
+#Group=Global
+#Description=Description for the service
+service.r.service_description=perfSONAR service
+
+#Group=eXist
+#Description=The password for the admin account for eXist
+component.mp.xmldb.db_adminpassword=admin
+
+#Group=eXist
+#Description=The username for eXist
+component.mp.xmldb.db_username=sshtelnet
+
+#Group=logger
+#Description=The location of the configuration file for the log4j logger
+service.log.log4j.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+#Group=LS
+#Description=Location of the Lookup Service
+service.r.ls_url=http\://selena.acad.bg\:8070/axis/services/LookupService
+
+#Group=Global
+#Description=Type of service
+service.r.type=mp
+
+#Group=AuthN
+#Description=Location of the Authentication Service
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+#Group=Scheduler
+#Description=The scheduler component
+component.registrator.scheduler_component=scheduler
+
+#Group=eXist
+#Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+#Group=LS
+#Description=The period of time between registrations to the LS
+component.registrator.interval=30000
+
+#Group=SSHTELNET
+#Description=The name of the class which is responsible for handling the 
requests
+service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
+
+#Group=eXist
+#Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db/db/
+
+#Group=eXist
+#Description=The url of the eXist db (probably a redundant parameter, but 
nevertheless still in there, will be removed in the near future)
+component.mp.xmldb.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
+
+#Group=Global
+#Description=The name of the organisation which deployed the MP
+service.r.organization_name=
+
+#Group=eXist
+#Description=The password for the eXist database
+component.mp.xmldb.db_password=sshtelnet
+
+#Group=SAX
+#Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/objects.config
+
+#Group=eXist
+#Description=The type of access for the eXist database (has to be xmlrpc)
+component.mp.xmldb.db_access=xmlrpc
+
+#Group=LS
+#Description=The name of the metadata configuration file which is to be sent 
to the LS
+service.ls.registration_file=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+#Group=Global
+#Description=The name of the service
+service.r.service_name=JAVA-SSHTELNET-MP
+
+#Group=AuthN
+#Description=The types of messages for which AuthN is to be enabled (if 
AuthN is enabled off course)
+service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+
+#Group=Global
+#Description=The version of the service
+service.r.service_version=1.3RC1
+
+#Group=AuthN
+#Description=If the authentication is enabled or not
+service.as.authn_active=on
+
+#Group=Global
+#Description=The e-mail address of the contact person for the service
+service.r.contact_email=
+
+#Group=SSHTELNET
+#Description=Types of messages supported by this service
+service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-02-06 14:50:06 UTC (rev 3317)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-02-06 15:15:39 UTC (rev 3318)
@@ -1,11 +1,102 @@
-#This file was created by the ant script.
-#Thu Feb 01 10:28:02 CET 2007
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+#Group=Global
+#Description=Type of service
+service.r.service_type=mp
+
+#Group=Global
+#Description=Description for the service
+service.r.service_description=perfSONAR service
+
+#Group=eXist
+#Description=The password for the admin account for eXist
+component.mp.xmldb.db_adminpassword=admin
+
+#Group=eXist
+#Description=The username for eXist
+component.mp.xmldb.db_username=sshtelnet
+
+#Group=logger
+#Description=The location of the configuration file for the log4j logger
+service.log.log4j.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+#Group=LS
+#Description=Location of the Lookup Service
+service.r.ls_url=http\://selena.acad.bg\:8070/axis/services/LookupService
+
+#Group=Global
+#Description=Type of service
 service.r.type=mp
+
+#Group=AuthN
+#Description=Location of the Authentication Service
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+#Group=Scheduler
+#Description=The scheduler component
+component.registrator.scheduler_component=scheduler
+
+#Group=eXist
+#Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+#Group=LS
+#Description=The period of time between registrations to the LS
 component.registrator.interval=30000
-service.r.service_name=Java SSH Telnet MP
-service.ls.registration_file=
+
+#Group=SSHTELNET
+#Description=The name of the class which is responsible for handling the 
requests
+service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
+
+#Group=eXist
+#Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db/db/
+
+#Group=eXist
+#Description=The url of the eXist db (probably a redundant parameter, but 
nevertheless still in there, will be removed in the near future)
+component.mp.xmldb.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
+
+#Group=Global
+#Description=The name of the organisation which deployed the MP
+service.r.organization_name=
+
+#Group=eXist
+#Description=The password for the eXist database
+component.mp.xmldb.db_password=sshtelnet
+
+#Group=SAX
+#Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/objects.config
+
+#Group=eXist
+#Description=The type of access for the eXist database (has to be xmlrpc)
+component.mp.xmldb.db_access=xmlrpc
+
+#Group=LS
+#Description=The name of the metadata configuration file which is to be sent 
to the LS
+service.ls.registration_file=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+#Group=Global
+#Description=The name of the service
+service.r.service_name=JAVA-SSHTELNET-MP
+
+#Group=AuthN
+#Description=The types of messages for which AuthN is to be enabled (if 
AuthN is enabled off course)
+service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+
+#Group=Global
+#Description=The version of the service
+service.r.service_version=1.3RC1
+
+#Group=AuthN
+#Description=If the authentication is enabled or not
+service.as.authn_active=on
+
+#Group=Global
+#Description=The e-mail address of the contact person for the service
+service.r.contact_email=
+
+#Group=SSHTELNET
+#Description=Types of messages supported by this service
 service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
-service.r.service_type=SSH/Telnet MP
-service.r.ls_url=
-service.r.service_description=Java SSH/Telnet MP, perfSONAR project
-component.registrator.scheduler_component=scheduler

Added: trunk/geant2_java-sshtelnet-mp/conf/servlet.properties

Added: trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template

Added: 
trunk/geant2_java-sshtelnet-mp/doc/commands/commands-complete-list-v5-SM.xls


Property changes on: 
trunk/geant2_java-sshtelnet-mp/doc/commands/commands-complete-list-v5-SM.xls
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/geant2_java-sshtelnet-mp/doc/commands/commands_minimum_set-v5-SM.xls


Property changes on: 
trunk/geant2_java-sshtelnet-mp/doc/commands/commands_minimum_set-v5-SM.xls
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
  2008-02-06 14:50:06 UTC (rev 3317)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
  2008-02-06 15:15:39 UTC (rev 3318)
@@ -5,6 +5,7 @@
  */
 package org.perfsonar.service.measurementPoint.lookingGlassType.metadata;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 

Modified: 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/MetadataConfiguration.java
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/MetadataConfiguration.java
    2008-02-06 14:50:06 UTC (rev 3317)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/MetadataConfiguration.java
    2008-02-06 15:15:39 UTC (rev 3318)
@@ -5,6 +5,7 @@
  */
 package org.perfsonar.service.measurementPoint.lookingGlassType.metadata;
 
+import java.io.File;
 import java.util.List;
 
 import org.perfsonar.base.exceptions.PerfSONARException;
@@ -18,7 +19,7 @@
     public static String DEVICE_NAMES = "device_names";
 
     public void initStorage() throws PerfSONARException;
-
+    
     public String getProperty(String property) throws PerfSONARException;
 
     public String getProperty(String device, String property) throws 
PerfSONARException;