perfsonar development work

Author: dante.delvaux
Date: 2013-11-30 15:39:10 +0000 (Sat, 30 Nov 2013)
New Revision: 6454

Added:
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
Modified:
   trunk/perfsonar-java-sql-ma/pom.xml
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
   
trunk/perfsonar-java-sql-ma/test/JavaSQLMAsoapUI/InterfaceBased/SQL_MA_soapui-project.xml
Log:
SQL MA: correcting eventType handling when receiving a request.

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2013-11-22 22:21:03 UTC (rev 6453)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2013-11-30 15:39:10 UTC (rev 6454)
@@ -200,6 +200,7 @@
                         </includes>
                         <excludes>
                             
<exclude>perfsonar/conf/log4j.properties</exclude>
+                            
<exclude>perfsonar/conf/service.properties</exclude>
                             
<exclude>perfsonar/conf/wizard.properties</exclude>
                             <exclude>logging.properties</exclude>
                         </excludes>

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
  2013-11-22 22:21:03 UTC (rev 6453)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
  2013-11-30 15:39:10 UTC (rev 6454)
@@ -2,6 +2,7 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.Element;
+import org.ggf.ns.nmwg.base.v2_0.EventType;
 import org.ggf.ns.nmwg.base.v2_0.Key;
 import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
@@ -56,6 +57,7 @@
             ((JdbcComponent) AuxiliaryComponentManager.
                 getInstance().
                 getComponent(ComponentNames.JDBC)).getDataSource();
+        logger.debug("Trying to create the Transaction Manager");
         tx = new FallibleTransactionTemplate(new 
DataSourceTransactionManager(dataSource));
     }
 
@@ -72,6 +74,7 @@
     private Dao createDao(String eventType) throws PerfSONARException
     {
         for (DaoProvider provider: PROVIDERS) {
+            logger.debug("Trying to create Dao for " + eventType);
             Dao dao = provider.createDao(eventType, dataSource);
             if (dao != null) {
                 return dao;
@@ -92,31 +95,27 @@
     {
         if (dataQuery == null) {
             throw new PerfSONARException(
-                "error.ma.query",
-                "SQLStorageManager.fetch: "
-                    + "Query message is null");
+                "error.ma.query", "SQLStorageManager.fetch: Query message is 
null");
         }
 
         return tx.execute(new FallibleTransactionCallback<Message, 
PerfSONARException>() {
             @Override
             public Message doInFallibleTransaction(TransactionStatus 
transactionStatus)
                 throws PerfSONARException
-            {
+                {
                 Message response = new Message();
-
                 Collection<Metadata> collection = 
dataQuery.getMetadataMap().values();
 
                 for (Metadata md : collection) {
-                    Key key = md.getKey();
+                    EventType et = md.getEventType();
+                    if (et != null) {
+                        String eventType = et.getEventType();
+                        Dao dao = getDao(eventType);
 
-                    String eventType = 
md.getKey().getParameterByName("http://ggf.org/ns/nmwg/base/2.0/";,
-                                                                      
"eventType").getParameterValue();
-                    Dao dao = getDao(eventType);
-
-                    response.addChild(md);
-                    response.addChild(dao.fetch(key));
+                        response.addChild(md);
+                        response.addChild(dao.fetch(md.getKey()));
+                    }
                 }
-
                 return response;
             }
         });
@@ -161,9 +160,7 @@
             }
         });
 
-        PerfSONARException pex = new PerfSONARException(
-            "success.ma.write",
-            "Data have been stored");
+        PerfSONARException pex = new PerfSONARException("success.ma.write", 
"Data have been stored");
         return ResultCodesUtil.createResultCodeMetadata(new Message(), pex);
     }
 

Added: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
                            (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
    2013-11-30 15:39:10 UTC (rev 6454)
@@ -0,0 +1,177 @@
+
+
+# this template file is prepared for the releases with web admin stuff and 
packaged in rpm form
+# $Id$
+# romradz
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of the internal implementation structures
+
+
+# Group=Internal
+# Description=The type of service used to select the correct message handler 
implementation.
+service.r.type=ma
+
+# Group=Internal
+# Description=The service name.
+service.name=${artifactId}-${version}
+
+# Group=Internal
+# Description=The java class file which implements the ServiceEngine 
interface.
+service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
+
+# Group=Internal
+# Description=A CSV of request message types supported by the service.
+service.ma.message_types=MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,MetadataKeyRequest,SetupDataRequest,EchoRequest,LookupInfoRequest
+
+# Group=Internal
+# Description=The java class file which implements the base chaining of 
requests.
+service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.sqlType.NMWGInterfaceBaseChaining
+
+# Group=Internal
+# Description=The path to the file objects.config, including the NMWG 
parser's configuration settings. The parser reads the request or metadata 
configuration files, and creates internally used objects that represent these 
files.
+service.sax_parser.config=/perfsonar/conf/objects.config
+
+# Group=Internal
+# Description=The path to the log4j.properties configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
+service.log.log4j.config=/perfsonar/conf/log4j.properties
+
+# Group=Internal
+# Description=The path to the metadata configuration file, including the 
file's name.
+service.ma.conf_file=/perfsonar/conf/sql-database_TEST.xml
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of storing metadata configuration file in xml db eXist
+
+
+# Group=eXist
+# Description=Determines whether the xmld db (eXist) is used as a storage 
for the metadata configuration file (on) or not (off). Currently only the 
value 'on' is needed to run the service correctly.
+component.ma.xmldb.db_status=on
+
+# Group=eXist
+# Description=The type of connection to the eXist DB (xmlrpc or http). The 
http type is not recommended when transfers of many data are expected.
+component.ma.xmldb.db_access=xmlrpc
+
+# Group=eXist
+# Description=URI address of the collection in the eXist DB that contains 
the metadata configuration file.
+component.ma.xmldb.db_uri=xmldb:exist://localhost:8081/exist/xmlrpc/db/sqlmaconfig
+
+# Group=eXist
+# Description=The username for the eXist DB.
+component.ma.xmldb.db_username=sqlmaservice
+
+# Group=eXist
+# Description=The user password for the eXist DB.
+component.ma.xmldb.db_password=sqlmaservice
+
+# Group=eXist
+# Description=The administrator password for the eXist DB.
+component.ma.xmldb.db_adminpassword=
+
+# Group=eXist
+# Description=Determines how the eXist DB is installed (webapp or 
stand-alone).
+component.ma.xmldb.type=webapp
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of LS functionality
+
+
+# Group=LS
+# Description=The service type.
+service.r.service_type=SQL_MA
+
+# Group=LS
+# Description=The URL address of the LS service (more LS addresses can be 
separated by commas).
+service.r.ls_url=http://somewhere.to.register/your/access/point
+# If you have a production service in the GEANT domain, you might want to 
use the following address for registration
+#service.r.ls_url=http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService
+
+# Group=LS
+# Description=The URL address of the service configured by this 
configuration file.
+service.r.access_point=http://somewhere:8080/${artifactId}/services/MeasurementArchiveService
+
+# Group=LS
+# Description=The name of the organisation who is deploying the service.
+service.r.organization_name=X
+
+# Group=LS
+# Description=The name of the service (can contain multiple words).
+service.r.service_name=pS java SQL MA
+
+# Group=LS
+# Description=The version number of the service.
+service.r.service_version=${version}
+
+# Group=LS
+# Description=The email address of the person who manages the service.
+service.r.contact_email=user@domain
+
+# Group=LS
+# Description=The description of the service.
+service.r.service_description=perfSONAR service
+
+# Group=LS
+# Description=The time (seconds) between register requests to the LS service 
(default value is 43200 secs; 12 hours).
+component.registrator.interval=43200
+
+# Group=LS
+# Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
+component.registrator.scheduler_component=ma_scheduler
+
+# Group=LS
+# Description=Enter 'xmldb' to take metadata elements for register requests 
from the XML database, or 'file' to take them from the XML metadata 
configuration file.
+service.ma.conf_file.store_type=xmldb
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of AuthN functionality
+
+
+# Group=Authentication
+# Description=The URL address of the Authentication Service.
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+# Group=Authentication
+# Description=The types of messages for which authentication is to be 
enabled (if required).
+service.as.authn_for_msg_types=MeasurementArchiveStoreKeyRequest,MeasurementArchiveStoreRequest,SetupDataRequest,MetadataKeyRequest
+
+# Group=Authentication
+# Description=Determines if authentication is enabled (on) or not (off).
+service.as.authn_active=off
+
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of store functionality
+
+
+# Group=Store
+# Description=Determines whether new data sent to the service is stored (on) 
or not (off).
+service.ma.xmldb.db_store=on
+
+
+# 
-----------------------------------------------------------------------------------------------
+# Configuration of database settings
+
+# Group=JDBC
+# Description=The JDBC driver name
+service.ma.jdbc.driver=com.mysql.jdbc.Driver
+
+# Group=JDBC
+# Description=The JDBC connection URL
+service.ma.jdbc.url=jdbc:mysql://127.0.0.1/perfsonar_ma
+
+# Group=JDBC
+# Description=Database user name
+service.ma.jdbc.username=perfsonar_ma
+
+# Group=JDBC
+# Description=Database password
+service.ma.jdbc.password=testpass
\ No newline at end of file


Property changes on: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
     2013-11-22 22:21:03 UTC (rev 6453)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
     2013-11-30 15:39:10 UTC (rev 6454)
@@ -28,7 +28,7 @@
 
 
   <property>
-    <entry key="component.ma.xmldb.db_uri" 
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
+    <entry key="component.ma.xmldb.db_uri" 
required="true">xmldb:exist://localhost:8081/exist/xmlrpc</entry>
     <Comment>Enter the URI location of the eXist database:</Comment>
     <ProposedValue>xmldb:exist://localhost:8081/exist/xmlrpc</ProposedValue>
     <Group order="1">eXist</Group>

Modified: 
trunk/perfsonar-java-sql-ma/test/JavaSQLMAsoapUI/InterfaceBased/SQL_MA_soapui-project.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/test/JavaSQLMAsoapUI/InterfaceBased/SQL_MA_soapui-project.xml
   2013-11-22 22:21:03 UTC (rev 6453)
+++ 
trunk/perfsonar-java-sql-ma/test/JavaSQLMAsoapUI/InterfaceBased/SQL_MA_soapui-project.xml
   2013-11-30 15:39:10 UTC (rev 6454)
@@ -10506,7 +10506,7 @@
 declare namespace xmlns="http://ggf.org/ns/nmwg/base/2.0/";;
 
 
count(//nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter)</path><content>0</content><allowWildcards>true</allowWildcards></con:configuration></con:assertion><con:credentials><con:authType>Global
 HTTP 
Settings</con:authType></con:credentials></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:testSuite
 name="Echo Tests" 
id="507612c8-2a64-4397-bc0c-bd2b7af86390"><con:description>Echo Requests 
testing messages.
-</con:description><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
 failOnError="false" failTestCaseOnErrors="true" keepSession="true" 
maxResults="0" name="Correct requests" searchProperties="true" timeout="0" 
wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" 
amfEndpoint="" amfLogin="" amfPassword="" 
id="72a35441-f3c0-42d4-96c1-495259e676ee"><con:description/><con:settings/><con:testStep
 type="request" name="Echo Request" 
id="a3ee1424-4300-4f81-8464-1e208bd032b2"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Echo Request" outgoingWss="" incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:sett
 
ing></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://sqlma-old:8080/geant2-java-sql-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";>
+</con:description><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase
 failOnError="false" failTestCaseOnErrors="true" keepSession="true" 
maxResults="0" name="Correct requests" searchProperties="true" timeout="0" 
wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" 
amfEndpoint="" amfLogin="" amfPassword="" 
id="72a35441-f3c0-42d4-96c1-495259e676ee"><con:description/><con:settings/><con:testStep
 type="request" name="Echo Request" 
id="a3ee1424-4300-4f81-8464-1e208bd032b2"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Echo Request" outgoingWss="" incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:sett
 
ing></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-sql-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>
 
@@ -10536,7 +10536,7 @@
 declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
 declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
 
-matches(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'(echo/success|success\.echo)')</path><content>true</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="XML DB Access Test Request" 
id="b99239e3-1ee6-4464-a467-f0e65502e55a"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:re
 quest name="XML DB Access Test Request" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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://sqlma-old:8080/geant2-java-sql-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";>
+matches(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'(echo/success|success\.echo)')</path><content>true</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="XML DB Access Test Request" 
id="b99239e3-1ee6-4464-a467-f0e65502e55a"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:re
 quest name="XML DB Access Test Request" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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-sql-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>
 
@@ -10546,10 +10546,6 @@
        xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
                             
     <nmwg:metadata id="meta">
-      <netutil:subject id="subj1">
-          <nmwgt:interface></nmwgt:interface>
-      </netutil:subject>
-      <!-- This will only work with RRD MA version > 3.4.2 -->
       
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test</nmwg:eventType>
     </nmwg:metadata>
                                     
@@ -10573,7 +10569,7 @@
 declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
 declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
 
-contains(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'xmldb-access-test/success')</path><content>true</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="XML DB Content Test Request" 
id="047e1364-2eb1-4e59-aacd-20b15e9c4aed"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:req
 uest name="XML DB Content Test Request" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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://sqlma-old:8080/geant2-java-sql-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";>
+contains(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'xmldb-access-test/success')</path><content>true</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="XML DB Content Test Request" 
id="047e1364-2eb1-4e59-aacd-20b15e9c4aed"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:req
 uest name="XML DB Content Test Request" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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-sql-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>
 
@@ -10583,10 +10579,6 @@
        xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
                             
     <nmwg:metadata id="meta">
-      <netutil:subject id="subj1">
-          <nmwgt:interface></nmwgt:interface>
-      </netutil:subject>
-      <!-- This will only work with RRD MA version > 3.4.2 -->
       
<nmwg:eventType>http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test</nmwg:eventType>
     </nmwg:metadata>
                                     
@@ -10610,7 +10602,7 @@
 declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
 declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
 
-contains(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'xmldb-content-test/success')</path><content>true</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="Random Fetch Test Request" 
id="42bb46ed-21e3-4733-9e1d-978cbe9efb0f"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:requ
 est name="Random Fetch Test Request" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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://sqlma:8080/perfsonar-java-sql-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";>
+contains(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'xmldb-content-test/success')</path><content>true</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="Random Fetch Test Request" 
id="42bb46ed-21e3-4733-9e1d-978cbe9efb0f"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:requ
 est name="Random Fetch Test Request" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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-sql-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>
 
@@ -10643,7 +10635,7 @@
 declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
 declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
 
-contains(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'random-fetch-test/success')</path><content>true</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="Selftest" 
id="9c915e6f-d401-444f-8b9c-67985d8ae935"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Selftest
 " outgoingWss="" incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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://sqlma-old:8080/geant2-java-sql-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";>
+contains(/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:metadata/nmwg:eventType,
 
'random-fetch-test/success')</path><content>true</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="Selftest" 
id="9c915e6f-d401-444f-8b9c-67985d8ae935"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Selftest
 " outgoingWss="" incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><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-sql-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>
 
@@ -10691,7 +10683,7 @@
 }
 
 assert noOfcorrectEventTypes >= 1
-assert noOfbadEventTypes == 
0</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="Selftest DBConnection=yes" 
id="90337cc9-bb7e-4160-998c-d1225478b674"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Selftest DBConnection=yes" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 id="com.eviware.soapui.impl.wsdl.Wsd
 
lRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://sqlma-old:8080/geant2-java-sql-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 == 
0</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="Selftest DBConnection=yes" 
id="90337cc9-bb7e-4160-998c-d1225478b674"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Selftest DBConnection=yes" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 id="com.eviware.soapui.impl.wsdl.Wsd
 
lRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-sql-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>
 
@@ -10745,7 +10737,7 @@
 }
 
 assert noOfcorrectEventTypes >= 1
-assert noOfbadEventTypes == 
0</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="Selftest DBSchema=true" 
id="81e84bd2-e7aa-424d-acc8-adacfa764cdf"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Selftest DBSchema=true" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 id="com.eviware.soapui.impl.wsdl.WsdlReque
 
st@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://sqlma-old:8080/geant2-java-sql-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 == 
0</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="Selftest DBSchema=true" 
id="81e84bd2-e7aa-424d-acc8-adacfa764cdf"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
 name="Selftest DBSchema=true" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 id="com.eviware.soapui.impl.wsdl.WsdlReque
 
st@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/perfsonar-java-sql-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>