perfsonar development work

Author: roman
Date: 2008-07-08 05:17:28 -0400 (Tue, 08 Jul 2008)
New Revision: 4135

Added:
   trunk/geant2-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml
Modified:
   trunk/geant2-java-sql-ma/ant/test-targets.xml
   trunk/geant2-java-sql-ma/conf/eventType-map.xml
   
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
Log:

random fetching test updated



Modified: trunk/geant2-java-sql-ma/ant/test-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/test-targets.xml       2008-07-08 08:39:21 
UTC (rev 4134)
+++ trunk/geant2-java-sql-ma/ant/test-targets.xml       2008-07-08 09:17:28 
UTC (rev 4135)
@@ -67,6 +67,30 @@
   </target>
 
 
+  <target name="echo-random-fetch-test"
+          depends="init-test">
+    <java classname="org.perfsonar.client.testHarness.SOAPClient"
+          classpathref="classpath"
+          fork="true">
+      <arg value="${ma.local}"/>
+      <arg 
value="${basedir}/samples/requests/EchoRequest-random-fetch-test.xml"/>
+      <arg value="${basedir}/samples/requests/response-1-random-fetch.xml"/>
+    </java>
+  </target>
+
+
+  <target name="echo-self-test"
+          depends="init-test">
+    <java classname="org.perfsonar.client.testHarness.SOAPClient"
+          classpathref="classpath"
+          fork="true">
+      <arg value="${ma.local}"/>
+      <arg value="${basedir}/samples/requests/EchoRequest-self-test.xml"/>
+      <arg value="${basedir}/samples/requests/response-1-self-test.xml"/>
+    </java>
+  </target>
+
+
   <target name="lookup-info-test"
           depends="init-test">
     <java classname="org.perfsonar.client.testHarness.SOAPClient"

Modified: trunk/geant2-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-map.xml     2008-07-08 08:39:21 
UTC (rev 4134)
+++ trunk/geant2-java-sql-ma/conf/eventType-map.xml     2008-07-08 09:17:28 
UTC (rev 4135)
@@ -55,6 +55,11 @@
     </eventType>
 
     <eventType>
+      
<name>http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test</name>
+      
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.RandomFetchTestQueryGenerator</metadataQueryGenerator>
+    </eventType>
+
+    <eventType>
         <name>http://ggf.org/ns/nmwg/tools/owamp/2.0</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.OwampQueryGenerator</metadataQueryGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator</responseGenerator>

Added: 
trunk/geant2-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml


Property changes on: 
trunk/geant2-java-sql-ma/samples/requests/EchoRequest-random-fetch-test.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
 2008-07-08 08:39:21 UTC (rev 4134)
+++ 
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
 2008-07-08 09:17:28 UTC (rev 4135)
@@ -349,5 +349,14 @@
     }
 
 
+    protected Message executeRandomFetchTest(Message request, String 
testName)
+        throws PerfSONARException {
 
+        _codeResponse1 = "Fetching data from the relational database is 
correct.";
+        return (super.executeRandomFetchTest(request, testName));
+
+    }
+
+
+
 } //SQLTypeMAServiceEngine
\ No newline at end of file