Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4945 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store

Subject: perfsonar development work

List archive

perfsonar: r4945 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4945 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
  • Date: Fri, 6 Feb 2009 07:12:11 -0500
Author: roman
Date: 2009-02-06 07:12:09 -0500 (Fri, 06 Feb 2009)
New Revision: 4945

Added:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-iperf.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-iperf.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_iperf_TEST.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_centos_5.2.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_debian_4.0.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_ubuntu_8.10.txt

branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.2.pdf

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-Ping-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-Ping-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-3.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-4.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-5.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-2.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-3.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-4.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-5.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
Removed:

branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Installation_Actions_Specification.doc

branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-clmp-ping.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_clmp-ping.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Functional_Specification.doc
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc

branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Metadata_Configuration_File_Specification.doc
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-1.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
Log:
merged wuth the trunk (-r 4868:4944)


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -45,7 +45,7 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -288,7 +288,7 @@

<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -54,7 +54,7 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20090203"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.3c"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -80,7 +80,7 @@

<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml 2009-02-06
11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/eventType-map.xml 2009-02-06
12:12:09 UTC (rev 4945)
@@ -12,6 +12,7 @@

<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>
+ <ibatisConfig>ibatis-SqlMapConfig-utilization.xml</ibatisConfig>
</eventType>

<eventType>
@@ -19,6 +20,7 @@

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

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

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.ErrorsStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-errors.xml</ibatisConfig>
</eventType>

<eventType>
@@ -26,6 +28,7 @@

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

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

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.DiscardsStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-discards.xml</ibatisConfig>
</eventType>

<eventType>
@@ -76,10 +79,20 @@
</eventType>

<eventType>
+ <name>http://ggf.org/ns/nmwg/tools/iperf/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
+ </eventType>
+
+
+ <eventType>
<name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>

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

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

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.PingStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-clmp-ping.xml</ibatisConfig>
</eventType>

</eventType-config>

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-iperf.xml
(from rev 4944, trunk/geant2-java-sql-ma/conf/ibatis-SqlMapConfig-iperf.xml)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-clmp-ping.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-clmp-ping.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-clmp-ping.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -27,23 +27,30 @@
<parameter property="endTime" />
</parameterMap>

+ <!--
<parameterMap id="select-parameters2" class="java.util.HashMap">
<parameter property="metadataId" />
</parameterMap>
+ -->
+ <parameterMap id="select-parameters2" class="java.util.HashMap">
+ <parameter property="metadataId" />
+ <parameter property="metadataId" />
+ </parameterMap>

+
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
select seqNum, value, valueUnits, ttl, numBytes, numBytesUnits,
timeValue, timeType
from clmp_ping
where metadataId = ?
- and timeValue >= ?
+ and timeValue >= ?
and timeValue <= ?
- order by timeValue ASC

+ order by timeValue ASC
]]>
</select>

-
+ <!--
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
@@ -52,6 +59,16 @@
where metadataId = ?
]]>
</select>
+ -->
+ <select id="getResults2"
+ parameterMap="select-parameters2" resultMap="select-results">
+ <![CDATA[
+ select seqNum, value, valueUnits, ttl, numBytes, numBytesUnits,
timeValue, timeType
+ from clmp_ping
+ where metadataId = ?
+ and timeValue = (select MAX(timeValue) from clmp_ping where
metadataId = ?)
+ ]]>
+ </select>




Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/ibatis-iperf.xml (from rev
4944, trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbremove.sql
2009-02-06 12:12:09 UTC (rev 4945)
@@ -34,11 +34,15 @@


DROP TABLE
+ interdomain_link;
+
+
+DROP TABLE
perfsonar_links;


DROP TABLE
- interdomain_link;
+ perfsonar_iperf;


#DROP TABLE
@@ -49,8 +53,8 @@
# clmp_bwctl;


-#DROP TABLE
-# clmp_ping;
+DROP TABLE
+ clmp_ping;


DROP USER

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/mysql-sqlma-dbsetup.sql
2009-02-06 12:12:09 UTC (rev 4945)
@@ -87,7 +87,26 @@
alarm_id_set VARCHAR(255),
comments VARCHAR(255));

+CREATE TABLE
+ perfsonar_iperf
+ (metadataId VARCHAR(30) NOT NULL,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(30) NULL,
+ numBytes INT NULL,
+ numBytesUnits VARCHAR(15) NULL,
+ time INT NOT NULL,
+ format VARCHAR(30) NULL,
+ interv VARCHAR(30) NULL,
+ protocol VARCHAR(10) NULL,
+ bufferLength INT NULL,
+ windowSize INT NULL,
+ windowSizeRequest VARCHAR(30) NULL,
+ timeDuration VARCHAR(30) NULL,
+ arguments VARCHAR(50) NULL,
+ test_session_id VARCHAR(30) NULL,
+ ts TIMESTAMP DEFAULT NOW());

+
############### Create table for OWAMP data ################
#
#CREATE TABLE
@@ -137,18 +156,18 @@
###########################################################

############### Create table for ping data ################
-#CREATE TABLE
-# clmp_ping
-# (metadataId VARCHAR(255) NOT NULL,
-# seqNum INT UNSIGNED NULL DEFAULT 0,
-# value FLOAT (16,4) NOT NULL,
-# valueUnits VARCHAR(4) NULL,
-# ttl TINYINT UNSIGNED NULL DEFAULT 0,
-# numBytes INT NULL DEFAULT 0,
-# numBytesUnits VARCHAR(10) NULL,
-# timeValue LONG NOT NULL,
-# timeType VARCHAR(4) NULL,
-# ts TIMESTAMP DEFAULT NOW());
+CREATE TABLE
+ clmp_ping
+ (metadataId VARCHAR(255) NOT NULL,
+ seqNum INT UNSIGNED NULL DEFAULT 0,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(4) NULL,
+ ttl TINYINT UNSIGNED NULL DEFAULT 0,
+ numBytes INT NULL DEFAULT 0,
+ numBytesUnits VARCHAR(10) NULL,
+ timeValue LONG NOT NULL,
+ timeType VARCHAR(4) NULL,
+ ts TIMESTAMP DEFAULT NOW());
############################################################

# insert statements for testing perfsonar_utilization table
@@ -248,3 +267,27 @@
INSERT
INTO perfsonar_links (id, status_oper, time)
VALUES ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');
+
+
+
+# insert statements for testing perfsonar_iperf table
+
+INSERT
+ INTO perfsonar_iperf
+ VALUES ('meta1-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642642, NULL, NULL, 'TCP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+
+INSERT
+ INTO perfsonar_iperf
+ VALUES ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, NULL, NULL, 'UDP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+
+
+
+# insert statements for testing clmp_ping table
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbremove.sql
2009-02-06 12:12:09 UTC (rev 4945)
@@ -29,7 +29,11 @@

drop table perfsonar_links;

+drop table perfsonar_iperf;

+drop table clmp_ping;
+
+
-- root (postgres) user

\c perfsonar_ma postgres

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/psql-sqlma-dbsetup.sql
2009-02-06 12:12:09 UTC (rev 4945)
@@ -102,7 +102,41 @@
comments varchar(255)
);

+create table
+ perfsonar_iperf
+ (metadataId varchar(30) not null,
+ value double precision not null,
+ valueUnits varchar(30) null,
+ numBytes integer null,
+ numBytesUnits varchar(15) null,
+ time integer not null,
+ format varchar(30) null,
+ interv varchar(30) null,
+ protocol varchar(10) null,
+ bufferLength integer null,
+ windowSize integer null,
+ windowSizeRequest varchar(30) null,
+ timeDuration varchar(30) null,
+ arguments varchar(50) null,
+ test_session_id varchar(30) null,
+ ts timestamp default now()
+ );

+create table
+ clmp_ping
+ (metadataId varchar(255) not null,
+ seqNum integer null default 0,
+ value double precision not null,
+ valueUnits varchar(4) null,
+ ttl smallint null default 0,
+ numBytes integer null default 0,
+ numBytesUnits varchar(10) null,
+ timeValue integer not null,
+ timeType varchar(4) null,
+ ts timestamp default now()
+ );
+
+
-- insert statements for testing perfsonar_utilization table

insert
@@ -182,7 +216,29 @@
values ('PSNC-2-DFN-MUE-Link-1002', 'up', '2006-04-06 12:17:33');


+-- insert statements for testing perfsonar_iperf table

+insert
+ into perfsonar_iperf
+ values ('meta1-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642642, null, null, 'TCP', null, null, null, null, null, null, default);
+
+insert
+ into perfsonar_iperf
+ values ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, null, null, 'UDP', null, null, null, null, null, null, default);
+
+
+-- insert statements for testing clmp_ping table
+
+insert
+ into clmp_ping
+ values ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
+
+insert
+ into clmp_ping
+ values ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);
+
+
+
-- trigger

create trigger trigger1

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2009-02-06
11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2009-02-06
12:12:09 UTC (rev 4945)
@@ -87,7 +87,7 @@
service.r.service_type=ma

# Group=LS
-# Description=The URL address of the LS service.
+# Description=The URL address of the LS service (more LS addresses can be
separated by commas).
service.r.ls_url=http://somewhere

# Group=LS
@@ -115,8 +115,8 @@
service.r.service_description=perfSONAR service

# Group=LS
-# Description=The time (miliseconds) between register requests to the LS
service (default value is 43200000 ms; 12 hours).
-component.registrator.interval=43200000
+# Description=The time (seconds) between register requests to the LS service
(default value is 43200 secs; 12 hours).
+component.registrator.interval=43200

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_TEST.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -9,6 +9,8 @@
xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
xmlns="http://ggf.org/ns/nmwg/base/2.0/";>


@@ -335,5 +337,79 @@
</nmwg:data>


+ <!-- iperf/bwctl metadata section -->

+
+ <nmwg:metadata id="meta1-iperf-test">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+ <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-iperf-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <nmwg:metadata id="meta2-iperf-test">
+ <iperf:subject id="subject-1">
+ <nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:src type="ipv4" value="150.254.0.1" port="5422"/>
+ <nmwgt:dst type="ipv4" value="150.254.0.2" port="5422"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data2-iperf-test" metadataIdRef="meta2-iperf-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta2-iperf-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
+ <!-- ping metadata section -->
+
+
+ <nmwg:metadata id="ping-meta1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
</nmwg:store>
\ No newline at end of file

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_clmp-ping.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_clmp-ping.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_clmp-ping.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -19,6 +19,7 @@
<nmwg:parameters>
<nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/sql-database_iperf_TEST.xml
(from rev 4944, trunk/geant2-java-sql-ma/conf/sql-database_iperf_TEST.xml)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties 2009-02-06
11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/wizard.properties 2009-02-06
12:12:09 UTC (rev 4945)
@@ -135,15 +135,15 @@

<property>
<entry key="service.r.ls_url" required="true">http://somewhere</entry>
- <Comment>Enter the LS URL:</Comment>
+ <Comment>Enter the LS URL (more LS addresses can be separated by
commas):</Comment>
<ProposedValue>http://somewhere</ProposedValue>
<Group order="5">LS</Group>
</property>

<property>
- <entry key="component.registrator.interval">43200000</entry>
- <Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>43200000</ProposedValue>
+ <entry key="component.registrator.interval">43200</entry>
+ <Comment>Set the registration interval (seconds):</Comment>
+ <ProposedValue>43200</ProposedValue>
<Group order="6">LS</Group>
</property>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2009-02-06
11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2009-02-06
12:12:09 UTC (rev 4945)
@@ -1,5 +1,13 @@
Relational Database MA

+2009-02-03 Version 2.1.1
+ - New: support for iperf/nmwg metadata and data
+ - Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated
+ - Change: admin guide document updated (v1.2)
+ - Change: dealing with ping data updated and officially supported
+ - Change: use of pSbase v1.0.20090203
+
+
2008-10-01 Version 2.1

- New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Functional_Specification.doc
===================================================================
(Binary files differ)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Installation_Actions_Specification.doc

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/Metadata_Configuration_File_Specification.doc
===================================================================
(Binary files differ)

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_centos_5.2.txt
(from rev 4944, trunk/geant2-java-sql-ma/doc/installation_centos_5.2.txt)

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_debian_4.0.txt
(from rev 4944, trunk/geant2-java-sql-ma/doc/installation_debian_4.0.txt)

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_fedora_10.txt
(from rev 4944, trunk/geant2-java-sql-ma/doc/installation_fedora_10.txt)

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/installation_ubuntu_8.10.txt
(from rev 4944, trunk/geant2-java-sql-ma/doc/installation_ubuntu_8.10.txt)

Deleted:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.2.pdf
(from rev 4944,
trunk/geant2-java-sql-ma/doc/perfSONAR-MDM-3.1_Admin_Guide_1.2.pdf)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2009-02-06
11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2009-02-06
12:12:09 UTC (rev 4945)
@@ -1,3 +1,13 @@
+geant2-java-sql-ma (2.1.1-1) stable; urgency=low
+
+ * New: support for iperf/nmwg metadata and data
+ * Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated
+ * Change: admin guide document updated (v1.2)
+ * Change: dealing with ping data updated and officially supported
+ * Change: use of pSbase v1.0.20090203
+
+ -- Roman Lapacz
<>
Wed, 03 Feb 2009 12:00:00 +0200
+
geant2-java-sql-ma (2.1-1) stable; urgency=low

* New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2009-02-06 11:57:44 UTC (rev 4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2009-02-06 12:12:09 UTC (rev 4945)
@@ -2,7 +2,7 @@
%define prefix /usr/lib/perfsonar/services/%{name}

Name: geant2-java-sql-ma
-Version: 2.1
+Version: 2.1.1
License: Modified BSD
Release: 1
Summary: perfSONAR Relational Database Service
@@ -116,6 +116,13 @@


%changelog
+* Wed Feb 03 2009 Roman Lapacz
<>
2.1.1-1
+- New: support for iperf/nmwg metadata and data
+- Change: xquery statements ("fetch all") for utilization, discards and
errors metadata elements updated
+- Change: admin guide document updated (v1.2)
+- Change: dealing with ping data updated and officially supported
+- Change: use of pSbase v1.0.20090203
+
* Wed Oct 01 2008 Roman Lapacz
<>
2.1-1
- New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file
- New: Available as deb package

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2009-02-06 11:57:44 UTC (rev
4944)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2009-02-06 12:12:09 UTC (rev
4945)
@@ -5,7 +5,7 @@
<artifactId>geant2-java-sql-ma</artifactId>
<packaging>war</packaging>
<name>SQL Measurement Archive</name>
- <version>2.1</version>
+ <version>2.1.1</version>
<description>Relational Database Measurement Archive for
perfSONAR. For more information see the wiki-page.</description>

<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_SQL_MA_release_candidate</url>
@@ -128,7 +128,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080902</version>
+ <version>1.0.20090203</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-1.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -22,11 +22,11 @@

<nmwg:data id="data1" metadataIdRef="meta1">
<ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
- timeType="unix" timeValue="1217509150" ttl="252"
- value="3.00" valueUnits="ms"/>
+ timeType="unix" timeValue="1233920540" ttl="252"
+ value="23.00" valueUnits="ms"/>
<ping:datum numBytes="56" numBytesUnits="bytes" seqNum="0"
- timeType="unix" timeValue="1217509155" ttl="252"
- value="2.00" valueUnits="ms"/>
+ timeType="unix" timeValue="1233920541" ttl="252"
+ value="4.25" valueUnits="ms"/>
</nmwg:data>



Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-Ping-1.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-Ping-2.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-1.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-1.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-2.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-3.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-3.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-4.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-4.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/MetadataKeyRequest-iperf-5.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-iperf-5.xml)

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-1.xml
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-1.xml
2009-02-06 11:57:44 UTC (rev 4944)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-1.xml
2009-02-06 12:12:09 UTC (rev 4945)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<nmwg:message type="SetupDataRequest"
+ id="setupDataRequest1"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-Ping-2.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-1.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-iperf-1.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-2.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-iperf-2.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-3.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-iperf-3.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-4.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-iperf-4.xml)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/samples/requests/SetupDataRequest-iperf-5.xml
(from rev 4944,
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-iperf-5.xml)

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2009-02-06 11:57:44 UTC (rev 4944)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2009-02-06 12:12:09 UTC (rev 4945)
@@ -94,7 +94,6 @@
public Message fetch(Message dataQuery)
throws PerfSONARException {

-
if (dataQuery == null)
throw new PerfSONARException(
"error.ma.query",
@@ -176,14 +175,12 @@
Reader reader = Resources.getResourceAsReader(resource);
sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader);

-
List resultList = null;

if (ibatisParams.get("time") != null) {

if
(((String)ibatisParams.get("time")).equalsIgnoreCase("now")) {
resultList = sqlMap.queryForList("getResults2",
ibatisParams);
-
} else {
throw new PerfSONARException(
"error.ma.query",
@@ -196,7 +193,6 @@
resultList = sqlMap.queryForList("getResults2",
ibatisParams);
}

-
//logger.debug("SQLStorageManager.fetch: "
// + "The number of fetched rows from db for
metadata "
// + md.getId() + ": "
@@ -241,7 +237,6 @@
Message response= new Message();

Collection<Metadata> collection = dataSet.getMetadataMap().values();
-
for (Metadata md : collection) {

Key key = md.getKey();
@@ -251,9 +246,7 @@

Map ibatisParams = new HashMap();

-
// moving parameters from key into ibatisParam map
-
Parameter[] paramsArray =
key.getParameters().getParameterArray();
for (int i = 0; i < paramsArray.length; i++) {
Parameter param = paramsArray[i];
@@ -276,7 +269,6 @@


// getting data from Datum
-
try {

String resource = (String) ibatisParams.get("ibatisConfig");

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2009-02-06 11:57:44 UTC (rev 4944)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2009-02-06 12:12:09 UTC (rev 4945)
@@ -241,7 +241,6 @@
key.addParameter("eventType", eventType);

} else {
-
// metadata does not exist in xmldb

// getting default ibatis parameter from service.properties
@@ -255,7 +254,6 @@

Parameter ibatisConfig = null;
if (!ibatis_config_str.trim().equals("")) {
-
ibatisConfig = new Parameter();
ibatisConfig.setParameterName("ibatisConfig");

@@ -268,8 +266,10 @@
String metadataId = "meta" + Long.toString(rand.nextLong());

Parameters params = metadata.getParameters();
- if (params == null)
+ if (params == null) {
params = new Parameters();
+ params.addParameter("eventType", eventType);
+ }


if (ibatisConfig != null) {
@@ -284,7 +284,6 @@

}

-
if (params.getParameterByName("ibatisConfig") == null) {
logger.error("SQLTypeMAServiceEngine.getStoreKey: "
+ "No default ibatis property in the key");
@@ -352,14 +351,14 @@
if (eventType == null)
throw new PerfSONARException(
"error.ma.query",
- "SQLTypeMAServiceEngine.getStoreKey: "
+ "SQLTypeMAServiceEngine.getIbatisConfig: "
+ "eventType " + eventTypeStr + " is not supported");


String ibatisConfigStr = eventType.getIbatisConfig();

logger.debug(
- "SQLTypeMAServiceEngine.getStoreKey: "
+ "SQLTypeMAServiceEngine.getIbatisConfig: "
+ "ibatisConfig parameter for eventType (" + eventTypeStr +
"): "
+ ibatisConfigStr);


Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
(from rev 4944,
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java)

Copied:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
(from rev 4944,
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java)


  • perfsonar: r4945 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf doc packaging/deb packaging/rpm samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 02/06/2009

Archive powered by MHonArc 2.6.16.

Top of Page