perfsonar development work

Author: mac
Date: 2008-05-30 10:39:45 -0400 (Fri, 30 May 2008)
New Revision: 3926

Added:
   trunk/geant2_java-xml-ls/ant/const.properties
   trunk/geant2_java-xml-ls/ant/copy1
   trunk/geant2_java-xml-ls/conf/axis-1.4/index_sqlma.html
   trunk/geant2_java-xml-ls/conf/axis-1.4/testdepl.jsp
   trunk/geant2_java-xml-ls/conf/components.properties
   trunk/geant2_java-xml-ls/conf/log4j.properties
   trunk/geant2_java-xml-ls/conf/service.properties
   trunk/geant2_java-xml-ls/samples/requests/EchoResponse.xml
   trunk/geant2_java-xml-ls/samples/requests/LSRegisterResponse-Update.xml
   trunk/geant2_java-xml-ls/samples/responses/
   trunk/geant2_java-xml-ls/samples/responses/EchoResponse.xml
   trunk/geant2_java-xml-ls/samples/responses/LSDeregisterResponse.xml
   trunk/geant2_java-xml-ls/samples/responses/LSKeepaliveResponse.xml
   trunk/geant2_java-xml-ls/samples/responses/LSQueryResponse.xml
   trunk/geant2_java-xml-ls/samples/responses/LSRegisterResponse-Update.xml
   trunk/geant2_java-xml-ls/samples/responses/LSRegisterResponse.xml
Removed:
   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/fingerprint.jsp
   trunk/geant2_java-xml-ls/conf/axis-1.4/happyaxis.jsp
   trunk/geant2_java-xml-ls/conf/axis-1.4/i18nLib.jsp
   trunk/geant2_java-xml-ls/conf/axis-1.4/index.jsp
   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
Modified:
   trunk/geant2_java-xml-ls/conf/axis-1.4/index.html
   trunk/geant2_java-xml-ls/conf/axis-1.4/wizard.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
   trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties
Log:
configuration, documentation, etc.

Added: trunk/geant2_java-xml-ls/ant/const.properties

Added: trunk/geant2_java-xml-ls/ant/copy1


Property changes on: trunk/geant2_java-xml-ls/ant/copy1
___________________________________________________________________
Name: svn:executable
   + *

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

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

Deleted: trunk/geant2_java-xml-ls/conf/axis-1.4/fingerprint.jsp

Deleted: trunk/geant2_java-xml-ls/conf/axis-1.4/happyaxis.jsp

Deleted: trunk/geant2_java-xml-ls/conf/axis-1.4/i18nLib.jsp

Modified: trunk/geant2_java-xml-ls/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-xml-ls/conf/axis-1.4/index.html   2008-05-30 14:32:04 
UTC (rev 3925)
+++ trunk/geant2_java-xml-ls/conf/axis-1.4/index.html   2008-05-30 14:39:45 
UTC (rev 3926)
@@ -75,10 +75,12 @@
                                 </p>
                                 <p>
                                     <span class="navtex"><a href="Wizard" 
target="main">Service</a></span>
+                                 <br>
+                                        <a href="testdepl.jsp" 
target="main">Test</a>
                                 </p>
-                                </p>
                             </td>
                         </tr>
+
                         <tr>
                             <td>
                                 <p>

Deleted: trunk/geant2_java-xml-ls/conf/axis-1.4/index.jsp

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/index_sqlma.html

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

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

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

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

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

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

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

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

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

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

Added: trunk/geant2_java-xml-ls/conf/axis-1.4/testdepl.jsp

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

Modified: trunk/geant2_java-xml-ls/conf/axis-1.4/wizard.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/axis-1.4/wizard.properties    2008-05-30 
14:32:04 UTC (rev 3925)
+++ trunk/geant2_java-xml-ls/conf/axis-1.4/wizard.properties    2008-05-30 
14:39:45 UTC (rev 3926)
@@ -1,158 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties [
- <!ELEMENT properties ( comment?, property* )>
-<!ATTLIST properties version CDATA #FIXED "0.1">
-<!ELEMENT comment (#PCDATA) >
-<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
-<!ELEMENT entry (#PCDATA) >
-<!ATTLIST entry
-key CDATA #REQUIRED
-               password (true|false) #IMPLIED
-               required (true|false) #IMPLIED  >
-<!ELEMENT Comment (#PCDATA) >
-<!ELEMENT ProposedValue (#PCDATA) >
-<!ELEMENT Group (#PCDATA) >
-<!ATTLIST Group 
-  order CDATA #REQUIRED 
- check (true|false) #IMPLIED 
->
-<!ELEMENT AcceptedValue (#PCDATA) >
+<!DOCTYPE properties [
+ <!ELEMENT properties ( comment?, property* )>
+<!ATTLIST properties version CDATA #FIXED "0.1">
+<!ELEMENT comment (#PCDATA) >
+<!ELEMENT property (entry,Comment,ProposedValue,Group+,AcceptedValue*) >
+<!ELEMENT entry (#PCDATA) >
+<!ATTLIST entry
+key CDATA #REQUIRED
+               password (true|false) #IMPLIED
+               required (true|false) #IMPLIED  >
+<!ELEMENT Comment (#PCDATA) >
+<!ELEMENT ProposedValue (#PCDATA) >
+<!ELEMENT Group (#PCDATA) >
+<!ATTLIST Group 
+  order CDATA #REQUIRED 
+ check (true|false) #IMPLIED 
+>
+<!ELEMENT AcceptedValue (#PCDATA) >
 ]>
 <properties>
-  <comment>Last Modification Thu Dec 13 16:10:40 EET 2007</comment>
+  <comment>Last Modification Tue Apr 15 11:11:11 EEST 2008</comment>
   <property>
-    <entry key="service.r.service_version">2.3.1</entry>
-    <Comment>Enter the version of the service</Comment>
-    <ProposedValue>2.3.1</ProposedValue>
-    <Group order="3">LS</Group>
-  </property>
-  <property>
     <entry key="component.ma.xmldb.db_username" 
required="true">rrdmaservice</entry>
-    <Comment>Enter the service username for the exist user</Comment>
+    <Comment>Enter the service username for the eXist user:</Comment>
     <ProposedValue>rrdmaservice</ProposedValue>
-    <Group order="4">eXist</Group>
+    <Group order="3">eXist</Group>
   </property>
   <property>
-    <entry key="component.ma.xmldb.db_password" required="true" 
password="true">perfsonar</entry>
-    <Comment>Enter the password for the exist user</Comment>
+    <entry key="old_adminpassword" required="true" 
password="true">perfsonar</entry>
+    <Comment>Enter the old eXist administration password:</Comment>
     <ProposedValue>perfsonar</ProposedValue>
     <Group order="5">eXist</Group>
   </property>
   <property>
-    <entry key="component.ma.xmldb.type" required="true">webapp</entry>
-    <Comment>Choose the type of exist installation</Comment>
-    <ProposedValue>webapp</ProposedValue>
-    <Group order="2">eXist</Group>
-    <AcceptedValue>webapp</AcceptedValue>
-    <AcceptedValue>stand-alone</AcceptedValue>
+    <entry key="component.ma.xmldb.db_password" required="true" 
password="true">perfsonar</entry>
+    <Comment>Enter the password for the eXist user:</Comment>
+    <ProposedValue>perfsonar</ProposedValue>
+    <Group order="4">eXist</Group>
   </property>
   <property>
-    <entry key="component.ma.xmldb.db_status" required="true">on</entry>
-    <Comment>Would you like to use eXist db?</Comment>
-    <ProposedValue>on</ProposedValue>
-    <Group order="1" check="true">eXist</Group>
-    <AcceptedValue>on</AcceptedValue>
-    <AcceptedValue>off</AcceptedValue>
-  </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>
+    <entry key="servlet.password" required="true" 
password="true">test</entry>
+    <Comment>Enter the password for logging in to the admin pages:</Comment>
+    <ProposedValue>test</ProposedValue>
     <Group order="2">Administration</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>
+    <entry key="servlet.username" required="true">test</entry>
+    <Comment>Enter the username for logging in to the admin pages:</Comment>
+    <ProposedValue>test</ProposedValue>
     <Group order="1" check="false">Administration</Group>
   </property>
   <property>
-    <entry key="service.ma.rrd.xmldb.db_store.data_dir" 
required="true">/home/perfsonar/webapps</entry>
-    <Comment>Give the directory where the new rrd files will be 
stored</Comment>
-    <ProposedValue>/home/perfsonar/webapps</ProposedValue>
-    <Group order="2">Store</Group>
-  </property>
-  <property>
-    <entry key="service.ma.conf_file" 
required="true">/home/perfsonar/webapps/geant2_java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
-    <Comment>Enter the full path of the metadata configuration file</Comment>
-    
<ProposedValue>/home/perfsonar/webapps/geant2_java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
+    <entry key="service.ma.conf_file" 
required="true">/home/perfsonar/webapps/geant2_java-rrd-ma-x86_32-3.0rc3/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
+    <Comment>Enter the full path of the metadata configuration 
file:</Comment>
+    
<ProposedValue>/home/perfsonar/webapps/geant2_java-rrd-ma-x86_32-3.0rc3/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
     <Group order="7">eXist</Group>
   </property>
   <property>
-    <entry key="service.r.ls_url" required="true">http://somewhere</entry>
-    <Comment>Give the LS url</Comment>
-    <ProposedValue>http://somewhere</ProposedValue>
-    <Group order="7">LS</Group>
+    <entry key="service.r.ls_url" 
required="true">http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</entry>
+    <Comment>Enter the LS URL:</Comment>
+    
<ProposedValue>http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</ProposedValue>
+    <Group order="5">LS</Group>
   </property>
   <property>
-    <entry key="service.ma.xmldb.db_store" required="true">on</entry>
-    <Comment>Do you want the service to accept store messages?</Comment>
-    <ProposedValue>on</ProposedValue>
-    <Group order="1" check="true">Store</Group>
-    <AcceptedValue>on</AcceptedValue>
-    <AcceptedValue>off</AcceptedValue>
-  </property>
-  <property>
     <entry key="service.r.organization_name">CyNet</entry>
-    <Comment>Enter the name of the organization running this 
service.</Comment>
+    <Comment>Enter the name of the organization running this 
service:</Comment>
     <ProposedValue>CyNet</ProposedValue>
-    <Group order="6">LS</Group>
+    <Group order="4">LS</Group>
   </property>
   <property>
-    <entry 
key="service.r.contact_email"></entry>
-    <Comment>Enter the email address of the person administrating the 
service</Comment>
-    
<ProposedValue></ProposedValue>
-    <Group order="5">LS</Group>
-  </property>
-  <property>
     <entry key="component.ma.xmldb.db_uri" 
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
-    <Comment>Enter the location of the eXist database</Comment>
+    <Comment>Enter the location of the eXist database:</Comment>
     <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc</ProposedValue>
-    <Group order="3">eXist</Group>
+    <Group order="2">eXist</Group>
   </property>
   <property>
+    <entry 
key="service.r.contact_email"></entry>
+    <Comment>Enter the service administrator's email address:</Comment>
+    
<ProposedValue></ProposedValue>
+    <Group order="3">LS</Group>
+  </property>
+  <property>
     <entry key="component.ma.xmldb.db_adminpassword" required="true" 
password="true">perfsonar</entry>
-    <Comment>Enter the administration password for exist</Comment>
+    <Comment>Enter the new eXist administration password:</Comment>
     <ProposedValue>perfsonar</ProposedValue>
     <Group order="6">eXist</Group>
   </property>
   <property>
-    <entry key="service.r.service_description">RRD MA</entry>
-    <Comment>Give a description of the  service</Comment>
-    <ProposedValue>RRD MA</ProposedValue>
-    <Group order="4">LS</Group>
+    <entry key="service.r.service_description">perfSONAR JavaRRD MA</entry>
+    <Comment>Enter a description for the service:</Comment>
+    <ProposedValue>perfSONAR JavaRRD MA</ProposedValue>
+    <Group order="2">LS</Group>
   </property>
   <property>
-    <entry key="service.r.access_point" 
required="true">http://somewhere</entry>
-    <Comment>Give the service access point</Comment>
-    <ProposedValue>http://somewhere</ProposedValue>
-    <Group order="9">LS</Group>
+    <entry key="service.r.access_point" 
required="true">http://perfsonartest.usr.cynet.ac.cy:8080/geant2_java-rrd-ma-x86_32/services/MeasurementArchiveService</entry>
+    <Comment>Enter the service access point:</Comment>
+    
<ProposedValue>http://perfsonartest.usr.cynet.ac.cy:8080/geant2_java-rrd-ma-x86_32/services/MeasurementArchiveService</ProposedValue>
+    <Group order="7">LS</Group>
   </property>
   <property>
-    <entry 
key="component.registrator.scheduler_component">ma_scheduler</entry>
-    <Comment>Give the registration componenet</Comment>
-    <ProposedValue>ma_scheduler</ProposedValue>
-    <Group order="10">LS</Group>
-    <AcceptedValue>ma_scheduler</AcceptedValue>
+    <entry key="service.r.service_name" required="true">perfSONAR Java RRD 
MA</entry>
+    <Comment>Enter the service name:</Comment>
+    <ProposedValue>perfSONAR Java RRD MA</ProposedValue>
+    <Group order="1" check="false">LS</Group>
   </property>
   <property>
-    <entry key="service.r.service_name" required="true">Cynet RRD MA</entry>
-    <Comment>Enter the service name</Comment>
-    <ProposedValue>Cynet RRD MA</ProposedValue>
-    <Group order="2">LS</Group>
+    <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.service_type" required="true">ma</entry>
-    <Comment>Enter the type of the service</Comment>
-    <ProposedValue>ma</ProposedValue>
-    <Group order="1" check="false">LS</Group>
-    <AcceptedValue>ma</AcceptedValue>
+ <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>
+    <AcceptedValue>yes</AcceptedValue>
+    <AcceptedValue>no</AcceptedValue>
   </property>
   <property>
-    <entry key="component.registrator.interval">3000</entry>
-    <Comment>Give the registration interval</Comment>
-    <ProposedValue>3000</ProposedValue>
-    <Group order="8">LS</Group>
+    <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>
   </property>
 </properties>
 

Added: trunk/geant2_java-xml-ls/conf/components.properties

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties        
2008-05-30 14:32:04 UTC (rev 3925)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/components.properties        
2008-05-30 14:39:45 UTC (rev 3926)
@@ -17,8 +17,11 @@
 # Description=The Lookup service scheduler, needed for other functionalities 
such as LS Cleanup and dLS.
 
ls_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
-# Group=Scheduler
+# Group=LS_Cleanup
 # Description=LS Cleanup component (loaded by LSCleanupLoader, needs 
scheduler).
 ls_cleanup_loader=org.perfsonar.service.lookupService.xmlType.LSCleanupLoader
 
+# Group=LS_Registration
+# Description=LS Registration component (needs scheduler).
+#registrator=org.perfsonar.service.base.registration.LSRegistrationComponent
 

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-05-30 
14:32:04 UTC (rev 3925)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/service.properties   2008-05-30 
14:39:45 UTC (rev 3926)
@@ -55,7 +55,11 @@
 # Description=Determines whether services can re-register with LS (yes) or 
have to unregister before they can register with it again or perform update 
operation (no).
 service.ls.allow_replace=yes
 
+# Group=Internal
+# Description=Determines whether LS is gLS (and accepts only summary 
registration)
+service.ls.gls=true
 
+
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of Database functionality
 
@@ -111,14 +115,75 @@
 service.r.service_type=ls
 
 
+# Group=LS
+# Description=The URL address of the LS service.
+service.r.ls_url=http://buttercup.man.poznan.pl/xml-ls/services/LookupService
 
+# Group=LS
+# Description=The URL address of the service configured by this 
configuration file.
+service.r.access_point=http://my-ls
+
+# Group=LS
+# Description=The name of the organisation who is deploying the service.
+service.r.organization_name=PSNC
+
+# Group=LS
+# Description=The name of the service (can contain multiple words).
+service.r.service_name=PSNC test LS
+
+# Group=LS
+# Description=The version number of the service.
+service.r.service_version=1.3
+
+# Group=LS
+# Description=The email address of the person who manages the service.
+service.r.contact_email=user@domain
+
+# Group=LS
+# Description=The description of the service.
+service.r.service_description=perfSONAR service
+
+# Group=LS
+# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
+component.registrator.interval=43200
+
+# 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=ls_scheduler
+
+# Group=LS
+# Way how to get the service lookup information data
+service.ls.service_content_type=lssummary
+
+
+
 # 
-----------------------------------------------------------------------------------------------
+# Configuration of AuthN functionality
+
+
+# Group=Authentication
+# Description=The URL address 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 required).
+service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+
+# Group=Authentication
+# Description=Determines if authentication is enabled (on) or not (off).
+service.as.authn_active=off
+
+
+
+
+
+# 
-----------------------------------------------------------------------------------------------
 # Configuration of Logging functionality
 
 
 #Group=Logging
 #Description=The location of the the log4j logger configuration file.
-service.log.log4j.config=/home/perfsonar/webapps/XML-LS-1.2/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/opt/perfsonar/services/xml-ls/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 
 
@@ -128,4 +193,4 @@
 
 #Group=SAX
 #Description=The location of the SAX parser configuration.
-service.sax_parser.config=/home/perfsonar/webapps/XML-LS-1.2/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/opt/perfsonar/services/xml-ls/WEB-INF/classes/perfsonar/conf/objects.config

Modified: trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties
===================================================================
--- trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties    2008-05-30 
14:32:04 UTC (rev 3925)
+++ trunk/geant2_java-xml-ls/conf/conf-rpm/wizard.properties    2008-05-30 
14:39:45 UTC (rev 3926)
@@ -47,4 +47,98 @@
   </property>
 
 
+
+
+
+
+
+  <property>
+    <entry key="service.ls.registration_status" required="true">off</entry>
+    <Comment>Would you like to LS registration?</Comment>
+    <ProposedValue>off</ProposedValue>
+    <Group order="2" check="true">LS</Group>
+    <AcceptedValue>on</AcceptedValue>
+    <AcceptedValue>off</AcceptedValue>
+  </property>
+
+  <property>
+    <entry key="service.r.service_name" required="true">perfSONAR Java XML 
LS</entry>
+    <Comment>Enter the service name:</Comment>
+    <ProposedValue>My institution perfSONAR LS</ProposedValue>
+    <Group order="1">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.service_description">perfSONAR Java XML LS</entry>
+    <Comment>Enter a description for the service:</Comment>
+    <ProposedValue>My institution perfSONAR LS</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 (not localhost!):</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
+    <Group order="5">LS</Group>
+  </property>
+
+  <property>
+    <entry key="component.registrator.interval">43200</entry>
+    <Comment>Set the registration interval (seconds):</Comment>
+    <ProposedValue>43200</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.as.authn_active" required="true">off</entry>
+    <Comment>Do you wish to enable authentication?</Comment>
+    <ProposedValue>on</ProposedValue>
+    <Group order="1" check="true">Authentication</Group>
+    <AcceptedValue>on</AcceptedValue>
+    <AcceptedValue>off</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">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>LSRegisterRequest,LSDeregisterRequest,LSQueryRequest,LSControlRequest,LSKeepaliveRequest</ProposedValue>
+    <Group order="3">Authentication</Group>
+  </property>
+
+
+
 </properties>
\ No newline at end of file

Added: trunk/geant2_java-xml-ls/conf/log4j.properties

Added: trunk/geant2_java-xml-ls/conf/service.properties

Added: trunk/geant2_java-xml-ls/samples/requests/EchoResponse.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/requests/EchoResponse.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/samples/requests/LSRegisterResponse-Update.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/requests/LSRegisterResponse-Update.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/samples/responses/EchoResponse.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/responses/EchoResponse.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/samples/responses/LSDeregisterResponse.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/responses/LSDeregisterResponse.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/samples/responses/LSKeepaliveResponse.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/responses/LSKeepaliveResponse.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/samples/responses/LSQueryResponse.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/responses/LSQueryResponse.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/geant2_java-xml-ls/samples/responses/LSRegisterResponse-Update.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/responses/LSRegisterResponse-Update.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/samples/responses/LSRegisterResponse.xml


Property changes on: 
trunk/geant2_java-xml-ls/samples/responses/LSRegisterResponse.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native