perfsonar-dev - perfsonar: r2667 - branches/new-structure/trunk/geant2_java-sql-ma/conf
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r2667 - branches/new-structure/trunk/geant2_java-sql-ma/conf
- Date: Thu, 16 Aug 2007 09:24:56 -0400
Author: roman
Date: 2007-08-16 09:24:56 -0400 (Thu, 16 Aug 2007)
New Revision: 2667
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database-L2status_TEST.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
Log:
- base chaining for the utilization is switched off
- updated to support eventType element instead of parameter supportedEventType
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
2007-08-16 13:21:49 UTC (rev 2666)
+++ branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
2007-08-16 13:24:56 UTC (rev 2667)
@@ -12,7 +12,6 @@
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.UtilizationResponseGenerator</responseGenerator>
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.UtilizationStoreRequestProcess</storeRequestProcess>
-
<baseChainingMerger>org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining</baseChainingMerger>
</eventType>
<eventType>
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database-L2status_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database-L2status_TEST.xml
2007-08-16 13:21:49 UTC (rev 2666)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database-L2status_TEST.xml
2007-08-16 13:24:56 UTC (rev 2667)
@@ -104,9 +104,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
@@ -128,9 +126,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
@@ -152,9 +148,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
@@ -176,9 +170,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-08-16 13:21:49 UTC (rev 2666)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-08-16 13:24:56 UTC (rev 2667)
@@ -27,9 +27,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:metadata>
@@ -140,9 +138,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
@@ -164,9 +160,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
@@ -188,9 +182,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
@@ -212,9 +204,7 @@
</nmtl2:link>
</nmwg:subject>
- <nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">Path.Status</nmwg:parameter>
- </nmwg:parameters>
+ <nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
2007-08-16 13:21:49 UTC (rev 2666)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_utilization_TEST.xml
2007-08-16 13:24:56 UTC (rev 2667)
@@ -21,9 +21,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:metadata>
- perfsonar: r2667 - branches/new-structure/trunk/geant2_java-sql-ma/conf, svnlog, 08/16/2007
Archive powered by MHonArc 2.6.16.