perfsonar development work

Author: roman
Date: 2007-05-09 09:45:46 -0400 (Wed, 09 May 2007)
New Revision: 2371

Added:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:

Processing the base chaining for requests representing utilization metric has 
been improved.




Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java
 2007-05-07 13:12:34 UTC (rev 2370)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventType.java
 2007-05-09 13:45:46 UTC (rev 2371)
@@ -24,6 +24,7 @@
     private String metadataQueryGenerator = null;
     private String responseGenerator = null;
     private String storeRequestProcess = null;
+    private String baseChainingMerger = null;
 
 
 
@@ -96,5 +97,19 @@
     }
 
 
+    public void setBaseChainingMerger(String baseChainingMerger) {
 
+        this.baseChainingMerger = baseChainingMerger;
+
+    }
+
+
+    public String getBaseChainingMerger() {
+
+        return baseChainingMerger;
+
+    }
+
+
+
 } //EventType

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
    2007-05-07 13:12:34 UTC (rev 2370)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
    2007-05-09 13:45:46 UTC (rev 2371)
@@ -58,5 +58,12 @@
     }
 
 
+    public Map getEventTypeMap() {
 
+       return eventTypeMap;
+
+    }
+
+
+
 } //EventTypeConfiguration

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
   2007-05-07 13:12:34 UTC (rev 2370)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
   2007-05-09 13:45:46 UTC (rev 2371)
@@ -168,5 +168,12 @@
     }
 
 
+    public EventTypeConfiguration getEventTypeConfiguration() {
 
-} //EventTypeConfigurationComponent
+       return eventTypeConfiguration;
+
+    }
+
+
+
+} //EventTypeConfigurationComponent
\ No newline at end of file

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java


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

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2007-05-07 13:12:34 UTC (rev 2370)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2007-05-09 13:45:46 UTC (rev 2371)
@@ -8,6 +8,8 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Set;
+import java.util.Iterator;
 import java.util.Vector;
 import java.util.Random;
 import java.util.Date;
@@ -371,12 +373,24 @@
     protected Message messageProcess(Message message)
         throws SystemException {
 
-        // --- remove of base chainig
+       Set baseChainingMergers =
+               BaseChainingMergerFactory.getBaseChainingMergers();
 
-        BaseChaining baseChaining = new NMWGInterfaceBaseChaining();
-        message = baseChaining.processChaining(message);
-        return message;
+       if (baseChainingMergers == null)
+               return message;
 
+       BaseChaining baseChaining = null;
+
+       Iterator iterator = baseChainingMergers.iterator();
+       while (iterator.hasNext()) {
+               
+               baseChaining = (BaseChaining) iterator.next();
+               message = baseChaining.processChaining(message);
+
+       }
+
+       return message;
+
     }