Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4571 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf doc packaging/deb packaging/rpm samples/requests

Subject: perfsonar development work

List archive

perfsonar: r4571 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf doc packaging/deb packaging/rpm samples/requests


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4571 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf doc packaging/deb packaging/rpm samples/requests
  • Date: Wed, 1 Oct 2008 09:29:26 -0400
Author: roman
Date: 2008-10-01 09:29:26 -0400 (Wed, 01 Oct 2008)
New Revision: 4571

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Discards-2.xml

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Errors-2.xml

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Utilization-2.xml

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Discards-2.xml

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Errors-2.xml

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-1.xml

branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-3.xml
Log:
merged with the trunk (-r 4525:4570)



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -30,7 +30,7 @@
<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

@@ -67,7 +67,7 @@
<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">outoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

@@ -107,7 +107,7 @@
<nmwg:data id="data3" metadataIdRef="meta3">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>

@@ -147,7 +147,7 @@
<nmwg:data id="data4" metadataIdRef="meta4">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-10-01
13:29:26 UTC (rev 4571)
@@ -1,6 +1,6 @@
RRD MA ChangeLog

-2008-09-22 Version 3.1
+2008-10-01 Version 3.1

- New: available as deb package
- New: EchoRequest message allows now checking: if eXist database is running
and the count the content of metadata configuration file; access data from
random RRD file. It is also possible to request a self-test including all
above.
@@ -8,6 +8,7 @@
- New: new request MeasurementArchiveStoreRequest switched off by default
- New: performance improvements for MetadataKeyRequest message which fetches
all metadata elements
- Change: eXist default port is 8180
+- Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
- Change: format of log messages changed
- Change: use of pSbase v1.0.20080902
- Change: use of web admin library v0.9.6b

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/changelog 2008-10-01
13:29:26 UTC (rev 4571)
@@ -4,6 +4,7 @@
* New: parameter keyword introduced in metadata block to indicate
project/organisation name
* New: new request MeasurementArchiveStoreRequest switched off by default
* New: performance improvements for MetadataKeyRequest message which
fetches all metadata elements
+ * Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
* Change: format of log messages changed
* Change: use of pSbase v1.0.20080902
* Change: use of web admin library v0.9.6b
@@ -12,7 +13,7 @@
* Fixed Bug #497: default value of service.r.access_point property
* Fixed Bug #405: request for ability to define which domain is the
interface (solved via keyword)

- -- Roman Lapacz
<>
Wed, 05 Sep 2008 12:00:00 +0200
+ -- Roman Lapacz
<>
Wed, 01 Oct 2008 12:00:00 +0200

geant2-java-rrd-ma (3.0-1) stable; urgency=low


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles 2008-10-01
13:29:26 UTC (rev 4571)
@@ -1,14 +1,14 @@
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/components.properties
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/eventType-map.xml
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/eventType-rules.xml
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/objects.config
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/service.properties
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/schema.rng
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/web.xml
-/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/server-config.wsdd
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/components.properties
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/eventType-map.xml
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/eventType-rules.xml
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/objects.config
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/service.properties
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/schema.rng
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/web.xml
+/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/server-config.wsdd

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs 2008-10-01
13:29:26 UTC (rev 4571)
@@ -1 +1 @@
-/opt/perfsonar/services/geant2-java-rrd-ma
\ No newline at end of file
+/usr/lib/perfsonar/services/geant2-java-rrd-ma
\ No newline at end of file

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install 2008-10-01
13:29:26 UTC (rev 4571)
@@ -1,6 +1,6 @@
-build/geant2-java-rrd-ma/* /opt/perfsonar/services/geant2-java-rrd-ma
-doc /opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF
-samples /opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF
+build/geant2-java-rrd-ma/* /usr/lib/perfsonar/services/geant2-java-rrd-ma
+doc /usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF
+samples /usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF




Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst 2008-10-01
13:29:26 UTC (rev 4571)
@@ -17,33 +17,37 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

+SERVICENAME="geant2-java-rrd-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"

+
+
case "$1" in
configure)
- if [ -h /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- ln -s /opt/perfsonar/services/geant2-java-rrd-ma
/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma || true
- if [ -h /etc/geant2-java-rrd-ma ]
+ ln -s $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME
|| true
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/geant2-java-rrd-ma
+ rm /etc/$SERVICENAME
fi
- ln -s
/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
/etc/geant2-java-rrd-ma || true
+ ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true

- if [ -h /var/log/geant2-java-rrd-ma ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/geant2-java-rrd-ma
+ rm /var/log/$SERVICENAME
fi
- ln -s /var/log/tomcat5.5 /var/log/geant2-java-rrd-ma || true
+ ln -s /var/log/tomcat5.5 /var/log/$SERVICENAME || true

- if [ -h /usr/share/doc/geant2-java-rrd-ma/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/geant2-java-rrd-ma/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
- ln -s /opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/doc
/usr/share/doc/geant2-java-rrd-ma/spec || true
+ ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true

- chown -R tomcat55
/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
+ chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/init.d/geant2-tomcat5.5 restart
;;


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm 2008-10-01
12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm 2008-10-01
13:29:26 UTC (rev 4571)
@@ -19,23 +19,26 @@
# the debian-policy package


+SERVICENAME="geant2-java-rrd-ma"
+
+
case "$1" in
purge)
- if [ -h /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- if [ -h /etc/geant2-java-rrd-ma ]
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/geant2-java-rrd-ma
+ rm /etc/$SERVICENAME
fi
- if [ -h /var/log/geant2-java-rrd-ma ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/geant2-java-rrd-ma
+ rm /var/log/$SERVICENAME
fi
- if [ -h /usr/share/doc/geant2-java-rrd-ma/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/geant2-java-rrd-ma/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
;;


Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-10-01 12:51:18 UTC (rev 4570)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-10-01 13:29:26 UTC (rev 4571)
@@ -1,4 +1,4 @@
-%define prefix /opt/perfsonar/services/%{name}
+%define prefix /usr/lib/perfsonar/services/%{name}

Name: geant2-java-rrd-ma
Version: 3.1
@@ -120,11 +120,12 @@


%changelog
-* Wed Sep 19 2008 Roman Lapacz
<>
3.1-1
+* Wed Oct 01 2008 Roman Lapacz
<>
3.1-1
- New: EchoRequest message allows now checking: if eXist database is running
and the count the content of metadata configuration file; access data from
random RRD file. It is also possible to request a self-test including all
above.
- New: parameter keyword introduced in metadata block to indicate
project/organisation name
- New: new request MeasurementArchiveStoreRequest switched off by default
- New: performance improvements for MetadataKeyRequest message which fetches
all metadata elements
+- Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
- Change: format of log messages changed
- Change: use of pSbase v1.0.20080902
- Change: use of web admin library v0.9.5b

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Discards-2.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Discards-2.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Discards-2.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Errors-2.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Errors-2.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Errors-2.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Utilization-2.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Utilization-2.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Utilization-2.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -15,7 +15,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>

+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Discards-2.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Discards-2.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Discards-2.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Errors-2.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Errors-2.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Errors-2.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>

Modified:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-1.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-1.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-1.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -13,7 +13,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>

+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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:
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-3.xml
===================================================================
---
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-3.xml
2008-10-01 12:51:18 UTC (rev 4570)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-3.xml
2008-10-01 13:29:26 UTC (rev 4571)
@@ -14,7 +14,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>

+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/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: r4571 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf doc packaging/deb packaging/rpm samples/requests, svnlog, 10/01/2008

Archive powered by MHonArc 2.6.16.

Top of Page