perfsonar development work

Author: roman
Date: 2009-03-03 07:54:44 -0500 (Tue, 03 Mar 2009)
New Revision: 5008

Added:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/EchoServiceEngine.java
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/RandomFetchTestQueryGenerator.java
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/XmlDbAccessTestQueryGenerator.java
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/XmlDbContentTestQueryGenerator.java
Modified:
   branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/QueryGenerator.java
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/SNMPQueryGenerator.java
Log:
self-tests implementation (not finished)



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-02-27 16:07:25 UTC (rev 5007)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml 
  2009-03-03 12:54:44 UTC (rev 5008)
@@ -16,7 +16,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="perfSONAR Java RRD MA"/>
+      <option name="serviceName" value="ps-mdm-rrd-ma"/>
       <option name="serviceType" value="MeasurementArchive"/>
 
     </lookupInformation>
@@ -29,8 +29,12 @@
 
       <message type="EchoRequest"
                
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+        <!--
         <option name="ServiceEngine" 
                 
value="org.perfsonar.base2.service.requesthandler.EchoServiceEngine" />
+        -->
+        <option name="ServiceEngine" 
+                
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine" />
         <option name="authN" value="no" />
       </message>
 
@@ -80,6 +84,15 @@
         <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0";
                 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
 
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";
+                
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";
+                
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+        <option 
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";
+                
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
       </component>
 
       <component name="metadataStorageDAO" 
@@ -186,6 +199,8 @@
                mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
       <element name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"; 
                mapping="org.perfsonar.base2.xml.nmwg.Parameters"/>
+      <element name="{http://ggf.org/ns/nmwg/time/2.0/}time"; 
+               mapping="org.perfsonar.base2.xml.Element"/>
 
     </protocolMappings>
 

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/EchoServiceEngine.java

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/QueryGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/QueryGenerator.java
      2009-02-27 16:07:25 UTC (rev 5007)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/QueryGenerator.java
      2009-03-03 12:54:44 UTC (rev 5008)
@@ -12,6 +12,9 @@
     public final static String DECLARE_NMWG_NAMESPACE =
         "declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/'; \n";
 
+    public final static String DECLARE_NMWGR_NAMESPACE =
+        "declare namespace nmwgr='http://ggf.org/ns/nmwg/result/2.0/'; \n";
+
     public final static String DECLARE_TRIM_FUNC = "\n"
                 + "declare namespace functx = 'http://www.functx.com';\n"
                 + "declare function functx:trim                       \n"

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/RandomFetchTestQueryGenerator.java

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/SNMPQueryGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/SNMPQueryGenerator.java
  2009-02-27 16:07:25 UTC (rev 5007)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/SNMPQueryGenerator.java
  2009-03-03 12:54:44 UTC (rev 5008)
@@ -27,7 +27,7 @@
     // ------------------------------------------------------------- methods
 
 
-    public String getQuery (Element queryElement) throws PerfSONARException {
+    public String getQuery(Element queryElement) throws PerfSONARException {
 
         return getQuery(queryElement, "*");
 

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/XmlDbAccessTestQueryGenerator.java

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/XmlDbContentTestQueryGenerator.java