perfsonar development work

Author: nordunet.behrmann
Date: 2012-07-04 13:35:25 +0100 (Wed, 04 Jul 2012)
New Revision: 5935

Modified:
   trunk/perfsonar-java-sql-ma/conf/eventType-map.xml
Log:
perfsonar-java-sql-ma: Add alternative event type maps for bwctl and iperf

There is some uncertainty about the proper event types to use for bwctl and 
iperf events, specifically
whether the trailing slash is to be used or not. Some versions of the web UI 
add the trailing slash when
submitting on-demand measurement requests to oppd, and oppd forwards these to 
SQL MA.

This patch adds mapping for the following two event types:

http://ggf.org/ns/nmwg/tools/bwctl/2.0/
http://ggf.org/ns/nmwg/tools/iperf/2.0/

Modified: trunk/perfsonar-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/eventType-map.xml  2012-07-04 12:35:21 
UTC (rev 5934)
+++ trunk/perfsonar-java-sql-ma/conf/eventType-map.xml  2012-07-04 12:35:25 
UTC (rev 5935)
@@ -79,6 +79,13 @@
     </eventType>
 
     <eventType>
+        <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0/</name>
+        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
+        
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
+    </eventType>
+
+    <eventType>
         <name>http://ggf.org/ns/nmwg/tools/iperf/2.0</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
@@ -86,6 +93,13 @@
         <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
     </eventType>
 
+    <eventType>
+        <name>http://ggf.org/ns/nmwg/tools/iperf/2.0/</name>
+        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
+        
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
+        <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
+    </eventType>
 
     <eventType>
         <name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>