perfsonar development work

Author: roman
Date: 2006-06-26 09:11:36 -0400 (Mon, 26 Jun 2006)
New Revision: 1330

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:
now SimpleRRDConfigurationStorageManager implements AuxiliaryComponent (just 
like RRDConfigurationStorageManager)

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
    2006-06-26 09:17:36 UTC (rev 1329)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/SimpleRRDConfigurationStorageManager.java
    2006-06-26 13:11:36 UTC (rev 1330)
@@ -58,7 +58,8 @@
  *
  *  @author romradz
  */
-public class SimpleRRDConfigurationStorageManager implements 
NMWGStorageManager {
+public class SimpleRRDConfigurationStorageManager
+       implements NMWGStorageManager, AuxiliaryComponent {
 
 
 
@@ -70,6 +71,8 @@
      *  RRD configuration file.
      */
     private String xmlFile = null;
+    
+    private String componentName = "ma.filedb";
 
     protected LoggerComponent logger = null;
 
@@ -85,6 +88,20 @@
 
     public SimpleRRDConfigurationStorageManager() throws SystemException {
 
+        this.transformations = new NSTransformations();
+
+    }
+
+
+
+    // -------------------------------------- public methods
+
+
+    // --- methods from AuxiliaryComponent interface
+
+
+    public void initComponent() throws SystemException {
+
         logger = (LoggerComponent)
             AuxiliaryComponentManager.
                 getInstance().
@@ -95,16 +112,25 @@
                 getInstance().
                     getComponent(ComponentNames.CONFIG);
 
-        this.transformations = new NSTransformations();
+        this.initStorage(null);
 
     }
 
 
+    public String getComponentName() {
 
-    // -------------------------------------- public methods
+        return (this.componentName);
 
+    }
 
 
+    public void setComponentName(String name) {
+
+        this.componentName = name;
+
+    }
+
+
     // --- methods from NMWGStorageManager interface
 
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-26 09:17:36 UTC (rev 1329)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-26 13:11:36 UTC (rev 1330)
@@ -126,7 +126,7 @@
 
             // xmldb is not present
             config = new SimpleRRDConfigurationStorageManager();
-            config.initStorage(null);
+            ((AuxiliaryComponent) config).initComponent();
 
         }