perfsonar development work

Author: roman
Date: 2006-06-27 08:20:53 -0400 (Tue, 27 Jun 2006)
New Revision: 1335

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDConfigurationStorageManagerTester.java
Log:
SimpleRRDConfigurationStorageManager and RRDConfigurationStorageManager do 
not implement AuxiliaryComponent interface any more.

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
  2006-06-27 11:02:22 UTC (rev 1334)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
  2006-06-27 12:20:53 UTC (rev 1335)
@@ -5,7 +5,6 @@
 package org.perfsonar.service.measurementArchive.rrdStorageManager;
 
 
-import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
@@ -31,8 +30,7 @@
  *
  *  @author romradz
  */
-public class RRDConfigurationStorageManager
-    implements NMWGStorageManager, AuxiliaryComponent {
+public class RRDConfigurationStorageManager implements NMWGStorageManager {
 
 
 
@@ -40,8 +38,6 @@
 
 
 
-    private String componentName = "ma.conf.xmldb";
-
     private ExistDbXmlStorageManager existDbXmlStorageManager = null;
 
     protected LoggerComponent logger = null;
@@ -58,51 +54,29 @@
 
     public RRDConfigurationStorageManager() throws SystemException {
 
-        this.existDbXmlStorageManager = new ExistDbXmlStorageManager();
-        this.transformations = new Transformations();
 
-    }
-
-
-
-    // -------------------------------------- public methods
-
-
-
-    // --- methods from AuxiliaryComponent interface
-
-
-    public void initComponent() throws SystemException {
-
         logger = (LoggerComponent)
-            AuxiliaryComponentManager.
-                getInstance().
-                    getComponent(ComponentNames.LOGGER);
+               AuxiliaryComponentManager.
+               getInstance().
+                       getComponent(ComponentNames.LOGGER);
 
         configuration = (ConfigurationComponent)
-            AuxiliaryComponentManager.
-                getInstance().
-                    getComponent(ComponentNames.CONFIG);
+               AuxiliaryComponentManager.
+               getInstance().
+                       getComponent(ComponentNames.CONFIG);
 
-        this.initStorage(null);
 
+        this.existDbXmlStorageManager = new ExistDbXmlStorageManager();
+        this.transformations = new Transformations();
+        
     }
 
 
-    public String getComponentName() {
 
-        return (this.componentName);
+    // -------------------------------------- public methods
 
-    }
 
 
-    public void setComponentName(String name) {
-
-        this.componentName = name;
-
-    }
-
-
     // --- methods from NMWGStorageManager interface
 
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
    2006-06-27 11:02:22 UTC (rev 1334)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
    2006-06-27 12:20:53 UTC (rev 1335)
@@ -5,7 +5,6 @@
 package org.perfsonar.service.measurementArchive.rrdStorageManager;
 
 
-import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
@@ -59,7 +58,7 @@
  *  @author romradz
  */
 public class SimpleRRDConfigurationStorageManager
-       implements NMWGStorageManager, AuxiliaryComponent {
+       implements NMWGStorageManager {
 
 
 
@@ -72,8 +71,6 @@
      */
     private String xmlFile = null;
     
-    private String componentName = "ma.conf.filedb";
-
     protected LoggerComponent logger = null;
 
     protected ConfigurationComponent configuration = null;
@@ -88,47 +85,26 @@
 
     public SimpleRRDConfigurationStorageManager() throws SystemException {
 
-        this.transformations = new NSTransformations();
 
-    }
-
-
-
-    // -------------------------------------- public methods
-
-
-    // --- methods from AuxiliaryComponent interface
-
-
-    public void initComponent() throws SystemException {
-
         logger = (LoggerComponent)
-            AuxiliaryComponentManager.
-                getInstance().
-                    getComponent(ComponentNames.LOGGER);
+               AuxiliaryComponentManager.
+               getInstance().
+                       getComponent(ComponentNames.LOGGER);
 
         configuration = (ConfigurationComponent)
-            AuxiliaryComponentManager.
-                getInstance().
-                    getComponent(ComponentNames.CONFIG);
+               AuxiliaryComponentManager.
+               getInstance().
+                       getComponent(ComponentNames.CONFIG);
 
-        this.initStorage(null);
 
-    }
+        this.transformations = new NSTransformations();
 
-
-    public String getComponentName() {
-
-        return (this.componentName);
-
     }
 
 
-    public void setComponentName(String name) {
 
-        this.componentName = name;
+    // -------------------------------------- public methods
 
-    }
 
 
     // --- methods from NMWGStorageManager interface
@@ -155,9 +131,9 @@
 
         String query = this.transformations.getMetadataQuery(dataQuery);
 
-        logger.debug(
-                "SimpleRRDConfigurationStorageManager.fetch: "
-                +"metadata query: " + query);
+        //logger.debug(
+        //        "SimpleRRDConfigurationStorageManager.fetch: "
+        //        +"metadata query: " + query);
 
         try {
 
@@ -238,7 +214,7 @@
         // and configure xml db (eXist).
 
         throw new SystemException(
-                "error.ma.writing",
+                "warning.ma.writing",
                 "SimpleRRDConfigurationStorageManager.store: "
                 + "Writing is not supported");
 
@@ -291,9 +267,9 @@
             }
         }
 
-        logger.debug(
-                "SimpleRRDConfigurationStorageManager.getData: "
-                + "data query: " + xpathQuery);
+        //logger.debug(
+        //        "SimpleRRDConfigurationStorageManager.getData: "
+        //        + "data query: " + xpathQuery);
 
         try {
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-27 11:02:22 UTC (rev 1334)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-27 12:20:53 UTC (rev 1335)
@@ -116,19 +116,13 @@
                 configuration.getProperty("component.ma.xmldb.db_status");
 
         if (dbStatus.trim().equalsIgnoreCase("on")) {
-
             // xmldb is present
-
             config = new RRDConfigurationStorageManager();
-            ((AuxiliaryComponent) config).initComponent();
-
         } else {
-
             // xmldb is not present
             config = new SimpleRRDConfigurationStorageManager();
-            ((AuxiliaryComponent) config).initComponent();
-
         }
+        config.initStorage(null);
 
     }
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDConfigurationStorageManagerTester.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDConfigurationStorageManagerTester.java
     2006-06-27 11:02:22 UTC (rev 1334)
+++ 
trunk/perfsonar/src/org/perfsonar/service/testHarness/RRDConfigurationStorageManagerTester.java
     2006-06-27 12:20:53 UTC (rev 1335)
@@ -116,7 +116,7 @@
 
         RRDConfigurationStorageManager rrdConfigurationStorageManager =
             new RRDConfigurationStorageManager();
-        rrdConfigurationStorageManager.initComponent();
+        rrdConfigurationStorageManager.initStorage(null);
 
 
         Message results = null;