perfsonar-dev - perfsonar: r2723 - branches/new-structure/trunk/geant2_java-sql-ma/conf
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r2723 - branches/new-structure/trunk/geant2_java-sql-ma/conf
- Date: Fri, 24 Aug 2007 10:10:11 -0400
Author: roman
Date: 2007-08-24 10:10:11 -0400 (Fri, 24 Aug 2007)
New Revision: 2723
Added:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-errors.template.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-errors.xml
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
Log:
support of errors data
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-24 14:08:17 UTC (rev 2722)
+++ branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
2007-08-24 14:10:11 UTC (rev 2723)
@@ -15,6 +15,13 @@
</eventType>
<eventType>
+ <name>http://ggf.org/ns/nmwg/characteristic/errors/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.ErrorsQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.ErrorsResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.ErrorsStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
+ <eventType>
<name>http://ggf.org/ns/nmwg/topology/l2/3.0/link/status</name>
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
Added:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-errors.template.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-errors.template.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-errors.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-errors.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
2007-08-24 14:08:17 UTC (rev 2722)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
2007-08-24 14:10:11 UTC (rev 2723)
@@ -120,17 +120,17 @@
INSERT
INTO
perfsonar_errors
- VALUES ('meta2-errors-test', 0, 'Eps', 1187948875, default);
+ VALUES ('meta1-errors-test', 0, 'Eps', 1187948875, default);
INSERT
INTO
perfsonar_errors
- VALUES ('meta3-errors-test', 4, 'Eps', 1187948882, default);
+ VALUES ('meta1-errors-test', 4, 'Eps', 1187948882, default);
INSERT
INTO
perfsonar_errors
- VALUES ('meta4-errors-test', 2, 'Eps', 1187948888, default);
+ VALUES ('meta1-errors-test', 2, 'Eps', 1187948888, default);
Modified: branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
2007-08-24 14:08:17 UTC (rev 2722)
+++ branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
2007-08-24 14:10:11 UTC (rev 2723)
@@ -12,6 +12,9 @@
http://ggf.org/ns/nmwg/characteristic/utilization/2.0/subject/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject
http://ggf.org/ns/nmwg/characteristic/utilization/2.0/parameters/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Parameters
http://ggf.org/ns/nmwg/characteristic/utilization/2.0/datum/
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/parameters/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/errors/2.0/datum/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum
http://ggf.org/ns/nmwg/event/status/base/2.0/stateOper/
org.ggf.ns.nmwg.event.status.base.v2_0.StateOper
http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
http://ggf.org/ns/nmwg/event/status/base/2.0/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
2007-08-24 14:08:17 UTC (rev 2722)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
2007-08-24 14:10:11 UTC (rev 2723)
@@ -110,15 +110,15 @@
insert
into perfsonar_errors
- values ('meta2-errors-test', 0, 'Eps', 1187948875);
+ values ('meta1-errors-test', 0, 'Eps', 1187948875);
insert
into perfsonar_errors
- values ('meta3--errors-test', 4, 'Eps', 1187948882);
+ values ('meta1--errors-test', 4, 'Eps', 1187948882);
insert
into perfsonar_errors
- values ('meta4-errors-test', 2, 'Eps', 1187948888);
+ values ('meta1-errors-test', 2, 'Eps', 1187948888);
-- insert statements for testing domain_link table
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-24 14:08:17 UTC (rev 2722)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-08-24 14:10:11 UTC (rev 2723)
@@ -8,6 +8,7 @@
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
@@ -41,7 +42,34 @@
</nmwg:data>
+ <!-- errors metadata section -->
+
+ <nmwg:metadata id="meta1-errors-test">
+ <errors:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </errors:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-errors-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
<!-- L2 status section -->
- perfsonar: r2723 - branches/new-structure/trunk/geant2_java-sql-ma/conf, svnlog, 08/24/2007
Archive powered by MHonArc 2.6.16.