perfsonar development work

Author: roman
Date: 2008-02-13 10:08:22 -0500 (Wed, 13 Feb 2008)
New Revision: 3353

Modified:
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
   branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/components.properties.template
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/servlet.properties
   branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizard.properties
Log:
updated to include recent changes in the trunk



Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-02-13 13:56:00 UTC (rev 3352)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml      
2008-02-13 15:08:22 UTC (rev 3353)
@@ -47,7 +47,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -246,7 +246,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-02-13 13:56:00 UTC (rev 3352)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/ant/libs-download-targets.xml    
2008-02-13 15:08:22 UTC (rev 3353)
@@ -56,7 +56,7 @@
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080207"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.5b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.6b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 
 

Modified: 
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/components.properties.template
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/components.properties.template    
  2008-02-13 13:56:00 UTC (rev 3352)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/components.properties.template    
  2008-02-13 15:08:22 UTC (rev 3353)
@@ -6,21 +6,27 @@
 # Config and logger MUST be loaded first!
 
 
-# Configuration component - must be the first one!
+# Group=Configuration
+# Description=Configuration component - must be declared as the first one in 
this configuration!
 
config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
 
-# Logger component - must be the second one!
+# Group=Logging
+# Description=Logger component - must be decalred as the second one in this 
configuration!
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 
-# Simple scheduler
+# Group=LS
+# Description=Scheduler component used for sending LS register requests
 
#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
 
-# Registration in LS
+# Group=LS
+# Description=Registration component representing register functionality
 
#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
 
 
+# Group=Configuration
+# Description=Configuration component for NMWG event type elements
 
eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
 

Modified: 
branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2     
  2008-02-13 13:56:00 UTC (rev 3352)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/service.properties.template-2     
  2008-02-13 15:08:22 UTC (rev 3353)
@@ -1,40 +1,131 @@
 
 # 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 name of service type which is used to select correct 
message handler implementation
 service.r.type=ma
 
+# Group=Internals
+# Description=The name of java class file which implements ServiceEngine 
interface
 
service.ma.class_name=org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine
+
+# Group=Internals
+# Description=The names of acceptable request message types
 
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
 
+# Group=Internals
+# Description=The name of 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=Indicates whether the xmld db (eXsit) is used as a storage for 
the metadata configuration file or not (off)
+#             Currently only the value 'on' is needed to run the service 
correctly.
 component.ma.xmldb.db_status=on
+
+# Group=eXist
+# Description=Indicates the type of connection to the xml db eXist (xmlrpc 
or http)
+#             Http type is not recommended when transfers of many data are 
expected.
 component.ma.xmldb.db_access=xmlrpc
-component.ma.xmldb.db_uri==xmldb:exist://localhost:8080/exist/xmlrpc/db/rrdmaconfig
+
+# Group=eXist
+# Description=URI address of the collection in xml db eXist that contains 
the metadata confiuration file
+component.ma.xmldb.db_uri=xmldb:exist://localhost:8080/exist/xmlrpc/db/rrdmaconfig
+
+# Group=eXist
+# Description=User name of xml db eXist
 component.ma.xmldb.db_username=rrdmaservice
+
+# Group=eXist
+# Description=User's password
 component.ma.xmldb.db_password=rrdmaservice
+
+# Group=eXist
+# Description=Adminitrator's password of xml db eXist
 component.ma.xmldb.db_adminpassword=
+
+# Group=eXist
+# Description=Indicates how xml db eXist is installed (webapp or stand-alone)
 component.ma.xmldb.type=webapp
 
-service.ma.xmldb.db_store=off
 
 
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of LS functionality
+
+
+# Group=LS
+# Description=Indicates the service type
 service.r.service_type=ma
+
+# Group=LS
+# Description=URL address of LS service
 service.r.ls_url=http://somewhere
+
+# Group=LS
+# Description=URL address of the service being configured by this 
configuration file
 service.r.access_point=http://somewhere
+
+# Group=LS
+# Description=Organization name owning the service
 service.r.organization_name=X
-service.r.service_name=pS java rrd ma 
+
+# Group=LS
+# Description=Service name (can contain descriptive multiple words)
+service.r.service_name=pS java rrd ma
+
+# Group=LS
+# Description=Version number of the service
 service.r.service_version=3.0
+
+# Group=LS
+# Description=E-mail address of a person who manages the service
 
service.r.contact_email=user@domain
 
+# Group=LS
+# Description=The time (miliseconds) between register requests to the LS 
service
+component.registrator.interval=30000
 
+# Group=LS
+# Description=The name of scheduler component (the implementation of this 
component must be declared also in components.properties file)
+component.registrator.scheduler_component=ma_scheduler
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of store functionality
+# Warninig: This functionality is still in the experimental phase so it is 
not enough stable and tested.
+
+
+# Group=Store
+# Description=Indicates whether the functionality of storing new data sent 
to the service is switch on or off
+service.ma.xmldb.db_store=off
+
+# Group=Store
+# Description=RRDTool parameter used while creating new rrd files
 
service.ma.rrd.rrd_storage_manager_rrd_DS_type_default=COUNTER:1800:0:10000000000000
+
+# Group=Store
+# Description=RRDTool parameter used while creating new rrd files
 service.ma.rrd.rrd_storage_manager_rrd_step_default=300
+
+# Group=Store
+# Description=RRDTool parameter used while creating new rrd files
 
service.ma.rrd.rrd_storage_manager_rrd_RRA_default=MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600
+
+# Group=Store
+# Description=The directory where new rrd files will be located
 service.ma.rrd.xmldb.db_store.data_dir=/home/perfsonar
-
-
-component.registrator.interval=30000
-component.registrator.scheduler_component=ma_scheduler
-

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/servlet.properties
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/servlet.properties  2008-02-13 
13:56:00 UTC (rev 3352)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/servlet.properties  2008-02-13 
15:08:22 UTC (rev 3353)
@@ -16,3 +16,7 @@
 
 #The property inside the service.properties file that holds the location of 
the eXist db 
 servlet.exist_location.property=component.ma.xmldb.db_uri
+
+
+#Controls the use of advanced features in the properties management servlet. 
Default value is “off”
+servlet.extra_functionalities=off
\ No newline at end of file

Modified: branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizard.properties   2008-02-13 
13:56:00 UTC (rev 3352)
+++ branches/GEANT2_JAVA-RRD-MA-STABLE/conf/wizard.properties   2008-02-13 
15:08:22 UTC (rev 3353)
@@ -28,45 +28,36 @@
 
 
   <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="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="2">eXist</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="3">eXist</Group>
   </property>
 
   <property>
     <entry key="component.ma.xmldb.db_password" required="true" 
password="true">rrdmaservice</entry>
-    <Comment>Enter the password for the exist user</Comment>
+    <Comment>Enter the password for the eXist user:</Comment>
     <ProposedValue>rrdmaservice</ProposedValue>
     <Group order="4">eXist</Group>
   </property>
 
   <property>
     <entry key="component.ma.xmldb.db_adminpassword" required="true" 
password="true"></entry>
-    <Comment>Enter the administration password for exist</Comment>
+    <Comment>Enter the eXist administration password:</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">eXist</Group>
   </property>
 
   <property>
     <entry key="service.ma.conf_file" 
required="true">__BASEPATH__/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
-    <Comment>Enter the full path of the metadata configuration file</Comment>
+    <Comment>Enter the full path of the metadata configuration 
file:</Comment>
     
<ProposedValue>__BASEPATH__/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
     <Group order="6">eXist</Group>
   </property>
@@ -76,108 +67,66 @@
 
 
   <property>
-    <entry key="service.r.service_type">ma</entry>
-    <Comment>Enter the type of the service</Comment>
-    <ProposedValue>ma</ProposedValue>
-    <Group order="1" check="false">LS</Group>
-  </property>
-
-  <property>
     <entry key="service.r.service_name" required="true">perfSONAR Java RRD 
MA</entry>
-    <Comment>Enter the service name</Comment>
+    <Comment>Enter the service name:</Comment>
     <ProposedValue>perfSONAR Java RRD MA</ProposedValue>
-    <Group order="2">LS</Group>
+    <Group order="1">LS</Group>
   </property>
 
   <property>
-    <entry key="service.r.service_version">3.0</entry>
-    <Comment>Enter the version of the service</Comment>
-    <ProposedValue>3.0</ProposedValue>
-    <Group order="3">LS</Group>
-    <AcceptedValue>3.0</AcceptedValue>
-  </property>
-
-  <property>
     <entry key="service.r.service_description">perfSONAR JavaRRD MA</entry>
-    <Comment>Give a description of the  service</Comment>
+    <Comment>Enter a description for the service:</Comment>
     <ProposedValue>perfSONAR JavaRRD MA</ProposedValue>
-    <Group order="4">LS</Group>
+    <Group order="2">LS</Group>
   </property>
 
   <property>
     <entry 
key="service.r.contact_email">user@domain</entry>
-    <Comment>Enter the email address of the person administrating the 
service</Comment>
+    <Comment>Enter the service administrator's email address:</Comment>
     
<ProposedValue>user@domain</ProposedValue>
-    <Group order="5">LS</Group>
+    <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>
+    <Comment>Enter the name of the organization running this 
service:</Comment>
     <ProposedValue>Institution</ProposedValue>
-    <Group order="6">LS</Group>
+    <Group order="4">LS</Group>
   </property>
 
   <property>
     <entry key="service.r.ls_url" required="true">http://somewhere</entry>
-    <Comment>Give the LS url</Comment>
+    <Comment>Enter the LS URL:</Comment>
     <ProposedValue>http://somewhere</ProposedValue>
-    <Group order="7">LS</Group>
+    <Group order="5">LS</Group>
   </property>
 
   <property>
     <entry key="component.registrator.interval">3000</entry>
-    <Comment>Give the registration interval</Comment>
-    <ProposedValue>3000</ProposedValue>
-    <Group order="8">LS</Group>
+    <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>Give the service access point</Comment>
+    <Comment>Enter the service access point:</Comment>
     <ProposedValue>http://somewhere</ProposedValue>
-    <Group order="9">LS</Group>
+    <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>
-  </property>
 
 
-
-
   <property>
-    <entry key="service.ma.xmldb.db_store" required="true">off</entry>
-    <Comment>Do you want the service to accept store messages?</Comment>
-    <ProposedValue>off</ProposedValue>
-    <Group order="1" check="true">Store</Group>
-    <AcceptedValue>on</AcceptedValue>
-    <AcceptedValue>off</AcceptedValue>
-  </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="servlet.username" required="true">perfsonaruser</entry>
-    <Comment>Give the username to use for logging in to the admin 
pages</Comment>
+    <Comment>Enter the username 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>
+    <Comment>Enter the password for logging in to the admin pages:</Comment>
     <ProposedValue>perfsonarpass</ProposedValue>
     <Group order="2">Administration</Group>
   </property>