perfsonar development work

Author: roman
Date: 2008-08-20 10:36:41 -0400 (Wed, 20 Aug 2008)
New Revision: 4364

Added:
   trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml
   trunk/geant2-java-sql-ma/conf/ibatis-SqlMapConfig-L2-status.xml
Modified:
   trunk/geant2-java-sql-ma/conf/eventType-map.xml
   trunk/geant2-java-sql-ma/conf/eventType-rules.xml
   trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql
   trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
Log:
small updates for L2 status
- one table table for domain and interdomain links
- ibatisConfig parameters set up in eventType config file (no need to put 
such parameter in store request)



Modified: trunk/geant2-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-map.xml     2008-08-19 13:43:31 
UTC (rev 4363)
+++ trunk/geant2-java-sql-ma/conf/eventType-map.xml     2008-08-20 14:36:41 
UTC (rev 4364)
@@ -34,6 +34,7 @@
         
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+        <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
     </eventType>
 
     <eventType>
@@ -42,6 +43,7 @@
         
<metadataKeyGenerator>org.perfsonar.service.measurementArchive.metadataConfig.keyGenerator.L2PathStatusKeyGenerator</metadataKeyGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.L2PathStatusStoreRequestProcess</storeRequestProcess>
+        <ibatisConfig>ibatis-SqlMapConfig-L2-status.xml</ibatisConfig>
     </eventType>
 
     <eventType>

Modified: trunk/geant2-java-sql-ma/conf/eventType-rules.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-rules.xml   2008-08-19 13:43:31 
UTC (rev 4363)
+++ trunk/geant2-java-sql-ma/conf/eventType-rules.xml   2008-08-20 14:36:41 
UTC (rev 4364)
@@ -26,6 +26,8 @@
             paramcount="0" />
         <call-method-rule pattern="baseChainingMerger" 
methodname="setBaseChainingMerger" 
             paramcount="0" />
+        <call-method-rule pattern="ibatisConfig" 
methodname="setIbatisConfig" 
+            paramcount="0" />
         <set-next-rule methodname="setEventType" />
     </pattern>
 

Added: trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml


Property changes on: trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2-java-sql-ma/conf/ibatis-SqlMapConfig-L2-status.xml


Property changes on: 
trunk/geant2-java-sql-ma/conf/ibatis-SqlMapConfig-L2-status.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql
===================================================================
--- trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql      2008-08-19 
13:43:31 UTC (rev 4363)
+++ trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql      2008-08-20 
14:36:41 UTC (rev 4364)
@@ -34,9 +34,13 @@
 
 
 DROP TABLE
-       interdomain_link;
+    perfsonar_links;
 
 
+DROP TABLE
+    interdomain_link;
+
+
 #DROP TABLE
 #    clmp_owamp;
 

Modified: trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql       2008-08-19 
13:43:31 UTC (rev 4363)
+++ trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql       2008-08-20 
14:36:41 UTC (rev 4364)
@@ -78,6 +78,16 @@
          comments VARCHAR(255));
 
 
+CREATE TABLE
+    perfsonar_links
+        (id VARCHAR(255) NOT NULL,
+         time TIMESTAMP DEFAULT NOW(),
+         status_oper VARCHAR(255) DEFAULT 'UNKNOWN',
+         status_admin VARCHAR(255) DEFAULT 'UNKNOWN',
+         alarm_id_set VARCHAR(255),
+         comments VARCHAR(255));
+
+
 ############### Create table for OWAMP data ################
 #
 #CREATE TABLE