Skip to Content.
Sympa Menu

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

Subject: perfsonar development work

List archive

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


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4492 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf doc packaging/deb packaging/rpm samples/requests
  • Date: Tue, 16 Sep 2008 08:47:27 -0400
Author: roman
Date: 2008-09-16 08:47:26 -0400 (Tue, 16 Sep 2008)
New Revision: 4492

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/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 4461:4491)



Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
2008-09-16 12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/conf/rrd-database_TEST.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -30,7 +30,7 @@
<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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-09-16
12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/doc/ChangeLog.txt 2008-09-16
12:47:26 UTC (rev 4492)
@@ -1,6 +1,6 @@
RRD MA ChangeLog

-2008-07-23 Version 3.1
+2008-09-03 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.
@@ -9,7 +9,8 @@
- New: performance improvements for MetadataKeyRequest message which fetches
all metadata elements
- Change: eXist default port is 8180
- Change: format of log messages changed
-- Change: use of pSbase v1.0.20080721
+- Change: use of pSbase v1.0.20080902
+- Change: use of web admin library v0.9.2b
- Change: obsolete authRealm removed from metadata configuration file
- Fixed Bug #405: request for ability to define which domain is the
interface (solved via keyword)


Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles 2008-09-16
12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/conffiles 2008-09-16
12:47:26 UTC (rev 4492)
@@ -1,14 +1,14 @@
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/components.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/eventType-map.xml
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/eventType-rules.xml
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/objects.config
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/service.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/schema.rng
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/web.xml
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/server-config.wsdd
+/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

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs 2008-09-16
12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/dirs 2008-09-16
12:47:26 UTC (rev 4492)
@@ -1,2 +1 @@
-/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
-/usr/share/doc/geant2-java-rrd-ma
+/opt/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-09-16
12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/install 2008-09-16
12:47:26 UTC (rev 4492)
@@ -1,7 +1,6 @@
-build/geant2-java-rrd-ma/* /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
-doc/* /usr/share/doc/geant2-java-rrd-ma
-samples /usr/share/doc/geant2-java-rrd-ma
-samples /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF
+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




Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst 2008-09-16
12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postinst 2008-09-16
12:47:26 UTC (rev 4492)
@@ -20,18 +20,30 @@

case "$1" in
configure)
+ if [ -h /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma ]
+ then
+ rm /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+ 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 ]
then
rm /etc/geant2-java-rrd-ma
fi
- ln -s
/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
/etc/geant2-java-rrd-ma || true
+ ln -s
/opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
/etc/geant2-java-rrd-ma || true
+
if [ -h /var/log/geant2-java-rrd-ma ]
then
rm /var/log/geant2-java-rrd-ma
fi
ln -s /var/log/tomcat5.5 /var/log/geant2-java-rrd-ma || true
- gunzip -f /usr/share/doc/geant2-java-rrd-ma/samples/rrd/*.gz || true
- chown -R tomcat55
/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf
+
+ if [ -h /usr/share/doc/geant2-java-rrd-ma/spec ]
+ then
+ rm /usr/share/doc/geant2-java-rrd-ma/spec
+ fi
+ ln -s /opt/perfsonar/services/geant2-java-rrd-ma/WEB-INF/doc
/usr/share/doc/geant2-java-rrd-ma/spec || true
+
+ chown -R tomcat55
/opt/perfsonar/services/geant2-java-rrd-ma/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-09-16
12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/postrm 2008-09-16
12:47:26 UTC (rev 4492)
@@ -21,6 +21,10 @@

case "$1" in
purge)
+ if [ -h /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma ]
+ then
+ rm /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+ fi
if [ -h /etc/geant2-java-rrd-ma ]
then
rm /etc/geant2-java-rrd-ma
@@ -29,7 +33,10 @@
then
rm /var/log/geant2-java-rrd-ma
fi
- rm -fr /usr/share/doc/geant2-java-rrd-ma
+ if [ -h /usr/share/doc/geant2-java-rrd-ma/spec ]
+ then
+ rm /usr/share/doc/geant2-java-rrd-ma/spec
+ fi
;;

remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

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-09-16 12:41:33 UTC (rev 4491)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/rpm/geant2-java-rrd-ma.specs
2008-09-16 12:47:26 UTC (rev 4492)
@@ -1,4 +1,4 @@
-%define prefix /var/lib/tomcat5/webapps/%{name}
+%define prefix /opt/perfsonar/services/%{name}

Name: geant2-java-rrd-ma
Version: 3.1
@@ -43,14 +43,12 @@
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples
-%{__install} -d -m 755
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/metadata_conf
-%{__install} -d -m 755
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/requests
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/rrd
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
+%{__install} -d -m 755
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_conf

# copy the service content to the tomcat webapps directory
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
@@ -61,16 +59,15 @@
%{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
popd

-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/samples
- %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples
-popd

pushd ${RPM_BUILD_DIR}/%{name}-%{version}
%{__cp} -a samples/requests/*
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
%{__cp} -a samples/responses/*
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+ %{__cp} -a samples/rrd/* ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
+ %{__cp} -a samples/metadata_conf/*
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_conf
popd

-rrdtool restore
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/rrd/test.xml
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/rrd/test.rrd -f || true
+rrdtool restore ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.xml
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.rrd -f || true



@@ -81,6 +78,8 @@
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.rng
%{_sysconfdir}/%{name}
%{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
+%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+
## restart tomcat
/sbin/service tomcat5 restart

@@ -91,7 +90,9 @@
%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
+%{__rm} -rf %{_sysconfdir}/%{name}/*.rng
%{__rm} -rf %{_var}/log/%{name}
+%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}



@@ -116,10 +117,6 @@
%{_sysconfdir}/%{name}
/usr/share/doc/%{name}
/usr/share/doc/%{name}/schema
-/usr/share/doc/%{name}/samples
-/usr/share/doc/%{name}/samples/metadata_conf
-/usr/share/doc/%{name}/samples/requests
-/usr/share/doc/%{name}/samples/rrd



@@ -131,8 +128,10 @@
- New: performance improvements for MetadataKeyRequest message which fetches
all metadata elements
- Change: format of log messages changed
- Change: use of pSbase v1.0.20080902
-- Change: use of web admin library v0.9.1b
+- Change: use of web admin library v0.9.2b
+- Change: eXist default port is 8180
- Change: obsolete authRealm removed from metadata configuration file
+- Fixed Bug #405: request for ability to define which domain is the
interface (solved via keyword)

* Mon Mar 10 2008 Roman Lapacz
<>
3.0-1
- New: support of ErrorResponse message type (use of perfsonar-base library
version 1.0.20080310)

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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Discards-2.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Errors-2.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/MetadataKeyRequest-Utilization-2.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -15,7 +15,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>

+ <nmwg:parameter
name="file">/opt/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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Discards-2.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Errors-2.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/opt/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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-1.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -13,7 +13,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>

+ <nmwg:parameter
name="file">/opt/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-09-16 12:41:33 UTC (rev 4491)
+++
branches/GEANT2-JAVA-RRD-MA-STABLE/samples/requests/SetupDataRequest-Utilization-3.xml
2008-09-16 12:47:26 UTC (rev 4492)
@@ -14,7 +14,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/usr/share/doc/geant2-java-rrd-ma/samples/rrd/test.rrd</nmwg:parameter>

+ <nmwg:parameter
name="file">/opt/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: r4492 - in branches/GEANT2-JAVA-RRD-MA-STABLE: conf doc packaging/deb packaging/rpm samples/requests, svnlog, 09/16/2008

Archive powered by MHonArc 2.6.16.

Top of Page