Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6447 - in trunk: nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter perfsonar-java-rrd-ma perfsonar-java-rrd-ma/soapUI perfsonar-java-rrd-ma/src/main perfsonar-java-rrd-ma/src/main/resources perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma/src/main/resources/sbin perfsonar-java-rrd-ma/src/main/webapp/WEB-INF perfsonar-java-rrd-ma/src/rpm

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6447 - in trunk: nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter perfsonar-java-rrd-ma perfsonar-java-rrd-ma/soapUI perfsonar-java-rrd-ma/src/main perfsonar-java-rrd-ma/src/main/resources perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma/src/main/resources/sbin perfsonar-java-rrd-ma/src/main/webapp/WEB-INF perfsonar-java-rrd-ma/src/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6447 - in trunk: nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter perfsonar-java-rrd-ma perfsonar-java-rrd-ma/soapUI perfsonar-java-rrd-ma/src/main perfsonar-java-rrd-ma/src/main/resources perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma/src/main/resources/sbin perfsonar-java-rrd-ma/src/main/webapp/WEB-INF perfsonar-java-rrd-ma/src/rpm
  • Date: Wed, 2 Oct 2013 21:25:24 +0100 (BST)
Author: dante.delvaux
Date: 2013-10-02 21:25:24 +0100 (Wed, 02 Oct 2013)
New Revision: 6447

Added:
trunk/perfsonar-java-rrd-ma/src/main/resources/sbin/
Removed:
trunk/perfsonar-java-rrd-ma/src/main/sbin/
Modified:

trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/Main.java
trunk/perfsonar-java-rrd-ma/pom.xml

trunk/perfsonar-java-rrd-ma/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/rrdma_db.sql

trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/test_rrdma_db.sql
trunk/perfsonar-java-rrd-ma/src/main/resources/sbin/nmwg-sql-converter
trunk/perfsonar-java-rrd-ma/src/main/webapp/WEB-INF/web.xml
trunk/perfsonar-java-rrd-ma/src/rpm/post
Log:
RRD MA: 3.4.2 correcting nmwg-sql-converter packaging and adding automatic
start of MySQL from RPM package.

Modified:
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/Main.java
===================================================================
---
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/Main.java
2013-09-13 17:32:25 UTC (rev 6446)
+++
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/Main.java
2013-10-02 20:25:24 UTC (rev 6447)
@@ -6,7 +6,7 @@

static public void main(String[] arg) {
if(arg == null || arg.length == 0){
- System.err.println("Usage: java -jar
perfsonar-metadata-converter.jar sourceFile.xml
[destinationFile.sql][debug]");
+ System.err.println("Usage: java -jar
nmwg-sql-converter.jar sourceFile.xml [destinationFile.sql] [debug]");
System.exit(-1);
}


Modified: trunk/perfsonar-java-rrd-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/pom.xml 2013-09-13 17:32:25 UTC (rev 6446)
+++ trunk/perfsonar-java-rrd-ma/pom.xml 2013-10-02 20:25:24 UTC (rev 6447)
@@ -19,6 +19,7 @@
<axis2Id>axis2-1.4.1</axis2Id>
<aar.name>${project.artifactId}</aar.name>
<installPath>/usr/lib/perfsonar/services</installPath>
+ <nmwg-sql-converter.version>1.0.2</nmwg-sql-converter.version>
</properties>

<issueManagement>
@@ -156,7 +157,7 @@
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>nmwg-sql-converter</artifactId>
- <version>1.0.2</version>
+ <version>${nmwg-sql-converter.version}</version>
<classifier>jar-with-dependencies</classifier>
</dependency>

@@ -298,7 +299,7 @@
</mapper>
</data>
<data>
-
<src>src/main/sbin/nmwg-sql-converter</src>
+
<src>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/sbin/nmwg-sql-converter</src>
<type>file</type>
<mapper>
<type>perm</type>
@@ -416,7 +417,7 @@

<directoryIncluded>false</directoryIncluded>
<sources>
<source>
-
<location>src/main/sbin</location>
+
<location>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/sbin</location>
</source>
</sources>
</mapping>

Modified:
trunk/perfsonar-java-rrd-ma/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
2013-09-13 17:32:25 UTC (rev 6446)
+++
trunk/perfsonar-java-rrd-ma/soapUI/perfsonar-RRD-MA-base2-soapui-project.xml
2013-10-02 20:25:24 UTC (rev 6447)
@@ -87,7 +87,7 @@
<http:address
location="http://192.168.1.214:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService.MeasurementArchiveServiceHttpEndpoint/"/>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://192.168.1.214:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:endpoint>http://192.168.1.214:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService.MeasurementArchiveServiceHttpSoap11Endpoint</con:endpoint><con:endpoint>http://rrdma:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:endpoint>http://rrdma-new:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint></con:endpoints><con:operation
isOneWay="false" action="urn:message" name="message"
bindingOperationName="message" type="Request-Response" inputName=""
receivesAttachments="false" sendsAttachments="false"
anonymous="optional"><con:settings/><con:call name="Request 1" outgoingWss=""
incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@reques

t-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://192.168.1.214:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService.MeasurementArchiveServiceHttpSoap11Endpoint</con:endpoint><con:request>&lt;soap:Envelope
xmlns:soap="http://www.w3.org/2003/05/soap-envelope";>
+</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://192.168.1.214:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:endpoint>http://192.168.1.214:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService.MeasurementArchiveServiceHttpSoap11Endpoint</con:endpoint><con:endpoint>http://rrdma:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:endpoint>http://rrdma-new:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint></con:endpoints><con:operation
isOneWay="false" action="urn:message" name="message"
bindingOperationName="message" type="Request-Response" inputName=""
receivesAttachments="false" sendsAttachments="false"
anonymous="optional"><con:settings/><con:call name="Request 1" outgoingWss=""
incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@reques

t-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://rrdma-new:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request>&lt;soap:Envelope
xmlns:soap="http://www.w3.org/2003/05/soap-envelope";>
&lt;soap:Header/>
&lt;soap:Body/>
&lt;/soap:Envelope></con:request><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508" action="urn:message"/><con:wsrmConfig
version="1.2"/></con:call></con:operation></con:interface><con:interface
xsi:type="con:WsdlInterface" wsaVersion="NONE"
name="MeasurementArchiveServiceSoap11Binding" type="wsdl"
bindingName="{http://service.perfsonar.org}MeasurementArchiveServiceSoap11Binding";
soapVersion="1_1" anonymous="optional"
definition="../../../../../../../Desktop/MeasurementArchiveService.xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:settings/><con:definitionCache
type="TEXT"
rootPart="file:/Users/antoine/Desktop/MeasurementArchiveService.xml"><con:part><con:url>file:/Users/antoine/Desktop/MeasurementArchiveService.xml</co
n:url><con:content><![CDATA[<wsdl:definitions
targetNamespace="http://service.perfsonar.org";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:axis2="http://service.perfsonar.org";
xmlns:ns1="http://org.apache.axis2/xsd";
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl";
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";>
@@ -987,7 +987,7 @@
}

assert noOfcorrectEventTypes == 0
-assert noOfbadEventTypes >
1</scriptText></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
name="Metadata
Queries"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Correct requests" searchProperties="true"
id="28c1cfbf-5aa0-418d-9051-698985339cc4"><con:settings/><con:testStep
type="request" name="MetadataKeyRequest -
utilization"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:inte

rface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - utilization"><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+assert noOfbadEventTypes >
1</scriptText></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
name="Metadata
Queries"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Correct requests" searchProperties="true"
id="28c1cfbf-5aa0-418d-9051-698985339cc4"><con:settings/><con:testStep
type="request" name="MetadataKeyRequest -
utilization"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:inte

rface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - utilization" outgoingWss=""
incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="MetadataKeyRequest" id="mdrq1"
@@ -1039,7 +1039,7 @@
declare namespace
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/';
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';

-count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - errors"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - errors"><
con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - errors"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface
><con:operation>message</con:operation><con:request name="MetadataKeyRequest
>- errors" outgoingWss="" incomingWss=""><con:settings><con:setting
>id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
> xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
>xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="MetadataKeyRequest" id="mdrq1"
@@ -1091,7 +1091,7 @@
declare namespace
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/';
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';

-count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/errors/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest -
discards"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - discards"><c
on:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/errors/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest -
discards"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><c
on:operation>message</con:operation><con:request name="MetadataKeyRequest -
discards" outgoingWss="" incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="MetadataKeyRequest" id="mdrq1"
@@ -1143,7 +1143,7 @@
declare namespace
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/';
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';

-count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/discards/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - SNMP"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - SNMP"><con:set
tings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/discards/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - SNMP"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con
:operation>message</con:operation><con:request name="MetadataKeyRequest -
SNMP" outgoingWss="" incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="MetadataKeyRequest" id="mdrq1"
@@ -1195,7 +1195,7 @@
declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
declare namespace nmwgr='http://ggf.org/ns/nmwg/result/2.0/';

-count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/tools/snmp/2.0";])</path><content>3</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - NotImplemented"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - N
otImplemented"><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/tools/snmp/2.0";])</path><content>3</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - NotImplemented"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:i
nterface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - NotImplemented" outgoingWss=""
incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="MetadataKeyRequest" id="mdrq1"
@@ -1262,7 +1262,7 @@
declare namespace
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/';
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';

-count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - All Interfaces"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="Metada
taKeyRequest - All Interfaces"><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MetadataKeyRequest - All Interfaces"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap
11Binding</con:interface><con:operation>message</con:operation><con:request
name="MetadataKeyRequest - All Interfaces" outgoingWss=""
incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="MetadataKeyRequest" id="mdrq1"
@@ -1312,7 +1312,7 @@
declare namespace
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/';
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';

-count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Malformed requests"
searchProperties="true"><con:settings/><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="I
nvalid data"
searchProperties="true"><con:settings/><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
name="Data
Queries"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Correct requests" searchProperties="true"
id="6ccb1d64-1fa0-4789-b154-e0224e27ab0a"><con:settings/><con:testStep
type="request" name="SetupDataRequest - interface"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="SetupDataRequest - interface"><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchive
Service</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+count(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[@name="eventType"
and
.="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";])</path><content>1</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Malformed requests" searchProperties="true"
id="7da64f1f-2dc6-4c06-ab50-9fb4f044aa8f"><con:settings/><con:
properties/></con:testCase><con:testCase failOnError="true"
failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Invalid
data" searchProperties="true"
id="bb3c8619-d776-4bb3-82e4-59584af851bc"><con:settings/><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
name="Data
Queries"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Correct requests" searchProperties="true"
id="6ccb1d64-1fa0-4789-b154-e0224e27ab0a"><con:settings/><con:testStep
type="request" name="SetupDataRequest - interface"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="SetupDataRequest - interface" outgoingWss=""
incomingWss=""><con:settings><con:setting id="com.eviware.soapui.imp

l.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message type="SetupDataRequest" id="datarq2-1"
@@ -1433,7 +1433,7 @@
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';
declare namespace
netutil='http://ggf.org/ns/nmwg/characteristic/utilization/2.0';

-/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="meta1"]/netutil:datum</path><content/><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="SetupDataRequest - key"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="SetupDataRequest - key"><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></co

n:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="meta1"]/netutil:datum</path><content/><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="SetupDataRequest - key"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="SetupDataRequest - key" outgoingWss="" incoming
Wss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message id="msg3"
@@ -1539,10 +1539,10 @@
assert datums.size() == 14

}
-</scriptText></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="SetupDataRequest - chain"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="SetupDataRequest -
chain"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request>&lt;soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";>
+</scriptText></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="SetupDataRequest - chain"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="SetupDataRequest - chain" outgoingWss=""
incomingWss=""><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request>&lt;soapenv:Envelope
xmlns:soapenv=
"http://schemas.xmlsoap.org/soap/envelope/";>
&lt;soapenv:Header/>
&lt;soapenv:Body/>
-&lt;/soapenv:Envelope></con:request><con:assertion type="SOAP
Response"/><con:credentials><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Malformed requests"
searchProperties="true"><con:settings/><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Invalid data"
searchProperties="true"><con:settings/><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
name="Store
Requests"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name=
"Correct requests" searchProperties="true"><con:settings/><con:testStep
type="request" name="MeasurementArchiveStoreRequest - interface -
NotImplemented" disabled="true"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MeasurementArchiveStoreRequest - interface -
NotImplemented"><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://rrdma-old:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+&lt;/soapenv:Envelope></con:request><con:assertion type="SOAP
Response"/><con:credentials><con:username xsi:nil="true"/><con:password
xsi:nil="true"/><con:domain xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Malformed requests" searchProperties="true"
id="e27d351a-0494-4351-acb2-5c6a8ce5552b"><con:settings/><con:properties/></con:testCase><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Invalid data" searchProperties="true"
id="236ec9cc-7cc2-48fd-b85a-75a8b77c8f8d"><con:settings/><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
nam
e="Store
Requests"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
failOnError="true" failTestCaseOnErrors="true" keepSession="false"
maxResults="0" name="Correct requests" searchProperties="true"
id="319ed2bd-a449-49a4-bdf9-2fe9cb399a7a"><con:settings/><con:testStep
type="request" name="MeasurementArchiveStoreRequest - interface -
NotImplemented" disabled="true"><con:settings/><con:config
xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MeasurementArchiveStoreRequest - interface - NotImplemented"
outgoingWss="" incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><co
n:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message id="msg4"
@@ -1653,7 +1653,7 @@
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';
declare namespace
netutil='http://ggf.org/ns/nmwg/characteristic/utilization/2.0';

-/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="meta1"]/netutil:datum</path><content/><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MeasurementArchiveStoreRequest - key - NotImplemented"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="MeasurementArchiveStoreRequest - key -
NotImplemented"><con:settings><con:setting id="co

m.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://rrdma-old:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="meta1"]/netutil:datum</path><content/><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:testStep
type="request" name="MeasurementArchiveStoreRequest - key - NotImplemented"
disabled="true"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MeasurementArchiveServiceSoap11Binding</con:interface><con:operation>message</con:operation><con:request
name="
MeasurementArchiveStoreRequest - key - NotImplemented" outgoingWss=""
incomingWss=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<soapenv:Header/>
<soapenv:Body>
<nmwg:message id="msg5"
@@ -1759,4 +1759,4 @@
declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';
declare namespace
netutil='http://ggf.org/ns/nmwg/characteristic/utilization/2.0';

-/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="meta1"]/netutil:datum</path><content/><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>Global
HTTP Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
+/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="meta1"]/netutil:datum</path><content/><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:username
xsi:nil="true"/><con:password xsi:nil="true"/><con:domain
xsi:nil="true"/><con:authType>Global HTTP
Settings</con:authType></con:credentials><con:jmsConfig
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig
mustUnderstand="NONE" version="200508"/><con:wsrmConfig
version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file

Modified:
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/rrdma_db.sql
2013-09-13 17:32:25 UTC (rev 6446)
+++
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/rrdma_db.sql
2013-10-02 20:25:24 UTC (rev 6447)
@@ -1,15 +1,12 @@
-# running:
-# mysql -u root -p < rrdma_db.sql
+# This file contains the database definition for a standard RRD MA install.
+# You can deploy it by running:
+# mysql -u root -p < rrdma_db.sql

CREATE DATABASE IF NOT EXISTS
perfsonar_rrdma;

USE perfsonar_rrdma

-#CREATE USER IF NOT EXISTS
-# perfsonar_rrdma;
-
-
GRANT ALL ON
perfsonar_rrdma.* TO 'perfsonar_rrdma'@'localhost'
IDENTIFIED BY 'testpass';

Modified:
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/test_rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/test_rrdma_db.sql
2013-09-13 17:32:25 UTC (rev 6446)
+++
trunk/perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf/test_rrdma_db.sql
2013-10-02 20:25:24 UTC (rev 6447)
@@ -1,7 +1,9 @@
# This file contains some sample metadata DB entries that are used by the
soapUI tests.
# If you make changes to this file, you will need to adapt the soapUI tests
accordingly.
# You can install this testing DB content by running:
-# mysql -u root -p < test_rrdma_db.sql
+# mysql -u perfsonar_rrdma -ptestpass < test_rrdma_db.sql
+# Then you need to restart tomcat with:
+# service tomcat6 restart

USE perfsonar_rrdma


Modified:
trunk/perfsonar-java-rrd-ma/src/main/resources/sbin/nmwg-sql-converter
===================================================================
--- trunk/perfsonar-java-rrd-ma/src/main/sbin/nmwg-sql-converter
2013-07-01 16:47:42 UTC (rev 6439)
+++ trunk/perfsonar-java-rrd-ma/src/main/resources/sbin/nmwg-sql-converter
2013-10-02 20:25:24 UTC (rev 6447)
@@ -4,4 +4,4 @@
# (with eXist DB backend) to 3.4 series (with MySQL backend).
# This script should only be run once.

-java -jar
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/lib/nmwg-sql-converter-${version.nmwg-sql-converter}-jar-with-dependencies.jar
"$@"
+java -jar
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/lib/nmwg-sql-converter-${nmwg-sql-converter.version}-jar-with-dependencies.jar
"$@"

Modified: trunk/perfsonar-java-rrd-ma/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/src/main/webapp/WEB-INF/web.xml 2013-09-13
17:32:25 UTC (rev 6446)
+++ trunk/perfsonar-java-rrd-ma/src/main/webapp/WEB-INF/web.xml 2013-10-02
20:25:24 UTC (rev 6447)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">

- <display-name>GEANT RRD MA</display-name>
+ <display-name>perfSONAR RRD MA</display-name>

<session-config>
<!-- Default to 60 minute session timeouts -->

Modified: trunk/perfsonar-java-rrd-ma/src/rpm/post
===================================================================
--- trunk/perfsonar-java-rrd-ma/src/rpm/post 2013-09-13 17:32:25 UTC (rev
6446)
+++ trunk/perfsonar-java-rrd-ma/src/rpm/post 2013-10-02 20:25:24 UTC (rev
6447)
@@ -5,5 +5,17 @@
rm -rf %{_sysconfdir}/geant2-java-rrd-ma || true
rm -rf /usr/share/doc/geant2-java-rrd-ma || true

+## Open firewall port 8080 so tomcat can actually listen
+grep "\-\-dport 8080" /etc/sysconfig/iptables > /dev/null
+if [ $? -gt 0 ]; then
+ echo "Opening iptables firewall port 8080 for tomcat"
+ iptables -I INPUT -m state --state NEW -p tcp --dport 8080 -j ACCEPT
+ sed -i '/-A INPUT -j REJECT --reject-with icmp-host-prohibited/i-A INPUT
-m state --state NEW -m tcp -p tcp --dport 8080 -j ACCEPT'
/etc/sysconfig/iptables
+ echo "--port=8080:tcp" >> /etc/sysconfig/system-config-firewall
+fi
+
+## restart mysql
+/sbin/service mysqld restart
+
## restart tomcat
/sbin/service tomcat6 restart


  • [pS-dev] [GEANT/SA2/ps-java-services] r6447 - in trunk: nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter perfsonar-java-rrd-ma perfsonar-java-rrd-ma/soapUI perfsonar-java-rrd-ma/src/main perfsonar-java-rrd-ma/src/main/resources perfsonar-java-rrd-ma/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma/src/main/resources/sbin perfsonar-java-rrd-ma/src/main/webapp/WEB-INF perfsonar-java-rrd-ma/src/rpm, svn-noreply, 10/02/2013

Archive powered by MHonArc 2.6.16.

Top of Page