Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6425 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . samples/metadata_configuration_files samples/requests samples/responses samples/rrd soapUI src/deb/control src/main/resources/perfsonar/conf

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6425 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . samples/metadata_configuration_files samples/requests samples/responses samples/rrd soapUI src/deb/control src/main/resources/perfsonar/conf


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6425 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . samples/metadata_configuration_files samples/requests samples/responses samples/rrd soapUI src/deb/control src/main/resources/perfsonar/conf
  • Date: Tue, 28 May 2013 15:56:36 +0100 (BST)
  • Authentication-results: sfpop-ironport01.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-28 15:56:36 +0100 (Tue, 28 May 2013)
New Revision: 6425

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/metadata_configuration_files/rrd_database_test.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-3.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-4.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-1.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-2.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-1.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-2.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-SNMP-1.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-1.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-2.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-3.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-4.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/rrd/readme.txt

trunk/perfsonar-java-rrd-ma-SQL_backend/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
Log:
RRD MA: simplifying packaging of sample files through proper resource
configuration.

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-05-27 18:04:42
UTC (rev 6424)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-05-28 14:56:36
UTC (rev 6425)
@@ -45,6 +45,14 @@

<exclude>perfsonar/conf/configuration.xml.template</exclude>
</excludes>
</resource>
+ <resource>
+ <directory>samples</directory>
+ <targetPath>samples</targetPath>
+ <excludes>
+
<exclude>metadata_configuration_files/rrd_database_test.xml</exclude>
+ <exclude>rrd/test.xml</exclude>
+ </excludes>
+ </resource>
</resources>

<plugins>
@@ -254,14 +262,6 @@
</mapper>
</data>
<data>
- <src>samples</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
-
<prefix>${installPath}/${project.artifactId}/WEB-INF/samples</prefix>
- </mapper>
- </data>
- <data>
<!-- Tomcat configuration files
-->
<src>src/tomcat</src>
<type>directory</type>
@@ -389,15 +389,6 @@
</sources>
</mapping>
<mapping>
-
<directory>${installPath}/${project.artifactId}/WEB-INF/samples</directory>
-
<recurseDirectories>false</recurseDirectories>
- <sources>
- <source>
- <location>samples</location>
- </source>
- </sources>
- </mapping>
- <mapping>

<directory>/etc/tomcat6/Catalina/localhost</directory>

<recurseDirectories>false</recurseDirectories>
<sources>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/metadata_configuration_files/rrd_database_test.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/metadata_configuration_files/rrd_database_test.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/metadata_configuration_files/rrd_database_test.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -31,7 +31,7 @@
<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

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

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

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


Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-3.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-3.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-3.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -14,7 +14,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-4.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-4.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/requests/SetupDataRequest-Utilization-4.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -14,7 +14,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-1.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-1.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-1.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -21,7 +21,7 @@
<data id="data4" metadataIdRef="meta4">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">indiscards</parameter>
<parameter name="valueUnits">Dps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-2.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-2.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Discards-2.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -21,7 +21,7 @@
<data id="data4" metadataIdRef="meta4">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">indiscards</parameter>
<parameter name="valueUnits">Dps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-1.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-1.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-1.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -21,7 +21,7 @@
<data id="data3" metadataIdRef="meta3">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">inerrors</parameter>
<parameter name="valueUnits">Eps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-2.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-2.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Errors-2.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -21,7 +21,7 @@
<data id="data3" metadataIdRef="meta3">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">inerrors</parameter>
<parameter name="valueUnits">Eps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-SNMP-1.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-SNMP-1.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-SNMP-1.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -76,7 +76,7 @@
<data id="data1" metadataIdRef="meta1">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">inoctets</parameter>
<parameter name="valueUnits">Bps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</parameter>
@@ -94,7 +94,7 @@
<data id="data2" metadataIdRef="meta2">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">outoctets</parameter>
<parameter name="valueUnits">Bps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</parameter>
@@ -112,7 +112,7 @@
<data id="data3" metadataIdRef="meta3">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">inerrors</parameter>
<parameter name="valueUnits">Eps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</parameter>
@@ -130,7 +130,7 @@
<data id="data4" metadataIdRef="meta4">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">indiscards</parameter>
<parameter name="valueUnits">Dps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-1.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-1.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-1.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -38,7 +38,7 @@
<data id="data1" metadataIdRef="meta1">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">inoctets</parameter>
<parameter name="valueUnits">Bps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</parameter>
@@ -55,7 +55,7 @@
<data id="data2" metadataIdRef="meta2">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">outoctets</parameter>
<parameter name="valueUnits">Bps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-2.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-2.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/MetadataKeyResponse-Utilization-2.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -38,7 +38,7 @@
<data id="data1" metadataIdRef="meta1">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">inoctets</parameter>
<parameter name="valueUnits">Bps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</parameter>
@@ -55,7 +55,7 @@
<data id="data2" metadataIdRef="meta2">
<key>
<parameters>
- <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</parameter>
+ <parameter
name="file">/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</parameter>
<parameter name="dataSource">outoctets</parameter>
<parameter name="valueUnits">Bps</parameter>
<parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-3.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-3.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-3.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -4,7 +4,7 @@
<nmwg:metadata id="1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-4.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-4.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/samples/responses/SetupDataResponse-Utilization-4.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -4,7 +4,7 @@
<nmwg:metadata id="2">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
<nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/samples/rrd/readme.txt
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/samples/rrd/readme.txt
2013-05-27 18:04:42 UTC (rev 6424)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/samples/rrd/readme.txt
2013-05-28 14:56:36 UTC (rev 6425)
@@ -1,11 +1,14 @@
+This directory contains a RRD test file that can be used together with the
+test_rrdma_db.sql metadata definition to test the service.

-Existing file test.rrd was created on 32 bit (Intel) machine.
+File test-32.rrd was created on a 32 bits (Intel) machine.
+File test-64.rrd was created on a 64 bits (Intel) machine.

-In order to have this file working on 64 bit machine you have to use dump
file (test.xml) to generate new test.rrd.
+Please use whichever is suited to your installation.

+For Developers
+--------------
+In order to have this file working on a different architecture you have to
use
+the dump file (test.xml) to generate a new test.rrd file.

rrdtool restore test.xml test.rrd -f
-
-
-
-

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
2013-05-28 14:56:36 UTC (rev 6425)
@@ -1211,7 +1211,7 @@
<!-- See 2.1.3 n Interface_Specification.doc -->
<nmwg:parameters id="param1">
<nmwg:parameter name="file">
-
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd
+
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd
</nmwg:parameter>
<nmwg:parameter name="dataSource">ds0</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
@@ -1446,7 +1446,7 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/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:parameters>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-05-27 18:04:42 UTC (rev 6424)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-05-28 14:56:36 UTC (rev 6425)
@@ -1,11 +1,8 @@
-Section: web
-Priority: extra
-Maintainer: Antoine Delvaux
<>
-Build-Depends: debhelper (>= 5), maven | maven2
-Standards-Version: 3.7.2
Package: perfsonar-java-rrd-ma
Version: [[version]]
+Section: web
+Priority: extra
Architecture: all
Depends: mysql-server, java6-runtime, tomcat6, librrd4
+Maintainer: Antoine Delvaux
<>
Description: perfSONAR Round Robin Database Measurement Archive
-Distribution: unstable

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
2013-05-27 18:04:42 UTC (rev 6424)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
2013-05-28 14:56:36 UTC (rev 6425)
@@ -9,40 +9,40 @@
INTO interfaces
VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
-
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd',
'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');

INSERT
INTO interfaces
VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'out',
'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
-
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd',
'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');

INSERT
INTO interfaces
VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/errors/2.0',
-
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd',
'inerrors', 'Eps', '300', 'ABSOLUTE', '100', '0', '10000000');

INSERT
INTO interfaces
VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.3', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/discards/2.0',
-
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd',
'indiscards', 'Dps', '300', 'ABSOLUTE', '100', '0', '10000000');

INSERT
INTO interfaces
VALUES (NULL, 'subj1', 'test-hostName2', '10.1.2.2', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
-
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd',
'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');

INSERT
INTO interfaces
VALUES (NULL, 'subj1', 'test-hostName2', '10.1.2.2', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'out',
'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
-
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/samples/rrd/test.rrd',
'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');


  • [pS-dev] [GEANT/SA2/ps-java-services] r6425 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . samples/metadata_configuration_files samples/requests samples/responses samples/rrd soapUI src/deb/control src/main/resources/perfsonar/conf, svn-noreply, 05/28/2013

Archive powered by MHonArc 2.6.16.

Top of Page