perfsonar development work

Author: melis
Date: 2008-06-06 09:00:20 -0400 (Fri, 06 Jun 2008)
New Revision: 3966

Modified:
   trunk/geant2_java-sshtelnet-mp/ant/const.properties
   trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
   trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml
   trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/components.properties
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
   
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
   trunk/geant2_java-sshtelnet-mp/conf/components.properties
   trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/service.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
   trunk/geant2_java-sshtelnet-mp/doc/Metadata Configuration file for 
SSHTelnet 1.3.doc
   trunk/geant2_java-sshtelnet-mp/doc/changelog.txt
   
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
   
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/webAdmin/SSHTelnetHandler.java
Log:
update trunk to reflect 1.3.2

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-06-06 11:47:45 
UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-06-06 13:00:20 
UTC (rev 3966)
@@ -11,7 +11,7 @@
 service.name=geant2-java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.1
+version=1.3.2
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-06-06 11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-06-06 13:00:20 UTC (rev 3966)
@@ -11,7 +11,7 @@
 service.name=geant2-java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.1
+version=1.3.2
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1

Modified: trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml      2008-06-06 
11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/ant/release-targets.xml      2008-06-06 
13:00:20 UTC (rev 3966)
@@ -53,7 +53,11 @@
       <fileset dir="tmp/${service.name}-${version}/samples/requests" 
includes="**/response*.xml"/>
     </delete>
 
-
+       <mkdir 
dir="tmp/${service.name}-${version}/conf/axis-1.4/WEB-INF/classes/perfsonar/contrib"/>
+       <copy 
todir="tmp/${service.name}-${version}/conf/axis-1.4/WEB-INF/classes/perfsonar/contrib">
+         <fileset dir="tmp/${service.name}-${version}/contrib"/>
+       </copy>
+       
     <delete dir="tmp/${service.name}-${version}/lib/rrd"/>
 
     <tar destfile="${service.name}-${version}.tar"

Modified: trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml       
2008-06-06 11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml       
2008-06-06 13:00:20 UTC (rev 3966)
@@ -29,7 +29,7 @@
           depends="webapp-package-directory-prepare">
     <zip destfile="${service.name}-${version}-1.war"
          basedir="${tmpdir}/"
-         excludes=".svn/**" />
+         excludes=".svn/**"/>
     <delete dir="${tmpdir}"/>
   </target>
 
@@ -68,8 +68,8 @@
 
   <target name="webapp-package-directory-init-phase-2">
 
-    <!-- rrd ma specific stuff -->
-
+    <!-- sshtelnet mp specific stuff -->
+       
     <!-- prepare conf files -->
     <copy file="${basedir}/conf/service.properties.template"
                  tofile="${basedir}/conf/service.properties"/>
@@ -111,11 +111,30 @@
                  todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
        <copy file="${basedir}/conf/components.properties"      
                  todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+                 
+       <copy file="${basedir}/conf/wizard.properties"      
+                 
todir="${basedir}/conf/axis-1.4/WEB-INF/classes/perfsonar/conf"/>
+    <copy file="${basedir}/conf/service.properties"      
+                 
todir="${basedir}/conf/axis-1.4/WEB-INF/classes/perfsonar/conf"/>
+    <copy file="${basedir}/conf/servlet.properties"      
+                 
todir="${basedir}/conf/axis-1.4/WEB-INF/classes/perfsonar/conf"/>
+    <copy file="${basedir}/conf/log4j.properties"      
+                 
todir="${basedir}/conf/axis-1.4/WEB-INF/classes/perfsonar/conf"/>
+       <copy file="${basedir}/conf/components.properties"      
+                 
todir="${basedir}/conf/axis-1.4/WEB-INF/classes/perfsonar/conf"/>
+                 
+       <mkdir dir="${tmpdir}/WEB-INF/classes/perfsonar/contrib"/>
+       <copy todir="${tmpdir}/WEB-INF/classes/perfsonar/contrib">
+         <fileset dir="${basedir}/contrib"/>
+       </copy>
+
+       <mkdir dir="${tmpdir}/WEB-INF/classes/perfsonar/logs"/>
+       
   </target>
 
 
   <target name="webapp-package-directory-extension-init-phase">
-
+       <delete dir="${tmpdir}/WEB-INF/contrib" />
   </target>
 
 

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/components.properties
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/components.properties
   2008-06-06 11:47:45 UTC (rev 3965)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/components.properties
   2008-06-06 13:00:20 UTC (rev 3966)
@@ -1,25 +1,25 @@
-# File contains components to load
-# Config and logger MUST be load as first!
-
-#Group=PropertiesConfiguration
-#Description=Configuration component - must be the first one!
-config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
-
-#Group=Logging
-#Description=Logger component - must be the second one!
-logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
-
-#Group=Scheduler
-#Description=Simple scheduler
-#scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
-
-#Group=LS
-#Description=Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
-
-#Group=AuthN
-#Description=Authentication component
-authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
-
-#Service specific components
-#...
\ No newline at end of file
+# File contains components to load
+# Config and logger MUST be load as first!
+
+#Group=PropertiesConfiguration
+#Description=Configuration component - must be the first one!
+config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
+
+#Group=Logging
+#Description=Logger component - must be the second one!
+logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
+
+#Group=Scheduler
+#Description=Simple scheduler
+#scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
+
+#Group=LS
+#Description=Registration in LS
+#registrator=org.perfsonar.service.base.registration.LSRegistrationComponent
+
+#Group=AuthN
+#Description=Authentication component
+authn=org.perfsonar.base.auxiliary.components.authn.wssec.WSSecAuthNComponent
+
+#Service specific components
+#...

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
      2008-06-06 11:47:45 UTC (rev 3965)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
      2008-06-06 13:00:20 UTC (rev 3966)
@@ -1,106 +1,122 @@
-#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=Internal
-# Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
-
-# Group=LS
-# Description=Location of the Lookup Service
-service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService
-
-# Group=Global
-# Description=Type of service
-service.r.type=mp
-
-# Group=Authentication
-# Description=Location of the Authentication Service
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-
-# Group=Internal
-# 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=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
-
-# Group=Internal
-# 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
-
-# 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=Internal
-# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/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=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=Global
-# Description=The name of the service
-service.r.service_name=geant2-java-sshtelnet-mp
-
-# Group=Authentication
-# Description=The types of messages for which Authentication is to be 
enabled (if Authentication 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.3.1
-
-# Group=Authentication
-# Description=If the authentication is enabled or not
-service.as.authn_active=off
-
-# Group=Global
-# Description=The e-mail address of the contact person for the service
-service.r.contact_email=
-
-# Group=Internal
-# Description=Types of messages supported by this service
-service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+#eXist Properties
+#----------------
+
+# 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=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
+
+#Group=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=eXist
+# Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
+
+# Group=eXist
+# Description=The password for the eXist database
+component.mp.xmldb.db_password=sshtelnet
+
+# Group=eXist
+# Description=The type of access for the eXist database (has to be xmlrpc)
+component.mp.xmldb.db_access=xmlrpc
+
+#Internal properties
+#-------------------
+
+# Group=Internal
+# Description=The location of the configuration file for the log4j logger
+service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+# Group=Internal
+# 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=Internal
+# Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+
+# Group=Internal
+# Description=Types of messages supported by this service
+service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
+
+# Group=Internal
+# Description=Type of service
+service.r.type=mp
+
+#LS properties
+#-------------
+
+# Group=LS
+# Description=Type of service
+service.r.service_type=mp
+
+# Group=LS
+# Description=Location of the Lookup Service
+service.r.ls_url=http://somewhere
+
+# Group=LS
+# Description=The URL address of the service configured by this 
configuration file.
+service.r.access_point=http://somewhere
+
+# Group=LS
+# Description=The name of the organisation which deployed the MP
+service.r.organization_name=X
+
+# Group=LS
+# Description=The name of the service
+service.r.service_name=geant2-java-sshtelnet-mp
+
+# Group=LS
+# Description=The version of the service
+service.r.service_version=1.3.2
+
+# Group=LS
+# Description=The e-mail address of the contact person for the service
+service.r.contact_email=user@domain
+
+# Group=LS
+# Description=Description for the service
+service.r.service_description=perfSONAR service
+
+# Group=LS
+# Description=The period of time between registrations to the LS
+component.registrator.interval=30000
+
+# Group=LS
+# 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=scheduler
+
+# Group=LS
+# Description=The name of the metadata configuration file which is to be 
sent to the LS
+service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=LS
+# Description=Enter 'xmldb' to take metadata elements for register requests 
from the XML database, or 'file' to take them from the XML metadata 
configuration file.
+service.ma.conf_file.store_type=xmldb
+
+#Authentication properties
+#-------------------------
+
+# Group=Authentication
+# Description=Location of the Authentication Service
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+# Group=Authentication
+# Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
+service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+
+# Group=Authentication
+# Description=If the authentication is enabled or not
+service.as.authn_active=off

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
       2008-06-06 11:47:45 UTC (rev 3965)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
       2008-06-06 13:00:20 UTC (rev 3966)
@@ -20,92 +20,153 @@
 ]>
 <properties>
   <comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>
+  
   <property>
-    <entry key="service.r.service_version">1.3RC6</entry>
-    <Comment>Enter the version of the service</Comment>
-    <ProposedValue>1.3.1</ProposedValue>
+    <entry key="service.r.service_name" 
required="true">geant2-java-sshtelnet-mp</entry>
+    <Comment>Enter the service name:</Comment>
+    <ProposedValue>geant2-java-sshtelnet-mp</ProposedValue>
     <Group order="1">LS</Group>
   </property>
+
   <property>
-    <entry key="service.r.ls_url" 
required="true">http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</entry>
-    <Comment>Give the LS url</Comment>
-    
<ProposedValue>http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</ProposedValue>
+    <entry key="service.r.service_description">perfSONAR Java SSH TELNET 
MP</entry>
+    <Comment>Enter a description for the service:</Comment>
+    <ProposedValue>perfSONAR Java SSH TELNET MP</ProposedValue>
     <Group order="2">LS</Group>
   </property>
+
   <property>
+    <entry 
key="service.r.contact_email">user@domain</entry>
+    <Comment>Enter the service administrator's email address:</Comment>
+    
<ProposedValue>user@domain</ProposedValue>
+    <Group order="3">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.organization_name">Institution</entry>
+    <Comment>Enter the name of the organization running this 
service:</Comment>
+    <ProposedValue>Institution</ProposedValue>
+    <Group order="4">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.ls_url" required="true">http://somewhere</entry>
+    <Comment>Enter the LS URL:</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
+    <Group order="5">LS</Group>
+  </property>
+
+  <property>
+    <entry key="component.registrator.interval">30000</entry>
+    <Comment>Set the registration interval (milliseconds):</Comment>
+    <ProposedValue>30000</ProposedValue>
+    <Group order="6">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.access_point" 
required="true">http://somewhere</entry>
+    <Comment>Enter the service access point:</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
+    <Group order="7">LS</Group>
+  </property>  
+  
+  <!--
+  <property>
     <entry key="service.ls.registration_file" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
     <Comment>Give the path to the metadataconfiguration file which needs to 
be uploaded to the LS</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
-    <Group order="3">LS</Group>
+    <Group order="8">LS</Group>
   </property>
+  -->
+  
+  
   <property>
     <entry key="component.mp.xmldb.db_adminpassword" required="true" 
password="true" />
     <Comment>Give the admin password for the eXist database</Comment>
     <ProposedValue />
     <Group order="7">eXist</Group>
   </property>
+  
   <property>
     <entry key="old_adminpassword" required="true" 
password="true">admin</entry>
     <Comment>Give the old admin password for the eXist database</Comment>
     <ProposedValue>admin</ProposedValue>
   <Group order="6">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.db_uri" 
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
     <Comment>Give the URI for the eXist database</Comment>
     
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
     <Group order="3">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.db_username" 
required="true">sshtelnet</entry>
     <Comment>Give the username for the eXist database</Comment>
     <ProposedValue>sshtelnet</ProposedValue>
     <Group order="4">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.metadata_file_name" 
required="true">sshtelnetmetadata.xml</entry>
     <Comment>Give the name of the metadata configuration file</Comment>
     <ProposedValue>sshtelnetmetadata.xml</ProposedValue>
     <Group order="1">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.metadata_file_path" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
     <Comment>Give the path to the metadata configuration file (needed for 
uploading the file into eXist)</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
     <Group order="2">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.db_password" required="true" 
password="true">sshtelnet</entry>
     <Comment>Give the non-admin password for the eXist database (for the 
user specified above)</Comment>
     <ProposedValue>sshtelnet</ProposedValue>
     <Group order="5">eXist</Group>
   </property>
+  
+  
   <property>
     <entry key="servlet.username" required="true">perfsonaruser</entry>
     <Comment>Give the username to use for logging in to the admin 
pages</Comment>
     <ProposedValue>perfsonaruser</ProposedValue>
     <Group order="1" check="false">Administration</Group>
   </property>
+  
   <property>
     <entry key="servlet.password" required="true" 
password="true">perfsonarpass</entry>
     <Comment>Give the password to use for logging in to the admin 
pages</Comment>
     <ProposedValue>perfsonarpass</ProposedValue>
     <Group order="2">Administration</Group>
   </property>
+  
+  
    <property>
     <entry key="service.as.authn_active" required="true">no</entry>
     <Comment>Do you wish to enable authentication?</Comment>
     <ProposedValue>yes</ProposedValue>
-    <Group order="1" check="true">AS</Group>
+    <Group order="1" check="true">Authentication</Group>
     <AcceptedValue>yes</AcceptedValue>
     <AcceptedValue>no</AcceptedValue>
   </property>
+  
   <property>
     <entry key="service.as.point" 
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
     <Comment>Enter the URL address of the Authentication Service:</Comment>
     
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
-    <Group order="2">AS</Group>
+    <Group order="2">Authentication</Group>
   </property>
+  
+    <property>
+    <entry key="service.as.authn_for_msg_types" 
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+    <Comment>Enter the message types which should be authenticated:</Comment>
+    <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+    <Group order="3">Authentication</Group>
+  </property>
 </properties>
 
 

Modified: trunk/geant2_java-sshtelnet-mp/conf/components.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/components.properties   2008-06-06 
11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/conf/components.properties   2008-06-06 
13:00:20 UTC (rev 3966)
@@ -15,7 +15,7 @@
 
 #Group=LS
 #Description=Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
+#registrator=org.perfsonar.service.base.registration.LSRegistrationComponent
 
 #Group=AuthN
 #Description=Authentication component
@@ -23,4 +23,3 @@
 
 #Service specific components
 #...
-

Modified: trunk/geant2_java-sshtelnet-mp/conf/components.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/components.properties.template  
2008-06-06 11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/conf/components.properties.template  
2008-06-06 13:00:20 UTC (rev 3966)
@@ -15,7 +15,7 @@
 
 #Group=LS
 #Description=Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
+#registrator=org.perfsonar.service.base.registration.LSRegistrationComponent
 
 #Group=AuthN
 #Description=Authentication component
@@ -23,4 +23,3 @@
 
 #Service specific components
 #...
-

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-06-06 
11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-06-06 
13:00:20 UTC (rev 3966)
@@ -1,14 +1,9 @@
 #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
+#eXist Properties
+#----------------
 
-# 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
@@ -17,86 +12,111 @@
 # Description=The username for eXist
 component.mp.xmldb.db_username=sshtelnet
 
+# Group=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
+
+#Group=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=eXist
+# Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
+
+# Group=eXist
+# Description=The password for the eXist database
+component.mp.xmldb.db_password=sshtelnet
+
+# Group=eXist
+# Description=The type of access for the eXist database (has to be xmlrpc)
+component.mp.xmldb.db_access=xmlrpc
+
+#Internal properties
+#-------------------
+
 # Group=Internal
 # Description=The location of the configuration file for the log4j logger
 
service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
 
-# Group=LS
-# Description=Location of the Lookup Service
-service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService
+# Group=Internal
+# 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=Global
+# Group=Internal
+# Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+
+# Group=Internal
+# Description=Types of messages supported by this service
+service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
+
+# Group=Internal
 # Description=Type of service
 service.r.type=mp
 
-# Group=Authentication
-# Description=Location of the Authentication Service
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+#LS properties
+#-------------
 
-# Group=Internal
-# Description=The scheduler component
-component.registrator.scheduler_component=scheduler
+# Group=LS
+# Description=Type of service
+service.r.service_type=mp
 
-# Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
-component.mp.xmldb.metadata_file_name=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+# Group=LS
+# Description=Location of the Lookup Service
+service.r.ls_url=http://somewhere
 
 # Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+# Description=The URL address of the service configured by this 
configuration file.
+service.r.access_point=http://somewhere
 
-# Group=Internal
-# 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=LS
+# Description=The name of the organisation which deployed the MP
+service.r.organization_name=X
 
-# Group=eXist
-# Description=The url of the eXist db
-component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
+# Group=LS
+# Description=The name of the service
+service.r.service_name=geant2-java-sshtelnet-mp
 
-# 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=LS
+# Description=The version of the service
+service.r.service_version=1.3.2
 
-# Group=Global
-# Description=The name of the organisation which deployed the MP
-service.r.organization_name=
+# Group=LS
+# Description=The e-mail address of the contact person for the service
+service.r.contact_email=user@domain
 
-# Group=eXist
-# Description=The password for the eXist database
-component.mp.xmldb.db_password=sshtelnet
+# Group=LS
+# Description=Description for the service
+service.r.service_description=perfSONAR service
 
-# Group=Internal
-# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+# Group=LS
+# Description=The period of time between registrations to the LS
+component.registrator.interval=30000
 
-# 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 scheduler component (the implementation of 
this component must also be declared in the components.properties file).
+component.registrator.scheduler_component=scheduler
 
 # Group=LS
 # Description=The name of the metadata configuration file which is to be 
sent to the LS
 
service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 
-# Group=Global
-# Description=The name of the service
-service.r.service_name=geant2-java-sshtelnet-mp
+# Group=LS
+# Description=Enter 'xmldb' to take metadata elements for register requests 
from the XML database, or 'file' to take them from the XML metadata 
configuration file.
+service.ma.conf_file.store_type=xmldb
 
+#Authentication properties
+#-------------------------
+
 # Group=Authentication
+# Description=Location of the Authentication Service
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+# Group=Authentication
 # Description=The types of messages for which Authentication is to be 
enabled (if Authentication 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.3.1
-
 # Group=Authentication
 # Description=If the authentication is enabled or not
 service.as.authn_active=off
-
-# Group=Global
-# Description=The e-mail address of the contact person for the service
-service.r.contact_email=
-
-# Group=Internal
-# 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-06-06 11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-06-06 13:00:20 UTC (rev 3966)
@@ -1,14 +1,9 @@
 #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
+#eXist Properties
+#----------------
 
-# 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
@@ -17,86 +12,111 @@
 # Description=The username for eXist
 component.mp.xmldb.db_username=sshtelnet
 
+# Group=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
+
+#Group=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=eXist
+# Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
+
+# Group=eXist
+# Description=The password for the eXist database
+component.mp.xmldb.db_password=sshtelnet
+
+# Group=eXist
+# Description=The type of access for the eXist database (has to be xmlrpc)
+component.mp.xmldb.db_access=xmlrpc
+
+#Internal properties
+#-------------------
+
 # Group=Internal
 # Description=The location of the configuration file for the log4j logger
 
service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
 
-# Group=LS
-# Description=Location of the Lookup Service
-service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService
+# Group=Internal
+# 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=Global
+# Group=Internal
+# Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+
+# Group=Internal
+# Description=Types of messages supported by this service
+service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
+
+# Group=Internal
 # Description=Type of service
 service.r.type=mp
 
-# Group=Authentication
-# Description=Location of the Authentication Service
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+#LS properties
+#-------------
 
-# Group=Internal
-# Description=The scheduler component
-component.registrator.scheduler_component=scheduler
+# Group=LS
+# Description=Type of service
+service.r.service_type=mp
 
-# Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
-component.mp.xmldb.metadata_file_name=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+# Group=LS
+# Description=Location of the Lookup Service
+service.r.ls_url=http://somewhere
 
 # Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
+# Description=The URL address of the service configured by this 
configuration file.
+service.r.access_point=http://somewhere
 
-# Group=Internal
-# 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=LS
+# Description=The name of the organisation which deployed the MP
+service.r.organization_name=X
 
-# Group=eXist
-# Description=The url of the eXist db
-component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
+# Group=LS
+# Description=The name of the service
+service.r.service_name=geant2-java-sshtelnet-mp
 
-# 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=LS
+# Description=The version of the service
+service.r.service_version=1.3.2
 
-# Group=Global
-# Description=The name of the organisation which deployed the MP
-service.r.organization_name=
+# Group=LS
+# Description=The e-mail address of the contact person for the service
+service.r.contact_email=user@domain
 
-# Group=eXist
-# Description=The password for the eXist database
-component.mp.xmldb.db_password=sshtelnet
+# Group=LS
+# Description=Description for the service
+service.r.service_description=perfSONAR service
 
-# Group=Internal
-# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+# Group=LS
+# Description=The period of time between registrations to the LS
+component.registrator.interval=30000
 
-# 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 scheduler component (the implementation of 
this component must also be declared in the components.properties file).
+component.registrator.scheduler_component=scheduler
 
 # Group=LS
 # Description=The name of the metadata configuration file which is to be 
sent to the LS
 
service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 
-# Group=Global
-# Description=The name of the service
-service.r.service_name=geant2-java-sshtelnet-mp
+# Group=LS
+# Description=Enter 'xmldb' to take metadata elements for register requests 
from the XML database, or 'file' to take them from the XML metadata 
configuration file.
+service.ma.conf_file.store_type=xmldb
 
+#Authentication properties
+#-------------------------
+
 # Group=Authentication
+# Description=Location of the Authentication Service
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+# Group=Authentication
 # Description=The types of messages for which Authentication is to be 
enabled (if Authentication 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.3.1
-
 # Group=Authentication
 # Description=If the authentication is enabled or not
 service.as.authn_active=off
-
-# Group=Global
-# Description=The e-mail address of the contact person for the service
-service.r.contact_email=
-
-# Group=Internal
-# Description=Types of messages supported by this service
-service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

Modified: trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/wizard.properties       2008-06-06 
11:47:45 UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/conf/wizard.properties       2008-06-06 
13:00:20 UTC (rev 3966)
@@ -20,92 +20,153 @@
 ]>
 <properties>
   <comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>
+  
   <property>
-    <entry key="service.r.service_version">1.3.1</entry>
-    <Comment>Enter the version of the service</Comment>
-    <ProposedValue>1.3.1</ProposedValue>
+    <entry key="service.r.service_name" 
required="true">geant2-java-sshtelnet-mp</entry>
+    <Comment>Enter the service name:</Comment>
+    <ProposedValue>geant2-java-sshtelnet-mp</ProposedValue>
     <Group order="1">LS</Group>
   </property>
+
   <property>
-    <entry key="service.r.ls_url" 
required="true">http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</entry>
-    <Comment>Give the LS url</Comment>
-    
<ProposedValue>http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</ProposedValue>
+    <entry key="service.r.service_description">perfSONAR Java SSH TELNET 
MP</entry>
+    <Comment>Enter a description for the service:</Comment>
+    <ProposedValue>perfSONAR Java SSH TELNET MP</ProposedValue>
     <Group order="2">LS</Group>
   </property>
+
   <property>
+    <entry 
key="service.r.contact_email">user@domain</entry>
+    <Comment>Enter the service administrator's email address:</Comment>
+    
<ProposedValue>user@domain</ProposedValue>
+    <Group order="3">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.organization_name">Institution</entry>
+    <Comment>Enter the name of the organization running this 
service:</Comment>
+    <ProposedValue>Institution</ProposedValue>
+    <Group order="4">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.ls_url" required="true">http://somewhere</entry>
+    <Comment>Enter the LS URL:</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
+    <Group order="5">LS</Group>
+  </property>
+
+  <property>
+    <entry key="component.registrator.interval">30000</entry>
+    <Comment>Set the registration interval (milliseconds):</Comment>
+    <ProposedValue>30000</ProposedValue>
+    <Group order="6">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.access_point" 
required="true">http://somewhere</entry>
+    <Comment>Enter the service access point:</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
+    <Group order="7">LS</Group>
+  </property>  
+  
+  <!--
+  <property>
     <entry key="service.ls.registration_file" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
     <Comment>Give the path to the metadataconfiguration file which needs to 
be uploaded to the LS</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
-    <Group order="3">LS</Group>
+    <Group order="8">LS</Group>
   </property>
+  -->
+  
+  
   <property>
     <entry key="component.mp.xmldb.db_adminpassword" required="true" 
password="true" />
     <Comment>Give the admin password for the eXist database</Comment>
     <ProposedValue />
     <Group order="7">eXist</Group>
   </property>
+  
   <property>
     <entry key="old_adminpassword" required="true" 
password="true">admin</entry>
     <Comment>Give the old admin password for the eXist database</Comment>
     <ProposedValue>admin</ProposedValue>
   <Group order="6">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.db_uri" 
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
     <Comment>Give the URI for the eXist database</Comment>
     
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
     <Group order="3">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.db_username" 
required="true">sshtelnet</entry>
     <Comment>Give the username for the eXist database</Comment>
     <ProposedValue>sshtelnet</ProposedValue>
     <Group order="4">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.metadata_file_name" 
required="true">sshtelnetmetadata.xml</entry>
     <Comment>Give the name of the metadata configuration file</Comment>
     <ProposedValue>sshtelnetmetadata.xml</ProposedValue>
     <Group order="1">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.metadata_file_path" 
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
     <Comment>Give the path to the metadata configuration file (needed for 
uploading the file into eXist)</Comment>
     
<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
     <Group order="2">eXist</Group>
   </property>
+  
   <property>
     <entry key="component.mp.xmldb.db_password" required="true" 
password="true">sshtelnet</entry>
     <Comment>Give the non-admin password for the eXist database (for the 
user specified above)</Comment>
     <ProposedValue>sshtelnet</ProposedValue>
     <Group order="5">eXist</Group>
   </property>
+  
+  
   <property>
     <entry key="servlet.username" required="true">perfsonaruser</entry>
     <Comment>Give the username to use for logging in to the admin 
pages</Comment>
     <ProposedValue>perfsonaruser</ProposedValue>
     <Group order="1" check="false">Administration</Group>
   </property>
+  
   <property>
     <entry key="servlet.password" required="true" 
password="true">perfsonarpass</entry>
     <Comment>Give the password to use for logging in to the admin 
pages</Comment>
     <ProposedValue>perfsonarpass</ProposedValue>
     <Group order="2">Administration</Group>
   </property>
+  
+  
    <property>
     <entry key="service.as.authn_active" required="true">no</entry>
     <Comment>Do you wish to enable authentication?</Comment>
     <ProposedValue>yes</ProposedValue>
-    <Group order="1" check="true">AS</Group>
+    <Group order="1" check="true">Authentication</Group>
     <AcceptedValue>yes</AcceptedValue>
     <AcceptedValue>no</AcceptedValue>
   </property>
+  
   <property>
     <entry key="service.as.point" 
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
     <Comment>Enter the URL address of the Authentication Service:</Comment>
     
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
-    <Group order="2">AS</Group>
+    <Group order="2">Authentication</Group>
   </property>
+  
+    <property>
+    <entry key="service.as.authn_for_msg_types" 
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+    <Comment>Enter the message types which should be authenticated:</Comment>
+    <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+    <Group order="3">Authentication</Group>
+  </property>
 </properties>
 
 

Modified: trunk/geant2_java-sshtelnet-mp/doc/Metadata Configuration file for 
SSHTelnet 1.3.doc
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-sshtelnet-mp/doc/changelog.txt
===================================================================
--- trunk/geant2_java-sshtelnet-mp/doc/changelog.txt    2008-06-06 11:47:45 
UTC (rev 3965)
+++ trunk/geant2_java-sshtelnet-mp/doc/changelog.txt    2008-06-06 13:00:20 
UTC (rev 3966)
@@ -1,6 +1,12 @@
 Change log
 ----------
 
+1.3.2  - 06/06/2008
+
+ * ps-base version: 1.0.20080310
+ * web-admin version: 0.8.3b
+ * fixed the bug which prevented the SSHTELNET MP from registering to the LS
+
 1.3.1  - 28/05/2008
 
  * ps-base version: 1.0.20080310

Modified: 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
   2008-06-06 11:47:45 UTC (rev 3965)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
   2008-06-06 13:00:20 UTC (rev 3966)
@@ -9,19 +9,10 @@
 package 
org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters;
 
 import java.awt.Toolkit;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.Provider;
-import java.security.Security;
-import java.security.Provider.Service;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.StringTokenizer;
 
-import javax.crypto.Cipher;
-import javax.swing.SwingUtilities;
-
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.EventType;
 import org.ggf.ns.nmwg.base.v2_0.Message;
@@ -37,7 +28,9 @@
 import org.perfsonar.base.exceptions.PerfSONARException;
 import org.perfsonar.service.base.engine.ActionType;
 import org.perfsonar.service.base.engine.ServiceEngine;
-//import 
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
+import org.perfsonar.service.base.registration.GenericServiceLSRegistrator;
+import org.perfsonar.service.base.registration.PropertiesServiceDescription;
+import org.perfsonar.service.base.registration.ServiceLSRegistrator;
 import 
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.DbMetadataConfiguration;
 import 
org.perfsonar.service.measurementPoint.lookingGlassType.metadata.MetadataConfiguration;
 
@@ -85,7 +78,7 @@
 
             devices = 
configuration.getProperties(MetadataConfiguration.DEVICE_NAMES);
 
-            registerServiceWithLS();
+            //registerServiceWithLS();
             
             if (!arrayInitialized){
                count = new int[devices.size()];
@@ -519,21 +512,24 @@
 
     }
 
-    private void registerServiceWithLS() {
-    /**
-     * try { ServiceLSRegistrator registrator = new
-     * GenericServiceLSRegistrator (new PropertiesServiceDescription(),
-     * null);
-     * 
-     * registrator.initRegistrator();
-     * 
-     * Message responseMessage =
-     * 
registrator.register("http://chaos4.test:8080/axis/services/LookupService";);
-     * System.out.println(responseMessage); } catch (PerfSONARException e) { 
//
-     * TODO Auto-generated catch block e.printStackTrace(); }
-     */
-    }
+    /*private void registerServiceWithLS() {
+    
+       try { 
+               ServiceLSRegistrator registrator = new                  
+               GenericServiceLSRegistrator (new 
PropertiesServiceDescription(),
+                               null);
 
+               registrator.initRegistrator();
+       
+               Message responseMessage =
+                       
registrator.register("http://chaos4.test:8080/axis/services/LookupService";);
+
+               System.out.println(responseMessage); 
+       } catch (PerfSONARException e) { 
+               e.printStackTrace(); 
+               }
+    }*/
+
     // THREAD TESTING PURPOSES
     public class SimpleThread extends Thread {
 

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-06-06 11:47:45 UTC (rev 3965)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
  2008-06-06 13:00:20 UTC (rev 3966)
@@ -184,7 +184,7 @@
 
     public List getProperties(String property) throws PerfSONARException {
 
-        //logger.debug("[DbMetadataConfiguration] getProperties(" + property 
+ ") called.");
+        logger.debug("[DbMetadataConfiguration] getProperties(" + property + 
") called.");
 
 
         String query = "";
@@ -197,14 +197,14 @@
             query += "return data($i)";
         }
 
-        //logger.debug("[DbMetadataConfiguration] query: " + query);
+        logger.debug("[DbMetadataConfiguration] query: " + query);
 
         Object object = null;
         try {
             object = this.existDbXmlStorageManager.fetch(query);
         } catch (Exception ex) {
             
logger.error("[DBMETADATACONFIGURATION][GetProperties]DbMetadataConfiguration.getProperties:
 " + "Connection to xml database failed: " + ex.toString());
-            //ex.printStackTrace();
+            ex.printStackTrace();
             throw new PerfSONARException(
                     "error.common.storage.xmldb",
                     "DbMetadataConfiguration.getProperties: " + "Connection 
to xml database failed");
@@ -217,7 +217,7 @@
                     "DbMetadataConfiguration.getProperties: " + "Result 
array of metadata search in null");
         }
 
-        //logger.debug("DbMetadataConfiguration.getProperties: " + "The 
number of elements returned as a result of xquery statement: " + 
xmlResults.length);
+        logger.debug("DbMetadataConfiguration.getProperties: " + "The number 
of elements returned as a result of xquery statement: " + xmlResults.length);
 
         if (xmlResults.length == 0) {
             throw new PerfSONARException(

Modified: 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
  2008-06-06 11:47:45 UTC (rev 3965)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
  2008-06-06 13:00:20 UTC (rev 3966)
@@ -742,7 +742,7 @@
                BufferedReader br = new BufferedReader(fr);
                String line = "";
                while (line != null) {
-                       if (line.startsWith("#ma_scheduler")) {
+                       if (line.startsWith("#scheduler")) {
                                line = line.substring(1);
                        }
                        if (line.startsWith("#registrator")) {
@@ -774,7 +774,7 @@
                BufferedReader br = new BufferedReader(fr);
                String line = "";
                while (line != null) {
-                       if (line.startsWith("ma_scheduler")) {
+                       if (line.startsWith("scheduler")) {
                                line = "#" + line;
                        }
                        if (line.startsWith("registrator")) {