perfsonar development work

Author: roman
Date: 2008-03-05 07:33:26 -0500 (Wed, 05 Mar 2008)
New Revision: 3470

Modified:
   trunk/geant2_java-sql-ma/conf/service.properties.template
   trunk/geant2_java-sql-ma/conf/service.properties.template-2
   trunk/geant2_java-sql-ma/conf/wizard.properties
Log:

comments added




Modified: trunk/geant2_java-sql-ma/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sql-ma/conf/service.properties.template   2008-03-05 
12:32:21 UTC (rev 3469)
+++ trunk/geant2_java-sql-ma/conf/service.properties.template   2008-03-05 
12:33:26 UTC (rev 3470)
@@ -16,6 +16,7 @@
 
 service.ma.xmldb.db_store=off
 
-component.registrator.interval=30000
+component.registrator.interval=900000
 component.registrator.scheduler_component=ma_scheduler
 
+service.ma.conf_file.store_type=xmldb

Modified: trunk/geant2_java-sql-ma/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-sql-ma/conf/service.properties.template-2 2008-03-05 
12:32:21 UTC (rev 3469)
+++ trunk/geant2_java-sql-ma/conf/service.properties.template-2 2008-03-05 
12:33:26 UTC (rev 3470)
@@ -1,28 +1,123 @@
 
+
+# this template file is prepared for the releases with web admin stuff and 
packaged in rpm form
+# $Id$
+# romradz
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of the internal implementation structures
+
+
+# Group=Internals
+# Description=The type of service used to select the correct message handler 
implementation.
 service.r.type=ma
 
+# Group=Internals
+# Description=The java class file which implements the ServiceEngine 
interface.
 
service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
+
+# Group=Internals
+# Description=A CSV of request message types supported by the service.
 
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
+
+# Group=Internals
+# Description=The java class file which implements the base chaining of 
requests.
 
service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
 
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of storing metadata configuration file in xml db eXist
+
+
+# Group=eXist
+# Description=Determines whether the xmld db (eXsit) is used as a storage 
for the metadata configuration file (on) or not (off). Currently only the 
value 'on' is needed to run the service correctly.
 component.ma.xmldb.db_status=on
+
+# Group=eXist
+# Description=The type of connection to the eXist DB (xmlrpc or http). The 
http type is not recommended when transfers of many data are expected.
 component.ma.xmldb.db_access=xmlrpc
+
+# Group=eXist
+# Description=URI address of the collection in the eXist DB that contains 
the metadata configuration file.
 
component.ma.xmldb.db_uri=xmldb:exist://localhost:8080/exist/xmlrpc/db/sqlmaconfig
+
+# Group=eXist
+# Description=The username for the eXist DB.
 component.ma.xmldb.db_username=sqlmaservice
-component.ma.xmldb.db_password=sqlmaservice
+
+# Group=eXist
+# Description=The user password for the eXist DB.
+component.ma.xmldb.db_password=
+
+# Group=eXist
+# Description=The administrator password for the eXist DB.
 component.ma.xmldb.db_adminpassword=
+
+# Group=eXist
+# Description=Determines how the eXist DB is installed (webapp or 
stand-alone).
 component.ma.xmldb.type=webapp
 
-service.ma.xmldb.db_store=off
 
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of LS functionality
+
+
+# Group=LS
+# Description=The service type.
 service.r.service_type=ma
+
+# Group=LS
+# Description=The URL address of the LS 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 who who is deploying the service.
 service.r.organization_name=X
+
+# Group=LS
+# Description=The name of the service (can contain multiple words).
 service.r.service_name=pS java sql ma
+
+# Group=LS
+# Description=The version number of the service.
 service.r.service_version=2.0
+
+# Group=LS
+# Description=The email address of the person who manages the service.
 
service.r.contact_email=user@domain
 
-component.registrator.interval=30000
+# 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 900000 ms; 15 minutes).
+component.registrator.interval=900000
+
+# 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=ma_scheduler
 
+# Group=LS
+# Description='xmldb' value says that metadata elements for register 
requests are taken from xml database. 'file' value means that they are taken 
from xml metadata configuration file.
+service.ma.conf_file.store_type=xmldb
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of store functionality
+
+
+# Group=Store
+# Description=Determines whether new data sent to the service is stored (on) 
or not (off).
+service.ma.xmldb.db_store=off
+
+

Modified: trunk/geant2_java-sql-ma/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sql-ma/conf/wizard.properties     2008-03-05 12:32:21 
UTC (rev 3469)
+++ trunk/geant2_java-sql-ma/conf/wizard.properties     2008-03-05 12:33:26 
UTC (rev 3470)
@@ -42,9 +42,9 @@
   </property>
 
   <property>
-    <entry key="component.ma.xmldb.db_password" required="true" 
password="true">sqlmaservice</entry>
+    <entry key="component.ma.xmldb.db_password" required="true" 
password="true"></entry>
     <Comment>Enter the password for the eXist user:</Comment>
-    <ProposedValue>sqlmaservice</ProposedValue>
+    <ProposedValue></ProposedValue>
     <Group order="3">eXist</Group>
   </property>