perfsonar development work

Author: roman
Date: 2006-07-12 04:10:32 -0400 (Wed, 12 Jul 2006)
New Revision: 1405

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
Log:
Now the component ExistDbXmlStorageManager is loaded to 
AuxiliaryComponentManager once and taken from there when needed.
Previously the object of class ExistDbXmlStorageManager was created for every 
request which required searching 
in the metadata configuration.

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
        2006-07-11 14:08:03 UTC (rev 1404)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
        2006-07-12 08:10:32 UTC (rev 1405)
@@ -48,6 +48,44 @@
 
 
 
+    // -------------------------------------- static code
+
+
+
+    static {
+
+       // loading the component ExistDbXmlStorageManager
+       // to have xml db (eXsit) access
+
+       try {
+
+               AuxiliaryComponentManager.
+                       getInstance().
+                               loadComponent(
+                                               "ma.xmldb",
+                                               
"org.perfsonar.service.commons.storage.xmldb.exist.ExistDbXmlStorageManager");
+
+               ((ExistDbXmlStorageManager)
+                               AuxiliaryComponentManager.
+                                       getInstance().
+                                               getComponent("ma.xmldb"))
+                                                       .initComponent();
+
+               ((LoggerComponent)
+                               AuxiliaryComponentManager.
+                                       getInstance().
+                                               
getComponent(ComponentNames.LOGGER)).
+                                                       
debug("MetadataConfigurationStorageManager: "
+                                                                       + 
"ExistDbXmlStorageManager component loaded");
+
+       } catch (SystemException sex) {
+               ;
+       }
+
+    }
+
+
+
     // -------------------------------------- constructors
 
 
@@ -87,9 +125,8 @@
         }
 
 
-        this.existDbXmlStorageManager = new ExistDbXmlStorageManager();
         this.transformations = new Transformations();
-        
+
     }
 
 
@@ -103,8 +140,10 @@
 
     public void initStorage(Key dataRepository) throws SystemException {
 
-        this.existDbXmlStorageManager.setComponentName("ma.xmldb");
-        this.existDbXmlStorageManager.initComponent();
+        existDbXmlStorageManager = (ExistDbXmlStorageManager)
+               AuxiliaryComponentManager.
+                       getInstance().
+                               getComponent("ma.xmldb");
 
     }
 
@@ -144,9 +183,13 @@
         try {
                object = this.existDbXmlStorageManager.fetch(query);
         } catch (Exception ex) {
+               logger.debug("MetadataConfigurationStorageManager.fetch: "
+                               + "Connection to xml database failed: "
+                               + ex.toString());
                throw new SystemException(
                                "error.common.storage.xmldb",
-                               "Connection to xml database failed");
+                               "MetadataConfigurationStorageManager.fetch: "
+                               + "Connection to xml database failed");
         }
         String[] xmlResults = (String[]) object;
         if (xmlResults == null)