perfsonar development work

Author: roman
Date: 2006-07-11 08:08:44 -0400 (Tue, 11 Jul 2006)
New Revision: 1397

Added:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQueries.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQuery.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQueryConfigurationComponent.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/MetadataQueryGenerator.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/MetadataQueryGeneratorFactory.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
Removed:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/L2PathStatusQuery.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetricQuery.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/UtilizationQuery.java
Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
Log:
Implementation of plug-in approach for adding new metrics.
Configuration of it is in conf/metadata-queries-map.xml.

Deleted: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/L2PathStatusQuery.java

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
        2006-07-10 13:10:57 UTC (rev 1396)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
        2006-07-11 12:08:44 UTC (rev 1397)
@@ -54,7 +54,6 @@
 
     public MetadataConfigurationStorageManager() throws SystemException {
 
-
        try {
 
                this.logger = (LoggerComponent)

Deleted: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetricQuery.java

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
    2006-07-10 13:10:57 UTC (rev 1396)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
    2006-07-11 12:08:44 UTC (rev 1397)
@@ -19,7 +19,10 @@
 import org.ggf.ns.nmwg.base.v2_0.Message;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
 
+import 
org.perfsonar.service.measurementArchive.storageManager.queryGenerator.MetadataQueryGenerator;
+import 
org.perfsonar.service.measurementArchive.storageManager.queryGenerator.MetadataQueryGeneratorFactory;
 
+
 /**
  *  Access to transformation methods changing metadata into xpath/xquery.
  *  It is used while fetching configuration metadata.
@@ -133,26 +136,14 @@
                     + "eventType in the request is null");
 
 
+        // getting an appropriate MetadataQueryGenerator to 
+        // genarate correct metadata query
+        MetadataQueryGenerator metadataQueryGenerator =
+               
MetadataQueryGeneratorFactory.getMetadataQueryGenerator(eventType);
+        String mq = metadataQueryGenerator.getMetadataQuery(query);
+        
+        return mq;
 
-        // For now query objects are created here.
-        // But in the future they will be loaded dynamically according to 
the value
-        // of eventType in the request
-        UtilizationQuery utilizationQuery = new UtilizationQuery();
-        L2PathStatusQuery l2PathStatusQuery = new L2PathStatusQuery();
-
-
-        if (eventType.trim().equalsIgnoreCase("utilization")) {
-            return utilizationQuery.getMetadataQuery(query);
-        } else if (eventType.trim().equalsIgnoreCase("Path.Status")) {
-            return l2PathStatusQuery.getMetadataQuery(query);
-        } else {
-            throw new RequestException(
-                    "error.ma.query",
-                    "Transformations.getMetadataQuery: "
-                    + "eventType, specified in the request message, is not 
supported");
-        }
-
-
     }
 
 

Deleted: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/UtilizationQuery.java

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQueries.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQueries.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQuery.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQuery.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQueryConfigurationComponent.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryConfig/MetadataQueryConfigurationComponent.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/MetadataQueryGenerator.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/MetadataQueryGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/MetadataQueryGeneratorFactory.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/MetadataQueryGeneratorFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native