perfsonar development work

Author: dante.delvaux
Date: 2014-01-22 21:55:49 +0000 (Wed, 22 Jan 2014)
New Revision: 6482

Added:
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/exist-sqlma-db.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db-L2status_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-owamp.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-ping.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_discards_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_errors_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_iperf_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_utilization_TEST.xml
Removed:
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database-L2status_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-owamp.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-ping.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_discards_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_errors_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_iperf_TEST.xml
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_utilization_TEST.xml
Modified:
   trunk/perfsonar-java-sql-ma/src/deb/control/postinst
   trunk/perfsonar-java-sql-ma/src/deb/control/postrm
   trunk/perfsonar-java-sql-ma/src/deb/control/preinst
   trunk/perfsonar-java-sql-ma/src/deb/control/prerm
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
   
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/log4j.properties
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
   
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
Log:
SQL MA: improving Debian maintainer's scripts, adding an empty (more useful) 
eXist metadata configuration database.

Modified: trunk/perfsonar-java-sql-ma/src/deb/control/postinst
===================================================================
--- trunk/perfsonar-java-sql-ma/src/deb/control/postinst        2014-01-21 
16:51:35 UTC (rev 6481)
+++ trunk/perfsonar-java-sql-ma/src/deb/control/postinst        2014-01-22 
21:55:49 UTC (rev 6482)
@@ -22,8 +22,9 @@
 
 case "$1" in
     configure)
+        # This shouldn't be necessary, unless we upgrade from a < 2.3.4 
version
         service tomcat6 stop
-        
+
         #Bug fix for a previous package version, where symbolic links where 
not removed on package removal
         OLD_SERVICE_NAME=geant2-java-sql-ma
         if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
@@ -39,12 +40,15 @@
         if [ -e /usr/share/doc/$OLD_SERVICE_NAME ]; then
           rm -rf /usr/share/doc/$OLD_SERVICE_NAME
         fi
+        # this was for versions up to 2.3.4 (name removed in 2.3.5):
+        rm -f /etc/${SERVICENAME}/sql-database*.xml
+        rm -f /etc/${SERVICENAME}/log4j.syslog.properties
     
         # We create the link to the configuration files and set correct 
permissions
         CONFDIR=${SERVICEPATH}/${SERVICENAME}/WEB-INF/classes/perfsonar/conf
-        ln -s ${CONFDIR}/*.properties /etc/${SERVICENAME}/
-        ln -s ${CONFDIR}/*.sql /etc/${SERVICENAME}/
-        ln -s ${CONFDIR}/sql-database*.xml /etc/${SERVICENAME}/
+        ln -sf ${CONFDIR}/*.properties /etc/${SERVICENAME}/
+        ln -sf ${CONFDIR}/*.sql /etc/${SERVICENAME}/
+        ln -sf ${CONFDIR}/exist-sqlma-db*.xml /etc/${SERVICENAME}/
         chown tomcat6:tomcat6 ${CONFDIR}/*.properties
         chown tomcat6:tomcat6 /var/log/${SERVICENAME}
         

Modified: trunk/perfsonar-java-sql-ma/src/deb/control/postrm
===================================================================
--- trunk/perfsonar-java-sql-ma/src/deb/control/postrm  2014-01-21 16:51:35 
UTC (rev 6481)
+++ trunk/perfsonar-java-sql-ma/src/deb/control/postrm  2014-01-22 21:55:49 
UTC (rev 6482)
@@ -28,12 +28,18 @@
         # remove left overs from postinst script
         rm /etc/[[artifactId]]/*.properties
         rm /etc/[[artifactId]]/*.sql
+        rm /etc/[[artifactId]]/exist-sqlma-db*.xml
+        # this was for versions up to 2.3.4 (name removed in 2.3.5):
         rm /etc/[[artifactId]]/sql-database*.xml
+        service tomcat6 start
         ;;
 
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        service tomcat6 restart
+    remove|failed-upgrade|abort-install|abort-upgrade|disappear)
+        service tomcat6 start
         ;;
+        
+    upgrade)
+        ;;
 
     *)
         echo "postrm called with unknown argument \`$1'" >&2

Modified: trunk/perfsonar-java-sql-ma/src/deb/control/preinst
===================================================================
--- trunk/perfsonar-java-sql-ma/src/deb/control/preinst 2014-01-21 16:51:35 
UTC (rev 6481)
+++ trunk/perfsonar-java-sql-ma/src/deb/control/preinst 2014-01-22 21:55:49 
UTC (rev 6482)
@@ -16,6 +16,7 @@
 
 case "$1" in
     install|upgrade)
+        service tomcat6 stop
     ;;
 
     abort-upgrade)

Modified: trunk/perfsonar-java-sql-ma/src/deb/control/prerm
===================================================================
--- trunk/perfsonar-java-sql-ma/src/deb/control/prerm   2014-01-21 16:51:35 
UTC (rev 6481)
+++ trunk/perfsonar-java-sql-ma/src/deb/control/prerm   2014-01-22 21:55:49 
UTC (rev 6482)
@@ -19,6 +19,7 @@
 
 case "$1" in
     remove|upgrade|deconfigure)
+        service tomcat6 stop
     ;;
 
     failed-upgrade)

Added: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/exist-sqlma-db.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/exist-sqlma-db.xml
                            (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/exist-sqlma-db.xml
    2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store
+    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+    xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+    xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+    xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+    xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+    xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+    xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+<!-- Start with an empty store that can holds anything -->
+
+</nmwg:store>
\ No newline at end of file


Property changes on: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/exist-sqlma-db.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
      2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.properties
      2014-01-22 21:55:49 UTC (rev 6482)
@@ -4,7 +4,7 @@
 
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 log4j.appender.psRootAppender.MaxBackupIndex=11
-log4j.appender.psRootAppender.File=/var/log/${project.build.finalName}/perfsonar_debug_sqlma.log
+log4j.appender.psRootAppender.File=/var/log/${project.build.finalName}/sqlma.log
 log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.psRootAppender.MaxFileSize=100MB

Deleted: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
       2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/log4j.syslog.properties
       2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,248 +0,0 @@
-## $Id$
-## project : perfSONAR
-## author: romradz
-
-
-
-##
-## All log levels in one log file.
-## By default debug level is switched off (commented).
-##
-
-# Group=Log levels
-# Description=Assigns debug log messages to the specified log appender.
-#log4j.logger.sonar-debug=DEBUG, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, SYSLOG, psRootAppender
-
-# Group=Log levels
-# Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, SYSLOG, psRootAppender
-
-
-
-##
-## Uncomment this block (and comment the one above)
-## if you want to have log levels in separate log files
-##
-## this section is only for developer tests
-##
-#log4j.logger.sonar-debug=DEBUG, SYSLOG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, SYSLOG, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, SYSLOG, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, SYSLOG, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, SYSLOG, fatalAppender, psRootAppender
-
-
-
-
-######################################### DEBUG 
#######################################
-
-# Group=Debug message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.debugAppender.MaxBackupIndex=11
-
-# Group=Debug message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_debug.log
-
-# Group=Debug message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Debug message logging
-# Description=The log message format.
-log4j.appender.debugAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Debug message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.debugAppender.MaxFileSize=500KB
-
-# Group=Debug message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### INFO 
########################################
-
-# Group=Info message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.infoAppender.MaxBackupIndex=11
-
-# Group=Info message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_info.log
-
-# Group=Info message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Info message logging
-# Description=The log message format.
-log4j.appender.infoAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Info message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.infoAppender.MaxFileSize=500KB
-
-# Group=Info message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### WARN 
########################################
-
-# Group=Warn message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.warnAppender.MaxBackupIndex=11
-
-# Group=Warn message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_warn.log
-
-# Group=Warn message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Warn message logging
-# Description=The log message format.
-log4j.appender.warnAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Warn message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.warnAppender.MaxFileSize=500KB
-
-# Group=Warn message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ERROR 
#######################################
-
-# Group=Error message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.errorAppender.MaxBackupIndex=11
-
-# Group=Error message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_error.log
-
-# Group=Error message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Error message logging
-# Description=The log message format.
-log4j.appender.errorAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Error message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.errorAppender.MaxFileSize=500KB
-
-# Group=Error message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### FATAL 
#######################################
-
-# Group=Fatal message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.fatalAppender.MaxBackupIndex=11
-
-# Group=Fatal message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_fatal.log
-
-# Group=Fatal message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=Fatal message logging
-# Description=The log message format.
-log4j.appender.fatalAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=Fatal message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.fatalAppender.MaxFileSize=500KB
-
-# Group=Fatal message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### ALL 
#########################################
-
-# Group=All message logging
-# Description=The maximum number of backup log files to create.
-log4j.appender.psRootAppender.MaxBackupIndex=11
-
-# Group=All message logging
-# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar.log
-
-# Group=All message logging
-# Description=The class responsible for the logging layout.
-log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
-
-# Group=All message logging
-# Description=The log message format.
-log4j.appender.psRootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-
-# Group=All message logging
-# Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
-log4j.appender.psRootAppender.MaxFileSize=500KB
-
-# Group=All message logging
-# Description=The class responsible for appending log messages to the log 
file.
-log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
-
-
-
-######################################### SYSLOG 
#########################################
-
-# Group=Syslog logging
-# Description=The class responsible for appending log messages to the syslog 
file.
-log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender
-
-# Group=Syslog logging
-# Description=The IP address of the host executing syslog-ng.
-log4j.appender.SYSLOG.syslogHost=127.0.0.1
-
-# Group=Syslog logging
-# Description=The class responsible for the logging layout.
-log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
-
-# Group=Syslog logging
-# Description=The log message format. This can include @Location after 
PERFSONAR-AS.
-log4j.appender.SYSLOG.layout.ConversionPattern=\%GEANT2-JAVA-SQL-MA.%p\% %m%n
-
-
-
-######################################### ROOT 
#########################################
-
-# this section is only for developer's tests
-
-# ROOT
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/log/perfsonar_root.log
-#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#log4j.appender.rootAppender.layout.ConversionPattern=%d 
%%GEANT2-JAVA-SQL-MA.%p%% %m%n
-#log4j.rootLogger=DEBUG, rootAppender
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
\ No newline at end of file

Modified: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
    2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/service.properties
    2014-01-22 21:55:49 UTC (rev 6482)
@@ -35,7 +35,7 @@
 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.
+# Description=The path to the log4j.properties configuration file.
 service.log.log4j.config=/perfsonar/conf/log4j.properties
 
 # Group=Internal

Modified: 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
     2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/wizard.properties
     2014-01-22 21:55:49 UTC (rev 6482)
@@ -65,9 +65,9 @@
   </property>
 
   <property>
-    <entry key="service.ma.conf_file" 
required="true">/etc/${artifactId}/sql-database_TEST.xml</entry>
+    <entry key="service.ma.conf_file" 
required="true">/etc/${artifactId}/exist-sqlma-db.xml</entry>
     <Comment>Enter the full path of the metadata configuration 
file:</Comment>
-    <ProposedValue>/etc/${artifactId}/sql-database_TEST.xml</ProposedValue>
+    <ProposedValue>/etc/${artifactId}/exist-sqlma-db.xml</ProposedValue>
     <Group order="6">eXist</Group>
   </property>
 

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db-L2status_TEST.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database-L2status_TEST.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db-L2status_TEST.xml
                              (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db-L2status_TEST.xml
      2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,229 @@
+<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+            xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+            xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+            xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+            xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>
+
+
+
+    <nmwg:metadata id="md1">
+        <nmwg:subject id="sub-DFN-LRZ">
+            <nmwgtopo3:node id="DFN-LRZ">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <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:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md2">
+        <nmwg:subject id="sub-DFN-MUE">
+            <nmwgtopo3:node id="DFN-MUE">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+                <nmwgtopo3:country>Germany</nmwgtopo3:country>
+                <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+                <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md3">
+        <nmwg:subject id="sub-SURFnet-MUE">
+            <nmwgtopo3:node id="SURFnet-MUE">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
+                <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
+                <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
+                <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md4">
+        <nmwg:subject id="sub-PSNC-PL">
+            <nmwgtopo3:node id="PSNC-PL">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+                <nmwgtopo3:country>Poland</nmwgtopo3:country>
+                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md5">
+        <nmwg:subject id="sub-PSNC-PL-2">
+            <nmwgtopo3:node id="PSNC-PL-2">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
+                <nmwgtopo3:country>Poland</nmwgtopo3:country>
+                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+
+                <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
+                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
+                <nmtl2:type>NREN_Link</nmtl2:type>
+
+                <nmwgtopo3:node nodeIdRef="DFN-LRZ"> 
+                    <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+
+                <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
+                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
+                <nmtl2:type>ID_Link</nmtl2:type>
+
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+                <nmwgtopo3:node nodeIdRef="SURFnet-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+
+                <nmtl2:name 
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+                <nmtl2:globalName 
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+                <nmtl2:type>ID_Link</nmtl2:type>
+
+                <nmwgtopo3:node nodeIdRef="PSNC-PL"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+    </nmwg:metadata>
+
+
+    <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+
+                <nmtl2:name 
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
+                <nmtl2:globalName 
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
+                <nmtl2:type>ID_Link</nmtl2:type>
+
+                <nmwgtopo3:node nodeIdRef="PSNC-PL-2"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
+    </nmwg:metadata>
+
+
+    <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+    <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+    <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+    <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+
+</nmwg:store>
\ No newline at end of file

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_TEST.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_TEST.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_TEST.xml
                               (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_TEST.xml
       2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+    xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+    xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+    xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+    xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+    xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+    xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+    <!-- utilization metadata section -->
+    <nmwg:metadata id="meta1-test">
+        <netutil:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifDescription>test description</nmwgt:ifDescription>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+            </nmwgt:interface>
+        </netutil:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+    <nmwg:data id="data1-test" metadataIdRef="meta1-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <!-- errors metadata section -->
+    <nmwg:metadata id="meta1-errors-test">
+        <errors:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifIndex>2</nmwgt:ifIndex>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000000000</nmwgt:capacity>
+            </nmwgt:interface>
+        </errors:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+    <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta1-errors-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <!-- discards metadata section -->
+    <nmwg:metadata id="meta1-discards-test">
+        <discards:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifIndex>2</nmwgt:ifIndex>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000000000</nmwgt:capacity>
+            </nmwgt:interface>
+        </discards:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+    <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta1-discards-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <!-- L2 status section -->
+    <nmwg:metadata id="md1">
+        <nmwg:subject id="sub-DFN-LRZ">
+            <nmwgtopo3:node id="DFN-LRZ">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <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:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+    <nmwg:metadata id="md2">
+        <nmwg:subject id="sub-DFN-MUE">
+            <nmwgtopo3:node id="DFN-MUE">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+                <nmwgtopo3:country>Germany</nmwgtopo3:country>
+                <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+                <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+    <nmwg:metadata id="md3">
+        <nmwg:subject id="sub-SURFnet-MUE">
+            <nmwgtopo3:node id="SURFnet-MUE">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
+                <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
+                <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
+                <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+    <nmwg:metadata id="md4">
+        <nmwg:subject id="sub-PSNC-PL">
+            <nmwgtopo3:node id="PSNC-PL">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
+                <nmwgtopo3:country>Poland</nmwgtopo3:country>
+                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+    <nmwg:metadata id="md5">
+        <nmwg:subject id="sub-PSNC-PL-2">
+            <nmwgtopo3:node id="PSNC-PL-2">
+                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+                <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
+                <nmwgtopo3:country>Poland</nmwgtopo3:country>
+                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
+                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
+                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
+                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
+            </nmwgtopo3:node>
+        </nmwg:subject>
+    </nmwg:metadata>
+    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+                <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
+                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
+                <nmtl2:type>NREN_Link</nmtl2:type>
+                <nmwgtopo3:node nodeIdRef="DFN-LRZ"> 
+                    <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
+            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <nmwg:eventType>Path.Status</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+                <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
+                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
+                <nmtl2:type>ID_Link</nmtl2:type>
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+                <nmwgtopo3:node nodeIdRef="SURFnet-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
+            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <nmwg:eventType>Path.Status</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+                <nmtl2:name 
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
+                <nmtl2:globalName 
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
+                <nmtl2:type>ID_Link</nmtl2:type>
+                <nmwgtopo3:node nodeIdRef="PSNC-PL"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
+            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <nmwg:eventType>Path.Status</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
+        <nmwg:subject id="sub1">
+            <nmtl2:link>
+                <nmtl2:name 
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
+                <nmtl2:globalName 
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
+                <nmtl2:type>ID_Link</nmtl2:type>
+                <nmwgtopo3:node nodeIdRef="PSNC-PL-2"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
+                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+                </nmwgtopo3:node>
+            </nmtl2:link>
+        </nmwg:subject>
+        <nmwg:parameters>
+            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
+            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+        <nmwg:eventType>Path.Status</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+    <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+    <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+    <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <!-- iperf/bwctl metadata section -->
+    <nmwg:metadata id="meta1-iperf-test">
+        <iperf:subject id="subject-1">
+            <nmwgt:endPointPair 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+                <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+                <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+            </nmwgt:endPointPair>
+        </iperf:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+    <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta1-iperf-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <nmwg:metadata id="meta2-iperf-test">
+        <iperf:subject id="subject-1">
+            <nmwgt:endPointPair 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+                <nmwgt:src type="ipv4" value="150.254.0.1" port="5422"/>
+                <nmwgt:dst type="ipv4" value="150.254.0.2" port="5422"/>
+            </nmwgt:endPointPair>
+        </iperf:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+    <nmwg:data id="data2-iperf-test" metadataIdRef="meta2-iperf-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta2-iperf-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <!-- ping metadata section -->
+    <nmwg:metadata id="ping-meta1">
+        <ping:subject id="sub1">
+            <nmwgt:endPointPair>
+                <nmwgt:src type="ipv4" value="222.22.22.22"/>
+                <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+            </nmwgt:endPointPair>
+        </ping:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+    <!-- owamp metadata section -->
+    <nmwg:metadata id="owamp-meta1">
+        <owamp:subject id="sub1">
+            <nmwgt:endPointPair>
+                <nmwgt:src type="ipv4" value="222.22.22.22" />
+                <nmwgt:dst type="ipv4" value="111.11.11.11" />
+            </nmwgt:endPointPair>
+        </owamp:subject>
+        <owamp:parameters id="param1">
+            <nmwg:parameter name="direction">to</nmwg:parameter>
+            <nmwg:parameter name="count" value="10"/>
+            <nmwg:parameter name="size" value="10"/>
+        </owamp:parameters>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">owamp-meta1</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+   <!-- owamp metadata summary (aggregated) data -->
+    <nmwg:metadata id="owamp-meta2">
+        <owamp:subject id="sub1">
+            <nmwgt:endPointPair>
+                <nmwgt:src type="ipv4" value="222.22.22.21" />
+                <nmwgt:dst type="ipv4" value="111.11.11.12" />
+            </nmwgt:endPointPair>
+        </owamp:subject>
+        <owamp:parameters id="param1">
+            <nmwg:parameter name="direction">to</nmwg:parameter>
+            <nmwg:parameter name="count" value="10"/>
+            <nmwg:parameter name="size" value="10"/>
+            <nmwg:parameter name="output">summary</nmwg:parameter>
+        </owamp:parameters>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">owamp-meta2</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+</nmwg:store>
\ No newline at end of file

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-owamp.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-owamp.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-owamp.xml
                         (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-owamp.xml
 2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,57 @@
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+       xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
+       xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+    <!-- owamp metadata section -->
+    <nmwg:metadata id="owamp-meta1">
+        <owamp:subject id="sub1">
+            <nmwgt:endPointPair>
+                <nmwgt:src type="ipv4" value="222.22.22.22" />
+                <nmwgt:dst type="ipv4" value="111.11.11.11" />
+            </nmwgt:endPointPair>
+        </owamp:subject>
+        <owamp:parameters id="param1">
+            <nmwg:parameter name="direction">to</nmwg:parameter>
+            <nmwg:parameter name="count" value="10"/>
+            <nmwg:parameter name="size" value="10"/>
+        </owamp:parameters>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">owamp-meta1</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+   <!-- owamp metadata summary (aggregated) data -->
+    <nmwg:metadata id="owamp-meta2">
+        <owamp:subject id="sub1">
+            <nmwgt:endPointPair>
+                <nmwgt:src type="ipv4" value="222.22.22.21" />
+                <nmwgt:dst type="ipv4" value="111.11.11.12" />
+            </nmwgt:endPointPair>
+        </owamp:subject>
+        <owamp:parameters id="param1">
+            <nmwg:parameter name="direction">to</nmwg:parameter>
+            <nmwg:parameter name="count" value="10"/>
+            <nmwg:parameter name="size" value="10"/>
+            <nmwg:parameter name="output">summary</nmwg:parameter>
+        </owamp:parameters>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+    </nmwg:metadata>
+    <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">owamp-meta2</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+</nmwg:store>
+
+
+

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-ping.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-ping.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-ping.xml
                          (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_clmp-ping.xml
  2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,28 @@
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+            xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+            xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
+            xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+    <nmwg:metadata id="ping-meta1">
+        <ping:subject id="sub1">
+            <nmwgt:endPointPair>
+                <nmwgt:src type="ipv4" value="222.22.22.22"/>
+                <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+            </nmwgt:endPointPair>
+        </ping:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+    </nmwg:metadata>
+
+    <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_discards_TEST.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_discards_TEST.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_discards_TEST.xml
                              (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_discards_TEST.xml
      2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+    xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+    <nmwg:metadata id="meta1-discards-test">
+        <discards:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifIndex>2</nmwgt:ifIndex>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000000000</nmwgt:capacity>
+            </nmwgt:interface>
+        </discards:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+
+
+    <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta1-discards-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_errors_TEST.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_errors_TEST.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_errors_TEST.xml
                                (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_errors_TEST.xml
        2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+    xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+    <nmwg:metadata id="meta1-errors-test">
+        <errors:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifIndex>2</nmwgt:ifIndex>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000000000</nmwgt:capacity>
+            </nmwgt:interface>
+        </errors:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+
+
+    <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta1-errors-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+
+</nmwg:store>
\ No newline at end of file

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_iperf_TEST.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_iperf_TEST.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_iperf_TEST.xml
                         (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_iperf_TEST.xml
 2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+    xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+    xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+    <nmwg:metadata id="meta1-iperf-test">
+        <iperf:subject id="subject-1">
+            <nmwgt:endPointPair 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+                <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
+                <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
+            </nmwgt:endPointPair>
+        </iperf:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+
+    <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
+        <nmwg:key>
+            <nmwg:parameters>
+                <nmwg:parameter 
name="metadataId">meta1-iperf-test</nmwg:parameter>
+                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
+            </nmwg:parameters>
+        </nmwg:key>
+    </nmwg:data>
+
+</nmwg:store>
\ No newline at end of file

Copied: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_utilization_TEST.xml
 (from rev 6481, 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_utilization_TEST.xml)
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_utilization_TEST.xml
                           (rev 0)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/exist-sqlma-db_utilization_TEST.xml
   2014-01-22 21:55:49 UTC (rev 6482)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+            xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+            xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+            
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+            xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
+            xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+            xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+            xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
+
+
+
+    <nmwg:metadata id="meta1-test">
+        <netutil:subject id="subj1">
+            <nmwgt:interface>
+                <nmwgt:hostName>test-hostName</nmwgt:hostName>
+                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+                <nmwgt:ifName>test-0</nmwgt:ifName>
+                <nmwgt:ifDescription>test description</nmwgt:ifDescription>
+                <nmwgt:direction>in</nmwgt:direction>
+                <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+            </nmwgt:interface>
+        </netutil:subject>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+        <nmwg:parameters id="params1">
+            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
+        </nmwg:parameters>
+    </nmwg:metadata>
+
+
+    <nmwg:data id="data1-test" metadataIdRef="meta1-test">
+      <nmwg:key>
+        <nmwg:parameters>
+          <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
+          <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
+          <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+        </nmwg:parameters>
+      </nmwg:key>
+    </nmwg:data>
+
+
+
+</nmwg:store>
\ No newline at end of file

Modified: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/log4j.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/log4j.properties
      2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/log4j.properties
      2014-01-22 21:55:49 UTC (rev 6482)
@@ -4,7 +4,7 @@
 
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 log4j.appender.psRootAppender.MaxBackupIndex=11
-log4j.appender.psRootAppender.File=logs/perfsonar_debug_sqlma.log
+log4j.appender.psRootAppender.File=logs/sqlma-debug.log
 log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.psRootAppender.MaxFileSize=10MB

Modified: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
    2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/service.properties
    2014-01-22 21:55:49 UTC (rev 6482)
@@ -35,7 +35,7 @@
 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.
+# Description=The path to the log4j.properties configuration file.
 service.log.log4j.config=/perfsonar/conf/log4j.properties
 
 # Group=Internal

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database-L2status_TEST.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database-L2status_TEST.xml
        2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database-L2status_TEST.xml
        2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,229 +0,0 @@
-<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-            xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-            xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-            xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
-            xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>
-
-
-
-    <nmwg:metadata id="md1">
-        <nmwg:subject id="sub-DFN-LRZ">
-            <nmwgtopo3:node id="DFN-LRZ">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <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:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md2">
-        <nmwg:subject id="sub-DFN-MUE">
-            <nmwgtopo3:node id="DFN-MUE">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
-                <nmwgtopo3:country>Germany</nmwgtopo3:country>
-                <nmwgtopo3:city>Muenster</nmwgtopo3:city>
-                <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md3">
-        <nmwg:subject id="sub-SURFnet-MUE">
-            <nmwgtopo3:node id="SURFnet-MUE">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
-                <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
-                <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
-                <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md4">
-        <nmwg:subject id="sub-PSNC-PL">
-            <nmwgtopo3:node id="PSNC-PL">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
-                <nmwgtopo3:country>Poland</nmwgtopo3:country>
-                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
-                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md5">
-        <nmwg:subject id="sub-PSNC-PL-2">
-            <nmwgtopo3:node id="PSNC-PL-2">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
-                <nmwgtopo3:country>Poland</nmwgtopo3:country>
-                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
-                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-
-                <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
-                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
-                <nmtl2:type>NREN_Link</nmtl2:type>
-
-                <nmwgtopo3:node nodeIdRef="DFN-LRZ"> 
-                    <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-
-                <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
-                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
-                <nmtl2:type>ID_Link</nmtl2:type>
-
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-                <nmwgtopo3:node nodeIdRef="SURFnet-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-
-                <nmtl2:name 
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
-                <nmtl2:globalName 
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
-                <nmtl2:type>ID_Link</nmtl2:type>
-
-                <nmwgtopo3:node nodeIdRef="PSNC-PL"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
-    </nmwg:metadata>
-
-
-    <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-
-                <nmtl2:name 
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
-                <nmtl2:globalName 
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
-                <nmtl2:type>ID_Link</nmtl2:type>
-
-                <nmwgtopo3:node nodeIdRef="PSNC-PL-2"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter>
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <!-- <nmwg:eventType>Path.Status</nmwg:eventType> -->
-    </nmwg:metadata>
-
-
-    <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-    <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-    <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-    <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_TEST.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_TEST.xml
 2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_TEST.xml
 2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-    xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
-    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
-    xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
-    xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
-    xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
-    xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
-    xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
-    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-    <!-- utilization metadata section -->
-    <nmwg:metadata id="meta1-test">
-        <netutil:subject id="subj1">
-            <nmwgt:interface>
-                <nmwgt:hostName>test-hostName</nmwgt:hostName>
-                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
-                <nmwgt:ifName>test-0</nmwgt:ifName>
-                <nmwgt:ifDescription>test description</nmwgt:ifDescription>
-                <nmwgt:direction>in</nmwgt:direction>
-                <nmwgt:capacity>1000BaseT</nmwgt:capacity>
-            </nmwgt:interface>
-        </netutil:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-    <nmwg:data id="data1-test" metadataIdRef="meta1-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <!-- errors metadata section -->
-    <nmwg:metadata id="meta1-errors-test">
-        <errors:subject id="subj1">
-            <nmwgt:interface>
-                <nmwgt:hostName>test-hostName</nmwgt:hostName>
-                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
-                <nmwgt:ifName>test-0</nmwgt:ifName>
-                <nmwgt:ifIndex>2</nmwgt:ifIndex>
-                <nmwgt:direction>in</nmwgt:direction>
-                <nmwgt:capacity>1000000000</nmwgt:capacity>
-            </nmwgt:interface>
-        </errors:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-    <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta1-errors-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <!-- discards metadata section -->
-    <nmwg:metadata id="meta1-discards-test">
-        <discards:subject id="subj1">
-            <nmwgt:interface>
-                <nmwgt:hostName>test-hostName</nmwgt:hostName>
-                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
-                <nmwgt:ifName>test-0</nmwgt:ifName>
-                <nmwgt:ifIndex>2</nmwgt:ifIndex>
-                <nmwgt:direction>in</nmwgt:direction>
-                <nmwgt:capacity>1000000000</nmwgt:capacity>
-            </nmwgt:interface>
-        </discards:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-    <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta1-discards-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <!-- L2 status section -->
-    <nmwg:metadata id="md1">
-        <nmwg:subject id="sub-DFN-LRZ">
-            <nmwgtopo3:node id="DFN-LRZ">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <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:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-    <nmwg:metadata id="md2">
-        <nmwg:subject id="sub-DFN-MUE">
-            <nmwgtopo3:node id="DFN-MUE">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
-                <nmwgtopo3:country>Germany</nmwgtopo3:country>
-                <nmwgtopo3:city>Muenster</nmwgtopo3:city>
-                <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-    <nmwg:metadata id="md3">
-        <nmwg:subject id="sub-SURFnet-MUE">
-            <nmwgtopo3:node id="SURFnet-MUE">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">SURFnet-MUE</nmwgtopo3:name>
-                <nmwgtopo3:country>Netherlands</nmwgtopo3:country>
-                <nmwgtopo3:city>Amsterdam</nmwgtopo3:city>
-                <nmwgtopo3:institution>Surfnet</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-    <nmwg:metadata id="md4">
-        <nmwg:subject id="sub-PSNC-PL">
-            <nmwgtopo3:node id="PSNC-PL">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">PSNC-PL</nmwgtopo3:name>
-                <nmwgtopo3:country>Poland</nmwgtopo3:country>
-                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
-                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-    <nmwg:metadata id="md5">
-        <nmwg:subject id="sub-PSNC-PL-2">
-            <nmwgtopo3:node id="PSNC-PL-2">
-                <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
-                <nmwgtopo3:name type="logical">PSNC-PL-2</nmwgtopo3:name>
-                <nmwgtopo3:country>Poland</nmwgtopo3:country>
-                <nmwgtopo3:city>Poznan</nmwgtopo3:city>
-                <nmwgtopo3:institution>PSNC</nmwgtopo3:institution>
-                <nmwgtopo3:latitude>0</nmwgtopo3:latitude>
-                <nmwgtopo3:longitude>0</nmwgtopo3:longitude>
-            </nmwgtopo3:node>
-        </nmwg:subject>
-    </nmwg:metadata>
-    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-                <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
-                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
-                <nmtl2:type>NREN_Link</nmtl2:type>
-                <nmwgtopo3:node nodeIdRef="DFN-LRZ"> 
-                    <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
-            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <nmwg:eventType>Path.Status</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-                <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
-                <nmtl2:globalName 
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
-                <nmtl2:type>ID_Link</nmtl2:type>
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-                <nmwgtopo3:node nodeIdRef="SURFnet-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
-            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <nmwg:eventType>Path.Status</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:metadata id="md-link-PSNC-DFN-MUE-003">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-                <nmtl2:name 
type="logical">PSNC-DFN-MUE-Link-1001</nmtl2:name>
-                <nmtl2:globalName 
type="logical">PSNC-DFN-MUE-003</nmtl2:globalName>
-                <nmtl2:type>ID_Link</nmtl2:type>
-                <nmwgtopo3:node nodeIdRef="PSNC-PL"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
-            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <nmwg:eventType>Path.Status</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:metadata id="md-link-PSNC-2-DFN-MUE-004">
-        <nmwg:subject id="sub1">
-            <nmtl2:link>
-                <nmtl2:name 
type="logical">PSNC-2-DFN-MUE-Link-1002</nmtl2:name>
-                <nmtl2:globalName 
type="logical">PSNC-2-DFN-MUE-004</nmtl2:globalName>
-                <nmtl2:type>ID_Link</nmtl2:type>
-                <nmwgtopo3:node nodeIdRef="PSNC-PL-2"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-                <nmwgtopo3:node nodeIdRef="DFN-MUE"> 
-                    <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
-                </nmwgtopo3:node>
-            </nmtl2:link>
-        </nmwg:subject>
-        <nmwg:parameters>
-            <!-- supportedEventType parameter can replace the eventType 
'Path.Status' -->
-            <!-- <nmwg:parameter 
name="supportedEventType">Path.Status</nmwg:parameter> -->
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-        <nmwg:eventType>Path.Status</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-    <nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-    <nmwg:data id="d3" metadataIdRef="md-link-PSNC-DFN-MUE-003">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-    <nmwg:data id="d4" metadataIdRef="md-link-PSNC-2-DFN-MUE-004">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <!-- iperf/bwctl metadata section -->
-    <nmwg:metadata id="meta1-iperf-test">
-        <iperf:subject id="subject-1">
-            <nmwgt:endPointPair 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-                <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
-                <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
-            </nmwgt:endPointPair>
-        </iperf:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-    <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta1-iperf-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <nmwg:metadata id="meta2-iperf-test">
-        <iperf:subject id="subject-1">
-            <nmwgt:endPointPair 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-                <nmwgt:src type="ipv4" value="150.254.0.1" port="5422"/>
-                <nmwgt:dst type="ipv4" value="150.254.0.2" port="5422"/>
-            </nmwgt:endPointPair>
-        </iperf:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-    <nmwg:data id="data2-iperf-test" metadataIdRef="meta2-iperf-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta2-iperf-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <!-- ping metadata section -->
-    <nmwg:metadata id="ping-meta1">
-        <ping:subject id="sub1">
-            <nmwgt:endPointPair>
-                <nmwgt:src type="ipv4" value="222.22.22.22"/>
-                <nmwgt:dst type="ipv4" value="111.11.11.11"/>
-            </nmwgt:endPointPair>
-        </ping:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-    <!-- owamp metadata section -->
-    <nmwg:metadata id="owamp-meta1">
-        <owamp:subject id="sub1">
-            <nmwgt:endPointPair>
-                <nmwgt:src type="ipv4" value="222.22.22.22" />
-                <nmwgt:dst type="ipv4" value="111.11.11.11" />
-            </nmwgt:endPointPair>
-        </owamp:subject>
-        <owamp:parameters id="param1">
-            <nmwg:parameter name="direction">to</nmwg:parameter>
-            <nmwg:parameter name="count" value="10"/>
-            <nmwg:parameter name="size" value="10"/>
-        </owamp:parameters>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">owamp-meta1</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-   <!-- owamp metadata summary (aggregated) data -->
-    <nmwg:metadata id="owamp-meta2">
-        <owamp:subject id="sub1">
-            <nmwgt:endPointPair>
-                <nmwgt:src type="ipv4" value="222.22.22.21" />
-                <nmwgt:dst type="ipv4" value="111.11.11.12" />
-            </nmwgt:endPointPair>
-        </owamp:subject>
-        <owamp:parameters id="param1">
-            <nmwg:parameter name="direction">to</nmwg:parameter>
-            <nmwg:parameter name="count" value="10"/>
-            <nmwg:parameter name="size" value="10"/>
-            <nmwg:parameter name="output">summary</nmwg:parameter>
-        </owamp:parameters>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">owamp-meta2</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-</nmwg:store>
\ No newline at end of file

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-owamp.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-owamp.xml
   2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-owamp.xml
   2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,57 +0,0 @@
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-       xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
-       xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-    <!-- owamp metadata section -->
-    <nmwg:metadata id="owamp-meta1">
-        <owamp:subject id="sub1">
-            <nmwgt:endPointPair>
-                <nmwgt:src type="ipv4" value="222.22.22.22" />
-                <nmwgt:dst type="ipv4" value="111.11.11.11" />
-            </nmwgt:endPointPair>
-        </owamp:subject>
-        <owamp:parameters id="param1">
-            <nmwg:parameter name="direction">to</nmwg:parameter>
-            <nmwg:parameter name="count" value="10"/>
-            <nmwg:parameter name="size" value="10"/>
-        </owamp:parameters>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:data id="data1-owamp" metadataIdRef="owamp-meta1">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">owamp-meta1</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-owamp.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-   <!-- owamp metadata summary (aggregated) data -->
-    <nmwg:metadata id="owamp-meta2">
-        <owamp:subject id="sub1">
-            <nmwgt:endPointPair>
-                <nmwgt:src type="ipv4" value="222.22.22.21" />
-                <nmwgt:dst type="ipv4" value="111.11.11.12" />
-            </nmwgt:endPointPair>
-        </owamp:subject>
-        <owamp:parameters id="param1">
-            <nmwg:parameter name="direction">to</nmwg:parameter>
-            <nmwg:parameter name="count" value="10"/>
-            <nmwg:parameter name="size" value="10"/>
-            <nmwg:parameter name="output">summary</nmwg:parameter>
-        </owamp:parameters>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    </nmwg:metadata>
-    <nmwg:data id="data2-owamp" metadataIdRef="owamp-meta2">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">owamp-meta2</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-owamp-aggregation.xml</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-</nmwg:store>
-
-
-

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-ping.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-ping.xml
    2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_clmp-ping.xml
    2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,28 +0,0 @@
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-            xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-            xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
-            xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-    <nmwg:metadata id="ping-meta1">
-        <ping:subject id="sub1">
-            <nmwgt:endPointPair>
-                <nmwgt:src type="ipv4" value="222.22.22.22"/>
-                <nmwgt:dst type="ipv4" value="111.11.11.11"/>
-            </nmwgt:endPointPair>
-        </ping:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
-    </nmwg:metadata>
-
-    <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
-                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_discards_TEST.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_discards_TEST.xml
        2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_discards_TEST.xml
        2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
-    xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
-    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-    <nmwg:metadata id="meta1-discards-test">
-        <discards:subject id="subj1">
-            <nmwgt:interface>
-                <nmwgt:hostName>test-hostName</nmwgt:hostName>
-                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
-                <nmwgt:ifName>test-0</nmwgt:ifName>
-                <nmwgt:ifIndex>2</nmwgt:ifIndex>
-                <nmwgt:direction>in</nmwgt:direction>
-                <nmwgt:capacity>1000000000</nmwgt:capacity>
-            </nmwgt:interface>
-        </discards:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-
-
-    <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta1-discards-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
-                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_errors_TEST.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_errors_TEST.xml
  2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_errors_TEST.xml
  2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-    xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-    xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-    xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
-    xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
-    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-    <nmwg:metadata id="meta1-errors-test">
-        <errors:subject id="subj1">
-            <nmwgt:interface>
-                <nmwgt:hostName>test-hostName</nmwgt:hostName>
-                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
-                <nmwgt:ifName>test-0</nmwgt:ifName>
-                <nmwgt:ifIndex>2</nmwgt:ifIndex>
-                <nmwgt:direction>in</nmwgt:direction>
-                <nmwgt:capacity>1000000000</nmwgt:capacity>
-            </nmwgt:interface>
-        </errors:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-
-
-    <nmwg:data id="data1-errors-test" metadataIdRef="meta1-errors-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta1-errors-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-errors.xml</nmwg:parameter>
-                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-
-</nmwg:store>
\ No newline at end of file

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_iperf_TEST.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_iperf_TEST.xml
   2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_iperf_TEST.xml
   2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-    xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-    xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
-    xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-    <nmwg:metadata id="meta1-iperf-test">
-        <iperf:subject id="subject-1">
-            <nmwgt:endPointPair 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-                <nmwgt:src type="ipv4" value="198.32.8.170" port="5433"/>
-                <nmwgt:dst type="ipv4" value="198.32.8.174" port="5433"/>
-            </nmwgt:endPointPair>
-        </iperf:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-
-    <nmwg:data id="data1-iperf-test" metadataIdRef="meta1-iperf-test">
-        <nmwg:key>
-            <nmwg:parameters>
-                <nmwg:parameter 
name="metadataId">meta1-iperf-test</nmwg:parameter>
-                <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-iperf.xml</nmwg:parameter>
-                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:parameter>
-            </nmwg:parameters>
-        </nmwg:key>
-    </nmwg:data>
-
-</nmwg:store>
\ No newline at end of file

Deleted: 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_utilization_TEST.xml
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_utilization_TEST.xml
     2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/sql-database_utilization_TEST.xml
     2014-01-22 21:55:49 UTC (rev 6482)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-            xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-            xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-            
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
-            xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";
-            xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
-            xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
-            xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
-
-
-
-    <nmwg:metadata id="meta1-test">
-        <netutil:subject id="subj1">
-            <nmwgt:interface>
-                <nmwgt:hostName>test-hostName</nmwgt:hostName>
-                <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
-                <nmwgt:ifName>test-0</nmwgt:ifName>
-                <nmwgt:ifDescription>test description</nmwgt:ifDescription>
-                <nmwgt:direction>in</nmwgt:direction>
-                <nmwgt:capacity>1000BaseT</nmwgt:capacity>
-            </nmwgt:interface>
-        </netutil:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
-        <nmwg:parameters id="params1">
-            <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
-        </nmwg:parameters>
-    </nmwg:metadata>
-
-
-    <nmwg:data id="data1-test" metadataIdRef="meta1-test">
-      <nmwg:key>
-        <nmwg:parameters>
-          <nmwg:parameter name="metadataId">meta1-test</nmwg:parameter>
-          <nmwg:parameter 
name="ibatisConfig">ibatis-SqlMapConfig-utilization.xml</nmwg:parameter>
-          <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
-        </nmwg:parameters>
-      </nmwg:key>
-    </nmwg:data>
-
-
-
-</nmwg:store>
\ No newline at end of file

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
     2014-01-21 16:51:35 UTC (rev 6481)
+++ 
trunk/perfsonar-java-sql-ma/src/test/resources/perfsonar/conf/wizard.properties
     2014-01-22 21:55:49 UTC (rev 6482)
@@ -65,9 +65,9 @@
   </property>
 
   <property>
-    <entry key="service.ma.conf_file" 
required="true">/etc/${artifactId}/sql-database_TEST.xml</entry>
+    <entry key="service.ma.conf_file" 
required="true">/etc/${artifactId}/exist-sqlma-db_TEST.xml</entry>
     <Comment>Enter the full path of the metadata configuration 
file:</Comment>
-    
<ProposedValue>perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/sql-database_TEST.xml</ProposedValue>
+    
<ProposedValue>perfsonar-java-sql-ma/src/main/resources/perfsonar/conf/exist-sqlma-db_TEST.xml</ProposedValue>
     <Group order="6">eXist</Group>
   </property>