Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2161 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/sqlma ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config ant/sqlma/ibatis-utilization-jdbc-config ant/xmlls conf doc/ls doc/ma/rrdTypeMA doc/ma/sqlTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType

Subject: perfsonar development work

List archive

perfsonar: r2161 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/sqlma ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config ant/sqlma/ibatis-utilization-jdbc-config ant/xmlls conf doc/ls doc/ma/rrdTypeMA doc/ma/sqlTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2161 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/sqlma ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config ant/sqlma/ibatis-utilization-jdbc-config ant/xmlls conf doc/ls doc/ma/rrdTypeMA doc/ma/sqlTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType
  • Date: Thu, 1 Mar 2007 08:08:44 -0500
Author: mac
Date: 2007-03-01 08:08:44 -0500 (Thu, 01 Mar 2007)
New Revision: 2161

Added:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-doc-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-java-compile-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-release-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-test-targets.xml

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-utilization-jdbc-config/

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-axis-deploy-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-client-run-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-exist-xmldb-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-java-compile-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-junit-test-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-libs-download-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-release-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-test-run-targets.xml

branches/XML-LS-RELEASE-1.1/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml

branches/XML-LS-RELEASE-1.1/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml

branches/XML-LS-RELEASE-1.1/conf/ibatis-SqlMapConfig-utilization.template.xml

branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Removed:

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml

branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
Modified:
branches/XML-LS-RELEASE-1.1/ant/build-sqlma.xml
branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
branches/XML-LS-RELEASE-1.1/conf/eventType-map.xml
branches/XML-LS-RELEASE-1.1/conf/rrd-database_TEST.xml
branches/XML-LS-RELEASE-1.1/conf/sql-database_TEST.xml
branches/XML-LS-RELEASE-1.1/conf/sql-database_utilization_TEST.xml
branches/XML-LS-RELEASE-1.1/doc/ls/LS_functionality_specification.doc
branches/XML-LS-RELEASE-1.1/doc/ls/LS_interface_appendix.doc
branches/XML-LS-RELEASE-1.1/doc/ls/LS_interface_specification.doc

branches/XML-LS-RELEASE-1.1/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
branches/XML-LS-RELEASE-1.1/doc/ma/sqlTypeMA/Interface_Specification.doc

branches/XML-LS-RELEASE-1.1/doc/ma/sqlTypeMA/Metadata_Configuration_File_Specification.doc
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/Echo-Req.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Req.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

branches/XML-LS-RELEASE-1.1/src/org/perfsonar/commons/messages/EchoRequest.java

branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java

branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:
merge to release branch



Modified: branches/XML-LS-RELEASE-1.1/ant/build-sqlma.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/build-sqlma.xml 2007-03-01 11:31:26
UTC (rev 2160)
+++ branches/XML-LS-RELEASE-1.1/ant/build-sqlma.xml 2007-03-01 13:08:44
UTC (rev 2161)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

-
<!-- ===================================================================
<description>
perfSONAR generic service

Copied:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
(from rev 2160, trunk/perfsonar/ant/flowmp/flowTypeMP-axis-deploy-targets.xml)

Copied:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-configure-targets.xml (from
rev 2160, trunk/perfsonar/ant/flowmp/flowTypeMP-configure-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-doc-targets.xml
(from rev 2160, trunk/perfsonar/ant/flowmp/flowTypeMP-doc-targets.xml)

Copied:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-java-compile-targets.xml
(from rev 2160,
trunk/perfsonar/ant/flowmp/flowTypeMP-java-compile-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-release-targets.xml
(from rev 2160, trunk/perfsonar/ant/flowmp/flowTypeMP-release-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-test-targets.xml
(from rev 2160, trunk/perfsonar/ant/flowmp/flowTypeMP-test-targets.xml)

Copied:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config
(from rev 2160,
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config)

Deleted:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml

Copied:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
(from rev 2160,
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml)

Copied:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config
(from rev 2160,
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config)

Deleted:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml

Copied:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
(from rev 2160,
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-utilization-jdbc-config
(from rev 2160, trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config)

Deleted:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml

Copied:
branches/XML-LS-RELEASE-1.1/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
(from rev 2160,
trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml)

Modified: branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++ branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>

<!-- ===================================================================
<description>
@@ -227,31 +228,29 @@
<!-- presenting some information about configuring the relational
database -->


- <target name="accessing-relational-database-setup">
+ <target name="accessing-relational-database-setup-dynamic">

- <echo>You must provide correct database connection
information.</echo>
+ <subant target="ibatis-jdbc-config">
+ <fileset dir="ant/sqlma"
includes="*/ibatis-jdbc-config-targets.xml"/>
+ </subant>

- <echo></echo>
- <echo>If you want the service to support data of utilization
metric</echo>
- <echo>update connection parameters in
ibatis-SqlMapConfig-utilization.xml file</echo>
- <echo>that you can find in conf directory (${basedir}/conf)</echo>
- <echo>of perfSONAR SQL MA installation package.</echo>
+ </target>

- <echo></echo>
- <echo>If you want the service to support data of L2 path status
metric</echo>
- <echo>update connection parameters in
ibatis-SqlMapConfig-L2-status-domain.xml</echo>
- <echo>and ibatis-SqlMapConfig-L2-status-interdomain.xml files</echo>
- <echo>that you can find in conf directory (${basedir}/conf)</echo>
- <echo>of perfSONAR SQL MA installation package.</echo>

- <echo></echo>
- <echo>Each parameter in these files is represented by property
element.</echo>
- <echo>Check value attribute of each property and if it is needed
alter it</echo>
- <echo>to have correct connection with the database.</echo>
+ <target name="accessing-relational-database-setup"
+ depends="accessing-relational-database-setup-dynamic">

+ <echo></echo>
+ <echo>If you want to change provided jdbc connection parameters
manually,</echo>
+ <echo>because of some reasons,</echo>
+ <echo>you can do this in configuration files
(ibatis-SqlMapConfig-*.xml)</echo>
+ <echo>in ${basedir}/conf directory.</echo>
+ <echo>After such change, when the service is already deployed, you
must</echo>
+ <echo>redeploy the service (undeploy and deploy again).</echo>
<echo></echo>
- <input message="Please do it now and press Enter when finished"/>

+ <input message="Press Enter to continue"/>
+
</target>



Copied:
branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml
(from rev 2160,
trunk/perfsonar/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-axis-deploy-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-client-run-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-client-run-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-configure-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-configure-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-exist-xmldb-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-exist-xmldb-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-java-compile-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-java-compile-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-junit-test-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-junit-test-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-libs-download-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-libs-download-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-release-targets.xml (from
rev 2160, trunk/perfsonar/ant/xmlls/xmlls-release-targets.xml)

Copied: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-test-run-targets.xml
(from rev 2160, trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml)

Modified: branches/XML-LS-RELEASE-1.1/conf/eventType-map.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/conf/eventType-map.xml 2007-03-01 11:31:26
UTC (rev 2160)
+++ branches/XML-LS-RELEASE-1.1/conf/eventType-map.xml 2007-03-01 13:08:44
UTC (rev 2161)
@@ -8,21 +8,27 @@
<eventType-config>

<eventType>
- <name>utilization</name>
+ <name>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</name>

<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>
</eventType>

<eventType>
- <name>Path.Status</name>
+ <name>http://ggf.org/ns/nmwg/topology/l2/3.0/link/status</name>

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

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

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
</eventType>

+ <eventType>
+ <name>Path.Status</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGeneratorTMP</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+ </eventType>

- <eventType>
+ <eventType>
<name>owamp</name>

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

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

Copied:
branches/XML-LS-RELEASE-1.1/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml
(from rev 2160,
trunk/perfsonar/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml)

Copied:
branches/XML-LS-RELEASE-1.1/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml
(from rev 2160,
trunk/perfsonar/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml)

Copied:
branches/XML-LS-RELEASE-1.1/conf/ibatis-SqlMapConfig-utilization.template.xml
(from rev 2160,
trunk/perfsonar/conf/ibatis-SqlMapConfig-utilization.template.xml)

Modified: branches/XML-LS-RELEASE-1.1/conf/rrd-database_TEST.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/conf/rrd-database_TEST.xml 2007-03-01
11:31:26 UTC (rev 2160)
+++ branches/XML-LS-RELEASE-1.1/conf/rrd-database_TEST.xml 2007-03-01
13:08:44 UTC (rev 2161)
@@ -18,7 +18,7 @@
</nmwgt:interface>
</netutil:subject>
<nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>

@@ -48,7 +48,7 @@
</nmwgt:interface>
</netutil:subject>
<nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>


Modified: branches/XML-LS-RELEASE-1.1/conf/sql-database_TEST.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/conf/sql-database_TEST.xml 2007-03-01
11:31:26 UTC (rev 2160)
+++ branches/XML-LS-RELEASE-1.1/conf/sql-database_TEST.xml 2007-03-01
13:08:44 UTC (rev 2161)
@@ -28,7 +28,7 @@
</nmwgt:interface>
</netutil:subject>
<nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>


Modified: branches/XML-LS-RELEASE-1.1/conf/sql-database_utilization_TEST.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/conf/sql-database_utilization_TEST.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++ branches/XML-LS-RELEASE-1.1/conf/sql-database_utilization_TEST.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -22,7 +22,7 @@
</nmwgt:interface>
</netutil:subject>
<nmwg:parameters>
- <nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/doc/ls/LS_functionality_specification.doc
===================================================================
(Binary files differ)

Modified: branches/XML-LS-RELEASE-1.1/doc/ls/LS_interface_appendix.doc
===================================================================
(Binary files differ)

Modified: branches/XML-LS-RELEASE-1.1/doc/ls/LS_interface_specification.doc
===================================================================
(Binary files differ)

Modified:
branches/XML-LS-RELEASE-1.1/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/XML-LS-RELEASE-1.1/doc/ma/sqlTypeMA/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/XML-LS-RELEASE-1.1/doc/ma/sqlTypeMA/Metadata_Configuration_File_Specification.doc
===================================================================
(Binary files differ)

Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/Echo-Req.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/Echo-Req.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/Echo-Req.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -7,7 +7,7 @@


<nmwg:metadata id="meta">
- <nmwg:eventType>echo</nmwg:eventType>
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/echo/2.0</nmwg:eventType>
</nmwg:metadata>

<nmwg:data id="data" metadataIdRef="meta"/>

Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -8,7 +8,7 @@
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

<nmwg:metadata id="meta">
- <nmwg:eventType>echo.ls</nmwg:eventType>
+
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/echo/ls/2.0</nmwg:eventType>
<nmwg:parameters>

<nmwg:parameter name="testDBConnection" value="yes"/>

Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -27,7 +27,7 @@
<nmwgt:hostName>test-hostName</nmwgt:hostName>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -52,7 +52,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>


</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -49,7 +49,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>


</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -20,7 +20,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -44,7 +44,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Req.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Req.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/MetadataKey-Req.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -28,7 +28,7 @@
<nmwgt:hostName>test-hostName</nmwgt:hostName>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>

<!-- This is the specific data we wish to see -->

Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -20,7 +20,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -21,7 +21,7 @@
<nmwg:parameter name="startTime">1144318523</nmwg:parameter>
<nmwg:parameter name="endTime">1147960133</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -44,7 +44,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<nmwg:message type="SetupDataRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
@@ -9,17 +11,7 @@
<nmwg:subject id="subject1">
<nmtl2:link>

- <!--
<nmwgtopo3:node>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
- -->
-
- <nmwgtopo3:node>
<nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
<nmwgtopo3:country>Poland</nmwgtopo3:country>
<nmwgtopo3:city>Poznan</nmwgtopo3:city>
@@ -42,10 +34,10 @@
<nmwg:metadata id="meta2">
<select:subject id="iusub2" metadataIdRef="meta1"/>
<select:parameters id="param1">
- <nmwg:parameter name="startTime">1144318524</nmwg:parameter>
- <nmwg:parameter name="endTime">1144318527</nmwg:parameter>
+ <nmwg:parameter name="startTime">1144318523</nmwg:parameter>
+ <nmwg:parameter name="endTime">1147960133</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -22,7 +22,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -31,7 +31,7 @@

</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -48,7 +48,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -26,7 +26,7 @@
<nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
<nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter name="eventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:metadata>
@@ -37,7 +37,7 @@
<select:parameters id="param1">
<nmwg:parameter name="time">now</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -26,7 +26,7 @@
<nmwg:parameters id="localhost.648d2dab:10c33bffe91:-7fa8">
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
<nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
- <nmwg:parameter name="eventType">utilization</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:metadata>
@@ -35,10 +35,10 @@
<nmwg:metadata id="meta2">
<select:subject id="iusub2" metadataIdRef="meta1"/>
<select:parameters id="param1">
- <nmwg:parameter name="startTime">1143034709</nmwg:parameter>
- <nmwg:parameter name="endTime">1149070711</nmwg:parameter>
+ <nmwg:parameter name="startTime">1143034704</nmwg:parameter>
+ <nmwg:parameter name="endTime">1143034706</nmwg:parameter>
</select:parameters>
- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
</nmwg:metadata>



Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -55,7 +55,7 @@
<nmwgt:direction>in</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -65,7 +65,7 @@
<nmwgt:direction>out</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -79,7 +79,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>

@@ -94,7 +94,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -55,7 +55,7 @@
<nmwgt:direction>in</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -65,7 +65,7 @@
<nmwgt:direction>out</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
</nmwg:metadata>


@@ -79,7 +79,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>

@@ -90,7 +90,7 @@
<nmwg:parameter name="endTime">1121731200</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>

@@ -103,7 +103,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
===================================================================
---
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
2007-03-01 13:08:44 UTC (rev 2161)
@@ -39,7 +39,7 @@
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

- <nmwg:eventType>select</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>

</nmwg:metadata>


Modified:
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/commons/messages/EchoRequest.java
===================================================================
---
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/commons/messages/EchoRequest.java
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/commons/messages/EchoRequest.java
2007-03-01 13:08:44 UTC (rev 2161)
@@ -32,6 +32,14 @@



+ // ---------------------------------- fields
+
+
+
+ public static final String ECHO_NAMESPACE =
"http://schemas.perfsonar.net/tools/admin/echo/2.0";;
+
+
+
// ---------------------------------- constructors


@@ -121,7 +129,7 @@

Message response = null;

- if (eventType.getEventType().equals("echo")) {
+ if (eventType.getEventType().equals(ECHO_NAMESPACE)) {
response = executeSimpleEcho();
} else if (eventType.getEventType().equals("")) {
response = getEmptyEventTypeResponse();

Modified:
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java
===================================================================
---
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/lookupService/xmlType/EchoRequestAction.java
2007-03-01 13:08:44 UTC (rev 2161)
@@ -18,7 +18,7 @@
*/
public class EchoRequestAction extends LSAction {

- public final static String SUPPORTED_EVENT_TYPE="echo.ls";
+ public final static String
SUPPORTED_EVENT_TYPE="http://schemas.perfsonar.net/tools/admin/echo/ls/2.0";;

public EchoRequestAction(StorageManager xmlStorageManager) throws
SystemException {
super(xmlStorageManager);

Modified:
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-03-01 13:08:44 UTC (rev 2161)
@@ -116,8 +116,8 @@
+ "
\n"
+ " let $linkMetadata :=
\n"
+ " for $k in //nmwg:metadata
\n"
- + " where
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " where
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ "
\n"
+ " let $metaids :=
\n"
@@ -166,8 +166,8 @@
+ " if ($globalName != '') then
\n"
+ " for $m in //nmwg:metadata
\n"
+ " where
fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName) =
fn:lower-case($globalName) \n"
- + " and
$m/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$m/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $m
\n"
+ " else
\n"
+ " ''
\n"
@@ -295,8 +295,8 @@
+ " for $k in //nmwg:metadata
\n"
+ " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id
\n"
+ " and
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id
\n"
- + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"
@@ -364,8 +364,8 @@
+ " if ($node_id != '') then
\n"
+ " for $k in //nmwg:metadata
\n"
+ " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node_id
\n"
- + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"

Copied:
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
(from rev 2160,
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java)

Modified:
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
---
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
2007-03-01 11:31:26 UTC (rev 2160)
+++
branches/XML-LS-RELEASE-1.1/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
2007-03-01 13:08:44 UTC (rev 2161)
@@ -85,7 +85,10 @@
protected NMWGStorageManager metadataConfig = null;


+ public static final String SELECT_NAMESPACE =
"http://ggf.org/ns/nmwg/ops/select/2.0";;

+
+
// ---------------------------------- constructors


@@ -416,7 +419,7 @@
for (Object d : msg.getDataMap().values())
message.addChild((Data)d);

- } else if
(metadata.getEventType().getEventType().trim().equals("select")) {
+ } else if
(metadata.getEventType().getEventType().trim().equals(SELECT_NAMESPACE)) {

Parameters params = metadata.getParameters();
String metadataIdRef =
metadata.getSubject().getMetadataIdRef();


  • perfsonar: r2161 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/sqlma ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config ant/sqlma/ibatis-utilization-jdbc-config ant/xmlls conf doc/ls doc/ma/rrdTypeMA doc/ma/sqlTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/commons/messages src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementArchive/rrdType, svnlog, 03/01/2007

Archive powered by MHonArc 2.6.16.

Top of Page