Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2174 - in branches/JAVA-RRD-MA-STABLE: conf doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType

Subject: perfsonar development work

List archive

perfsonar: r2174 - in branches/JAVA-RRD-MA-STABLE: conf doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2174 - in branches/JAVA-RRD-MA-STABLE: conf doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType
  • Date: Fri, 2 Mar 2007 09:11:04 -0500
Author: roman
Date: 2007-03-02 09:11:03 -0500 (Fri, 02 Mar 2007)
New Revision: 2174

Added:

branches/JAVA-RRD-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml

branches/JAVA-RRD-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml

branches/JAVA-RRD-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.template.xml

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Modified:
branches/JAVA-RRD-MA-STABLE/conf/eventType-map.xml
branches/JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Interface_Specification.doc

branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:
merged with the trunk, revision number range: 2103:2173




Modified: branches/JAVA-RRD-MA-STABLE/conf/eventType-map.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/conf/eventType-map.xml 2007-03-02 11:47:01
UTC (rev 2173)
+++ branches/JAVA-RRD-MA-STABLE/conf/eventType-map.xml 2007-03-02 14:11:03
UTC (rev 2174)
@@ -8,21 +8,27 @@
<eventType-config>

<eventType>
- <name>utilization</name>
+ <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.UtilizationResponseGenerator</responseGenerator>

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.UtilizationStoreRequestProcess</storeRequestProcess>
</eventType>

<eventType>
- <name>Path.Status</name>
+ <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>

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
</eventType>

+ <eventType>
+ <name>Path.Status</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGeneratorTMP</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+ </eventType>

- <eventType>
+ <eventType>
<name>owamp</name>

<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.OwampQueryGenerator</metadataQueryGenerator>

<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator</responseGenerator>

Copied:
branches/JAVA-RRD-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml
(from rev 2173,
trunk/perfsonar/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml)

Copied:
branches/JAVA-RRD-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml
(from rev 2173,
trunk/perfsonar/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml)

Copied:
branches/JAVA-RRD-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.template.xml
(from rev 2173,
trunk/perfsonar/conf/ibatis-SqlMapConfig-utilization.template.xml)

Modified: branches/JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml 2007-03-02
11:47:01 UTC (rev 2173)
+++ branches/JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml 2007-03-02
14:11:03 UTC (rev 2174)
@@ -18,7 +18,7 @@
</nmwgt:interface>
</netutil:subject>
<nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>

@@ -48,7 +48,7 @@
</nmwgt:interface>
</netutil:subject>
<nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -7,7 +7,7 @@


<nmwg:metadata id="meta">
- <nmwg:eventType>echo</nmwg:eventType>
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/echo/2.0</nmwg:eventType>
</nmwg:metadata>

<nmwg:data id="data" metadataIdRef="meta"/>

Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -4,13 +4,21 @@
<!-- Version: $Id$ -->

<nmwg:message type="EchoRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="meta">
- <nmwg:eventType>echo</nmwg:eventType>
- </nmwg:metadata>
+ <nmwg:metadata id="meta">
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/echo/ls/2.0</nmwg:eventType>
+ <nmwg:parameters>
+
+ <nmwg:parameter name="testDBConnection" value="yes"/>
+ <nmwg:parameter name="testDBSchema" value="yes"/>
+
+ </nmwg:parameters>
+ </nmwg:metadata>

- <nmwg:data id="data" metadataIdRef="meta"/>
+ <nmwg:data id="data" metadataIdRef="meta"/>

+
+
</nmwg:message>

Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -27,7 +27,7 @@
<nmwgt:hostName>test-hostName</nmwgt:hostName>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -52,7 +52,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>


</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -49,7 +49,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>


</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -20,7 +20,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -44,7 +44,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -28,7 +28,7 @@
<nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>

<!-- This is the specific data we wish to see -->

Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -20,7 +20,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -21,7 +21,7 @@
<nmwg:parameter name="startTime">1144318523</nmwg:parameter>
<nmwg:parameter name="endTime">1147960133</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -44,7 +44,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<nmwg:message type="SetupDataRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
@@ -9,17 +11,7 @@
<nmwg:subject id="subject1">
<nmtl2:link>

- <!--
<nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
- -->
-
- <nmwgtopo3:node>
<nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
<nmwgtopo3:country>Poland</nmwgtopo3:country>
<nmwgtopo3:city>Poznan</nmwgtopo3:city>
@@ -42,10 +34,10 @@
<nmwg:metadata id="meta2">
<select:subject id="iusub2" metadataIdRef="meta1"/>
<select:parameters id="param1">
- <nmwg:parameter name="startTime">1144318524</nmwg:parameter>
- <nmwg:parameter name="endTime">1144318527</nmwg:parameter>
+ <nmwg:parameter name="startTime">1144318523</nmwg:parameter>
+ <nmwg:parameter name="endTime">1147960133</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -22,7 +22,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -31,7 +31,7 @@

</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -48,7 +48,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -26,7 +26,7 @@
<nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
<nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter name="eventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:metadata>
@@ -37,7 +37,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -26,7 +26,7 @@
<nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
<nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter name="eventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:metadata>
@@ -35,10 +35,10 @@
<nmwg:metadata id="meta2">
<select:subject id="iusub2" metadataIdRef="meta1"/>
<select:parameters id="param1">
- <nmwg:parameter name="startTime">1143034709</nmwg:parameter>
- <nmwg:parameter name="endTime">1149070711</nmwg:parameter>
+ <nmwg:parameter name="startTime">1143034704</nmwg:parameter>
+ <nmwg:parameter name="endTime">1143034706</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -55,7 +55,7 @@
<nmwgt:direction>in</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -65,7 +65,7 @@
<nmwgt:direction>out</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -79,7 +79,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>

@@ -94,7 +94,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -55,7 +55,7 @@
<nmwgt:direction>in</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -65,7 +65,7 @@
<nmwgt:direction>out</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -79,7 +79,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>

@@ -90,7 +90,7 @@
<nmwg:parameter name="endTime">1121731200</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>

@@ -103,7 +103,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
===================================================================
---
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
2007-03-02 14:11:03 UTC (rev 2174)
@@ -39,7 +39,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/EchoRequest.java
2007-03-02 14:11:03 UTC (rev 2174)
@@ -32,6 +32,14 @@



+ // ---------------------------------- fields
+
+
+
+ public static final String ECHO_NAMESPACE =
"http://schemas.perfsonar.net/tools/admin/echo/2.0";;
+
+
+
// ---------------------------------- constructors


@@ -121,7 +129,7 @@

Message response = null;

- if (eventType.getEventType().equals("echo")) {
+ if (eventType.getEventType().equals(ECHO_NAMESPACE)) {
response = executeSimpleEcho();
} else if (eventType.getEventType().equals("")) {
response = getEmptyEventTypeResponse();

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-03-02 14:11:03 UTC (rev 2174)
@@ -116,8 +116,8 @@
+ "
\n"
+ " let $linkMetadata :=
\n"
+ " for $k in //nmwg:metadata
\n"
- + " where
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " where
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ "
\n"
+ " let $metaids :=
\n"
@@ -166,8 +166,8 @@
+ " if ($globalName != '') then
\n"
+ " for $m in //nmwg:metadata
\n"
+ " where
fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName) =
fn:lower-case($globalName) \n"
- + " and
$m/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$m/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $m
\n"
+ " else
\n"
+ " ''
\n"
@@ -295,8 +295,8 @@
+ " for $k in //nmwg:metadata
\n"
+ " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id
\n"
+ " and
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id
\n"
- + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"
@@ -364,8 +364,8 @@
+ " if ($node_id != '') then
\n"
+ " for $k in //nmwg:metadata
\n"
+ " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node_id
\n"
- + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
(from rev 2173,
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java)

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
2007-03-02 11:47:01 UTC (rev 2173)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
2007-03-02 14:11:03 UTC (rev 2174)
@@ -85,7 +85,10 @@
protected NMWGStorageManager metadataConfig = null;


+ public static final String SELECT_NAMESPACE =
"http://ggf.org/ns/nmwg/ops/select/2.0";;

+
+
// ---------------------------------- constructors


@@ -416,7 +419,7 @@
for (Object d : msg.getDataMap().values())
message.addChild((Data)d);

- } else if
(metadata.getEventType().getEventType().trim().equals("select")) {
+ } else if
(metadata.getEventType().getEventType().trim().equals(SELECT_NAMESPACE)) {

Parameters params = metadata.getParameters();
String metadataIdRef =
metadata.getSubject().getMetadataIdRef();


  • perfsonar: r2174 - in branches/JAVA-RRD-MA-STABLE: conf doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType, svnlog, 03/02/2007

Archive powered by MHonArc 2.6.16.

Top of Page