perfsonar development work

Author: fernandes
Date: 2008-01-30 20:28:47 -0500 (Wed, 30 Jan 2008)
New Revision: 3281

Modified:
   trunk/geant2_java-rrd-ma/
   
trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:
Modifications for SQL-MA to support OWAMP, BWCTL and Ping namespaces.
SQL-MA now has the MeasurementArchiveStoreKeyRequest functionality which 
allows dynamic addition of metadatas to the metadata configuration database.
Table creation statements for mysql have been added but are commented out.
Ant targets weren't modified yet.


Property changes on: trunk/geant2_java-rrd-ma
___________________________________________________________________
Name: svn:ignore
   + .project


Modified: 
trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
 2008-01-30 13:49:29 UTC (rev 3280)
+++ 
trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
 2008-01-31 01:28:47 UTC (rev 3281)
@@ -164,7 +164,7 @@
 
     }
 
-
+    
     /**
      *  Method to accept requests for action. It implements 
      *  the method definition in ServiceEngine Interface. 
@@ -235,6 +235,38 @@
                 response = storeData(request, true);
             }
 
+        } else if (actionType.equals(ActionType.STORE_KEY)) {
+
+            // handle STORE_KEY
+
+            String storeStatus =
+                configuration.getProperty("service.ma.xmldb.db_store");
+            String dbStatus =
+                configuration.getProperty("component.ma.xmldb.db_status");
+
+            if (!storeStatus.trim().equalsIgnoreCase("on")) {
+
+                response = storeData(request, false);
+
+                logger.debug(
+                    "RRDTypeMAServiceEngine.takeAction: "
+                    + "writing data into MA is switched off "
+                    + "(see 'service.ma.xmldb.db_store' property)");
+
+            } else if (!dbStatus.trim().equalsIgnoreCase("on")) {
+
+                response = storeData(request, false);
+
+                logger.debug(
+                    "RRDTypeMAServiceEngine.takeAction: "
+                    + "xmldb is not setup in the configuration "
+                    + "(see 'component.ma.xmldb.db_status' property)");
+
+            } else {
+
+                response = storeKey(request);
+            }
+
         } else if (actionType.equals(ActionType.ECHO)) {
 
             response = getEcho(request);
@@ -886,7 +918,26 @@
     }
 
 
+    /**
+     *  Method used by SQL-MA to store dynamic metadata keys.
+     *
+     *  @throws PerfSONARException
+     */
+    protected Message storeKey(Message request)
+               throws PerfSONARException{
+       
+       Message response = new Message();
 
+        PerfSONARException pex =
+            new PerfSONARException(
+                    "error.request",
+                    "This functionality isn't implemented in RRD-MA yet.");
+
+        ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+        return response;
+    }
+
     //---------------------------------- private methods