perfsonar-dev - perfsonar: r4222 - in trunk/geant2-java-rrd-ma: conf samples/requests
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r4222 - in trunk/geant2-java-rrd-ma: conf samples/requests
- Date: Thu, 17 Jul 2008 04:32:10 -0400
Author: roman
Date: 2008-07-17 04:32:10 -0400 (Thu, 17 Jul 2008)
New Revision: 4222
Modified:
trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Discards-2.xml
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Errors-2.xml
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Discards-2.xml
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-1.xml
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-2.xml
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-1.xml
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-3.xml
Log:
the path of test rrd file updated (now samples directory is stored in
/usr/share/doc/geant2-java-rrd-ma/)
Modified: trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml
===================================================================
--- trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml 2008-07-17 08:31:58
UTC (rev 4221)
+++ trunk/geant2-java-rrd-ma/conf/rrd-database_TEST.xml 2008-07-17 08:32:10
UTC (rev 4222)
@@ -30,9 +30,7 @@
<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
<nmwg:parameters>
- <!-- __basepath__ string is replaced with the path of
perfsonar package -->
- <!-- when Ant configuration script is run (ant configure)
-->
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
@@ -69,9 +67,7 @@
<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
<nmwg:parameters>
- <!-- __basepath__ string is replaced with the path of
perfsonar package -->
- <!-- when Ant configuration script is run (ant configure)
-->
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">outoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
@@ -111,9 +107,7 @@
<nmwg:data id="data3" metadataIdRef="meta3">
<nmwg:key>
<nmwg:parameters>
- <!-- __basepath__ string is replaced with the path of
perfsonar package -->
- <!-- when Ant configuration script is run (ant configure)
-->
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
@@ -153,9 +147,7 @@
<nmwg:data id="data4" metadataIdRef="meta4">
<nmwg:key>
<nmwg:parameters>
- <!-- __basepath__ string is replaced with the path of
perfsonar package -->
- <!-- when Ant configuration script is run (ant configure)
-->
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Discards-2.xml
===================================================================
---
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Discards-2.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Discards-2.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -8,7 +8,7 @@
<nmwg:metadata id="m1" xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/">
<nmwg:key id="k1">
<nmwg:parameters id="p1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
@@ -44,7 +44,7 @@
<nmwg:parameters>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Errors-2.xml
===================================================================
--- trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Errors-2.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++ trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Errors-2.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -8,7 +8,7 @@
<nmwg:metadata id="m1" xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/">
<nmwg:key id="k1">
<nmwg:parameters id="p1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
@@ -44,7 +44,7 @@
<nmwg:parameters>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
===================================================================
---
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++
trunk/geant2-java-rrd-ma/samples/requests/MetadataKeyRequest-Utilization-2.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -15,7 +15,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Discards-2.xml
===================================================================
--- trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Discards-2.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++ trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Discards-2.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -8,7 +8,7 @@
<nmwg:metadata id="m1" xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/">
<nmwg:key id="k1">
<nmwg:parameters id="p1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
@@ -44,7 +44,7 @@
<nmwg:parameters>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-1.xml
===================================================================
--- trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-1.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++ trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-1.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -6,8 +6,8 @@
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/"
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/"
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/">
-
-
+
+
<nmwg:metadata id="m1">
<errors:subject id="s1">
<nmwgt:interface>
@@ -18,7 +18,7 @@
</errors:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
</nmwg:metadata>
-
+
<nmwg:data id="d1" metadataIdRef="m1"/>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-2.xml
===================================================================
--- trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-2.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++ trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Errors-2.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -11,7 +11,7 @@
<nmwg:metadata id="m1" xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/">
<nmwg:key id="k1">
<nmwg:parameters id="p1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
@@ -47,7 +47,7 @@
<nmwg:parameters>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-1.xml
===================================================================
---
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-1.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-1.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -13,7 +13,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
Modified:
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-3.xml
===================================================================
---
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-3.xml
2008-07-17 08:31:58 UTC (rev 4221)
+++
trunk/geant2-java-rrd-ma/samples/requests/SetupDataRequest-Utilization-3.xml
2008-07-17 08:32:10 UTC (rev 4222)
@@ -14,7 +14,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">__BASEPATH__/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
- perfsonar: r4222 - in trunk/geant2-java-rrd-ma: conf samples/requests, svnlog, 07/17/2008
Archive powered by MHonArc 2.6.16.