perfsonar development work

Author: roman
Date: 2006-06-27 09:40:21 -0400 (Tue, 27 Jun 2006)
New Revision: 1338

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/MetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
Log:
- some logs have been commented
- some names have been changed

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/MetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/MetadataConfigurationStorageManager.java
     2006-06-27 13:18:43 UTC (rev 1337)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/MetadataConfigurationStorageManager.java
     2006-06-27 13:40:21 UTC (rev 1338)
@@ -198,8 +198,8 @@
                             + "\n</xu:append>\n"
                             + "</xu:modifications>";
 
-        logger.debug("RRDConfigurationStorageManagerdata.store: dataXUpdate: 
"
-                + dataXUpdate);
+        //logger.debug("RRDConfigurationStorageManagerdata.store: 
dataXUpdate: "
+        //        + dataXUpdate);
 
 
 
@@ -234,8 +234,8 @@
                             + "\n</xu:append>\n"
                             + "</xu:modifications>";
 
-        logger.debug("RRDConfigurationStorageManagerdata.store: metaXUpdate: 
"
-                + metaXUpdate);
+        //logger.debug("RRDConfigurationStorageManagerdata.store: 
metaXUpdate: "
+        //        + metaXUpdate);
 
 
         this.existDbXmlStorageManager.store(metaXUpdate);
@@ -267,8 +267,8 @@
             }
         }
 
-        logger.debug(
-            "MetadataConfigurationStorageManager.getData: data query: " + 
xpathQuery);
+        //logger.debug(
+        //    "MetadataConfigurationStorageManager.getData: data query: " + 
xpathQuery);
 
         Object object = this.existDbXmlStorageManager.fetch(xpathQuery);
         String[] xmlResults = (String[]) object;

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-27 13:18:43 UTC (rev 1337)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-27 13:40:21 UTC (rev 1338)
@@ -80,9 +80,9 @@
 
 
     /**
-     *  This object provides access to rrd configuration file.
+     *  This object provides access to metadata configuration
      */
-    protected NMWGStorageManager config = null;
+    protected NMWGStorageManager metadataConfig = null;
 
 
 
@@ -117,12 +117,12 @@
 
         if (dbStatus.trim().equalsIgnoreCase("on")) {
             // xmldb is present
-            config = new MetadataConfigurationStorageManager();
+            metadataConfig = new MetadataConfigurationStorageManager();
         } else {
             // xmldb is not present
-            config = new SimpleMetadataConfigurationStorageManager();
+            metadataConfig = new SimpleMetadataConfigurationStorageManager();
         }
-        config.initStorage(null);
+        metadataConfig.initStorage(null);
 
     }
 
@@ -280,7 +280,7 @@
             Map metadataMap = request.getMetadataMap();
             Metadata metadata = (Metadata) 
metadataMap.get(data.getMetadataIdRef());
 
-            _getKey(metadata, null, metadataMap, message, config);
+            _getKey(metadata, null, metadataMap, message, metadataConfig);
 
             messageVector.add(message);
 
@@ -334,7 +334,7 @@
                          Data data,
                          Map metadataMap,
                          Message message,
-                         NMWGStorageManager config)
+                         NMWGStorageManager metadataConfig)
         throws SystemException, RequestException, DataFormatException {
 
 
@@ -347,7 +347,7 @@
                 Message query = new Message();
                 query.addChild(metadata);
 
-                Message msg = config.fetch(query);
+                Message msg = metadataConfig.fetch(query);
 
                 for (Object m : msg.getMetadataMap().values())
                     message.addChild((Metadata)m);
@@ -361,7 +361,7 @@
                 String metadataIdRef = 
metadata.getSubject().getMetadataIdRef();
                 Metadata m = (Metadata) metadataMap.get(metadataIdRef);
 
-                _getKey(m, null, metadataMap, message, config);
+                _getKey(m, null, metadataMap, message, metadataConfig);
 
                 for (Object d : message.getDataMap().values()) {
 
@@ -564,7 +564,7 @@
             
             Message resp = null;
             try {
-               resp = config.fetch(query);
+               resp = metadataConfig.fetch(query);
             } catch (SystemException sex) {
                if 
(sex.getResultCode().equals("warning.ma.metadata_configuration"))
                        resp = new Message();
@@ -676,10 +676,10 @@
                 configMessage.addChild(dk);
 
                 //logger.debug("RRDTypeMAServiceEngine.getStoreKey: "
-                //    + "rrd config message: "
+                //    + "rrd metadataConfig message: "
                 //    + configMessage.toString());
 
-                config.store(configMessage);
+                metadataConfig.store(configMessage);
 
                 // --
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
    2006-06-27 13:18:43 UTC (rev 1337)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
    2006-06-27 13:40:21 UTC (rev 1338)
@@ -54,8 +54,8 @@
         super();
         serviceEngineType = "service.MeasurementArchive.SQLType";
 
-        config = new SQLConfigurationStorageManager();
-        ((AuxiliaryComponent) config).initComponent();
+        metadataConfig = new SQLConfigurationStorageManager();
+        metadataConfig.initStorage(null);
 
     }
 
@@ -222,7 +222,7 @@
 
             Message query = new Message();
             query.addChild(metadata);
-            Message resp = config.fetch(query);
+            Message resp = metadataConfig.fetch(query);
 
             if (resp.getDataMap().size() > 0) {
 
@@ -286,10 +286,10 @@
                 dk.setMetadataIdRef(_metadata.getId());
                 configMessage.addChild(dk);
 
-                logger.debug("SQLTypeMAServiceEngine.getStoreKey: config 
message: "
+                logger.debug("SQLTypeMAServiceEngine.getStoreKey: 
metadataConfig message: "
                             + configMessage.toString());
 
-                config.store(configMessage);
+                metadataConfig.store(configMessage);
 
             }