perfsonar development work

Author: roman
Date: 2007-12-11 08:59:35 -0500 (Tue, 11 Dec 2007)
New Revision: 3115

Modified:
   trunk/geant2_java-sql-ma/conf/eventType-map.xml
   trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
   trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
Log:
- netutil namespace used for datum element containing utilization value
- eventType element replaced supportedEventTypes parameter




Modified: trunk/geant2_java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2_java-sql-ma/conf/eventType-map.xml     2007-12-11 13:28:42 
UTC (rev 3114)
+++ trunk/geant2_java-sql-ma/conf/eventType-map.xml     2007-12-11 13:59:35 
UTC (rev 3115)
@@ -10,7 +10,7 @@
     <eventType>
         <name>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
-        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.GenericResponseGenerator</responseGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.UtilizationResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.UtilizationStoreRequestProcess</storeRequestProcess>
     </eventType>
 

Modified: trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
===================================================================
--- trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml 2007-12-11 13:28:42 
UTC (rev 3114)
+++ trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml 2007-12-11 13:59:35 
UTC (rev 3115)
@@ -28,10 +28,7 @@
                 <nmwgt:capacity>1000BaseT</nmwgt:capacity>
             </nmwgt:interface>
         </netutil:subject>
-        <nmwg:parameters>
-            <nmwg:parameter 
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
-        </nmwg:parameters>
-        <!-- 
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
 -->
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
     </nmwg:metadata>
 
 

Modified: trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
===================================================================
--- trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml     
2007-12-11 13:28:42 UTC (rev 3114)
+++ trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml     
2007-12-11 13:59:35 UTC (rev 3115)
@@ -23,10 +23,7 @@
                 <nmwgt:capacity>1000BaseT</nmwgt:capacity>
             </nmwgt:interface>
         </netutil:subject>
-        <nmwg:parameters>
-            <nmwg:parameter 
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
-        </nmwg:parameters>
-        <!-- 
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
 -->
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
     </nmwg:metadata>