perfsonar development work

Author: roman
Date: 2009-03-17 08:27:09 -0400 (Tue, 17 Mar 2009)
New Revision: 5089

Added:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/configure.ls-registration.txt
Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
   branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml
   branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/backward-compatibility.txt
   branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/configure.authN.txt
   branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml
Log:
use of base2 lib ver 0.0.4


Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml  
      2009-03-17 10:54:08 UTC (rev 5088)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml  
      2009-03-17 12:27:09 UTC (rev 5089)
@@ -25,7 +25,7 @@
     <property name="temp"               value="${build.dir}/temp" />
 
     <property name="base2.lib.name"     value="ps-mdm-base2" />
-    <property name="base2.lib.version"  value="0.0.3" />
+    <property name="base2.lib.version"  value="0.0.4" />
 
     <property name="config.file.name"   value="configuration-ma.xml" />
 
@@ -105,7 +105,7 @@
           xmlns:artifact="urn:maven-artifact-ant">
 
         <artifact:dependencies>
-            <dependency groupId="perfsonar"          
artifactId="ps-mdm-base2"       version="0.0.3"/>
+            <dependency groupId="perfsonar"          
artifactId="${base2.lib.name}"  version="${base2.lib.version}"/>
             <dependency groupId="rrdjtool"           artifactId="rrdjtool"   
        version="1.0"/>
             <dependency groupId="joda-time"          artifactId="joda-time"  
        version="1.4"/>
             <dependency groupId="commons-digester"   
artifactId="commons-digester"   version="2.0"/>

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml       
2009-03-17 10:54:08 UTC (rev 5088)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml       
2009-03-17 12:27:09 UTC (rev 5089)
@@ -80,7 +80,7 @@
 
         <artifact:dependencies>
 
-            <dependency groupId="perfsonar"          
artifactId="ps-mdm-base2"       version="0.0.3"/>
+            <dependency groupId="perfsonar"          
artifactId="ps-mdm-base2"       version="0.0.4"/>
             <dependency groupId="rrdjtool"           artifactId="rrdjtool"   
        version="1.0"/>
             <dependency groupId="joda-time"          artifactId="joda-time"  
        version="1.4"/>
             <dependency groupId="commons-digester"   
artifactId="commons-digester"   version="2.0"/>

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml 
  2009-03-17 10:54:08 UTC (rev 5088)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml 
  2009-03-17 12:27:09 UTC (rev 5089)
@@ -17,7 +17,7 @@
       <option name="accessPoint" 
value="http://localhost:8180/ps-mdm-rrd-ma/services/MeasurementArchiveService"/>
       <!-- <option name="accessPoint" 
value="http://localhost:8180/axis2/services/MeasurementArchiveService"/> -->
       <option name="serviceName" value="ps-mdm-rrd-ma"/>
-      <option name="serviceType" value="MeasurementArchive"/>
+      <option name="serviceType" value="ma"/>
 
     </lookupInformation>
 
@@ -108,22 +108,21 @@
       </component>
 
 
+      <!-- Scheduler -->
       <component name="scheduling"
                  
className="org.perfsonar.base2.service.scheduler.SchedulingComponent">
-        <option name="schedulerClassName"
-                
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
-        <option name="interval" value="3600000"/>
+
+        <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+        <option name="interval" value="60"/> <!-- sec -->
+
         <actions>
-            <!--
-            <action name="test1" 
className="org.perfsonar.base2.service.scheduler.SimpleAction">
-                <option name="xxx">yyyy</option>
-            </action>
-            <action name="test2" 
className="org.perfsonar.base2.service.scheduler.SimpleAction"/>
-           -->
+
             <action name="registration" 
className="org.perfsonar.base2.service.registration.LSRegistrationAction">
 
+                <option name="status" value="off" />
+                <option name="interval" value="3600" /> <!-- sec -->
                 <option name="registerDataSource"
-                        
value="org.perfsonar.base2.service.registration.ExistDBRegisterDataSource"/>
+                        
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                 <!--
                 <option name="registerDataSource"
                         
value="org.perfsonar.base2.service.registration.DumbRegisterDataSource"/>
@@ -139,13 +138,20 @@
                 <option name ="lsAddress-5"></option>
                 <option name ="lsAddress-6"></option>
                 -->
-                <!--optional parameter -->
                 <option name="keyRefresh" value="0"/>
             </action>
 
+            <!--
+            <action name="test1" 
className="org.perfsonar.base2.service.scheduler.SimpleAction">
+                <option name="xxx">yyyy</option>
+            </action>
+            <action name="test2" 
className="org.perfsonar.base2.service.scheduler.SimpleAction"/>
+            -->
+
         </actions>
-      </component>
+      </component> 
 
+
       <!-- auth configuration -->
       <!-- <component name="auth"
                  
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent">
@@ -161,15 +167,11 @@
         <option name="exist-config" value="exist"/>
     </extension>
 
-    <!--
-    <extension name="registerExtension-lsAddresses">
-        <option name="url" value="http://www.server.pl/~user/ls-addresses"/>
-    </extension>
-    -->
 
 
     <!-- 
....................................................................................
 -->
 
+
     <!-- Protocol mappings, XML elements and their bingings -->
 
     <protocolMappings>

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/backward-compatibility.txt
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/backward-compatibility.txt
      2009-03-17 10:54:08 UTC (rev 5088)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/backward-compatibility.txt
      2009-03-17 12:27:09 UTC (rev 5089)
@@ -4,6 +4,7 @@
 
 
 1. The service ver. 4.0 does not support requests messages containing 
advanced merge chaining.
+
    Examples of merge chaining:
 
     
http://anonsvn.internet2.edu/svn/perfsonar/tags/GEANT2-JAVA-RRD-MA-3.1.1/samples/requests/SetupDataRequest-Utilization-5.xml
@@ -13,7 +14,9 @@
 2 .The service ver. 4.0 does not support key element in MatadataKeyRequest 
messages.
 
 
-3. The service ver. 4.0 does not support functional chaining represented by 
'select' subject in MatadataKeyRequest messages.
+3. The service ver. 4.0 does not support functional chaining represented by 
'select' subject element
+   in MatadataKeyRequest messages.
+
    Example of such chaining:
 
   <nmwg:metadata id="meta1">
@@ -38,3 +41,11 @@
   </nmwg:metadata>
 
 
+4. If you want to install the service ver. 4.0 but still use the service 
address
+   http://<host>:<port>/geant2-java-rrd-ma/services/MeasurementArchiveService
+   go to the directory /usr/lib/perfsonar/services/ and create the symlink 
'gent2-java-rrd-ma'
+
+        ln -s /usr/lib/perfsonar/services/ps-mdm-rrd-ma geant2-java-rrd-ma
+
+
+

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/configure.authN.txt
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/configure.authN.txt   
  2009-03-17 10:54:08 UTC (rev 5088)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/configure.authN.txt   
  2009-03-17 12:27:09 UTC (rev 5089)
@@ -1,5 +1,4 @@
 
-
 Configuration of AuthN component
 
----------------------------------------------------------------------------------------------------
 

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/doc/configure.ls-registration.txt

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml     2009-03-17 
10:54:08 UTC (rev 5088)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml     2009-03-17 
12:27:09 UTC (rev 5089)
@@ -202,7 +202,7 @@
       <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>ps-mdm-base2</artifactId>
-      <version>0.0.3</version>
+      <version>0.0.4</version>
     </dependency>
     <dependency>
       <groupId>rrdjtool</groupId>