perfsonar development work

Author: roman
Date: 2007-10-01 10:19:13 -0400 (Mon, 01 Oct 2007)
New Revision: 2883

Modified:
   branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
   
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
   
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
   
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:
Base chaining updated.

If 'service.ma.base_chaining_mergers' property is commented in 
service.properties file then the base chaining is switched off (defaultly 
it's 
switched on)

service.ma.base_chaining_mergers contains list of base chaining merger classes





Modified: branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml      
  2007-09-28 11:15:14 UTC (rev 2882)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml      
  2007-10-01 14:19:13 UTC (rev 2883)
@@ -157,6 +157,30 @@
   </target>
 
 
+  <target name="util-data-fetch-test-5-bc"
+             depends="init-test">
+    <java classname="org.perfsonar.client.testHarness.SOAPClient"
+             classpathref="classpath"
+             fork="true">
+         <arg value="${ma.local}"/>
+         <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-5.xml"/>
+         <arg value="${basedir}/samples/requests/response-bc-1.xml"/>
+       </java>
+  </target>
+
+
+  <target name="util-data-fetch-test-6-bc"
+             depends="init-test">
+       <java classname="org.perfsonar.client.testHarness.SOAPClient"
+             classpathref="classpath"
+             fork="true">
+         <arg value="${ma.local}"/>
+         <arg 
value="${basedir}/samples/requests/SetupDataRequest-Utilization-6.xml"/>
+         <arg value="${basedir}/samples/requests/response-bc-2.xml"/>
+       </java>
+  </target>
+
+
   <!--storing data -->
 
   <target name="util-data-store-test-1"

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
    2007-09-28 11:15:14 UTC (rev 2882)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/conf/service.properties.template
    2007-10-01 14:19:13 UTC (rev 2883)
@@ -4,6 +4,7 @@
 
service.ma.class_name=org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine
 
service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
 
+service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
 
 component.ma.xmldb.db_status=off
 #component.ma.xmldb.db_access=xmlrpc

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
       2007-09-28 11:15:14 UTC (rev 2882)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
       2007-10-01 14:19:13 UTC (rev 2883)
@@ -8,7 +8,6 @@
 
 import java.util.Set;
 import java.util.HashSet;
-import java.util.Map;
 
 import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.base.auxiliary.ComponentNames;
@@ -17,11 +16,6 @@
 
 import org.perfsonar.service.base.messages.BaseChaining;
 
-import org.perfsonar.service.measurementArchive.eventTypeConfig.EventType;
-import 
org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfiguration;
-import 
org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent;
-
-
 /**
  *  Factory class which can be used to get the appropriate 
  *  object for merging the base chaining.
@@ -32,74 +26,51 @@
 
 
 
-    public static Set getBaseChainingMergers() 
+    public static Set getBaseChainingMergers(String mergerNames) 
         throws PerfSONARException {
-
+       
         LoggerComponent logger = (LoggerComponent)
             AuxiliaryComponentManager.
                 getInstance().
                     getComponent(ComponentNames.LOGGER);
 
-        EventTypeConfigurationComponent eventTypeConfigurationComponent =
-            (EventTypeConfigurationComponent)
-                AuxiliaryComponentManager.
-                    getInstance().
-                        getComponent("eventType_config");
-
        Set baseChainingMergers = new HashSet();
 
-        EventTypeConfiguration eventTypeConfiguration =
-            eventTypeConfigurationComponent.getEventTypeConfiguration();
+        String[] mergerNamesArray  = mergerNames.split("\\s*,\\s*");
 
-        if (eventTypeConfiguration == null)
-            throw new PerfSONARException(
-                    "error.ma.configuration",
-                    "BaseChainingMergerFactory.getBaseChainingMerger: "
-                    + "eventTypeConfiguration object is null. "
-                    + "Something is wrong with eventType configuration.");
+        for (int i = 0; i < mergerNamesArray.length; i++) {
 
-        Map eventTypeMap =  eventTypeConfiguration.getEventTypeMap();
+               String mergerName = mergerNamesArray[i].trim();
 
-        EventType eventType = null;
-        String className = null;
-        BaseChaining baseChainingMerger = null;
-
-        for (Object o : eventTypeMap.values()) {
-
-               eventType = (EventType)o;
-               className = eventType.getBaseChainingMerger();
-
-               if (className == null || className.trim().equals(""))
+               if (mergerName.equals(""))
                        continue;
-               
+
+               BaseChaining baseChainingMerger = null;
             try {
 
-               baseChainingMerger = 
-                    (BaseChaining)
-                        Class.forName(className).newInstance();
+               baseChainingMerger = (BaseChaining)
+                    Class.forName(mergerName).newInstance();
 
             } catch (Exception ex) {
 
                 logger.error(
                         "BaseChainingMergerFactory.getBaseChainingMerger: "
                         + "Unable to create an object of : "
-                        + className + ": "
+                        + mergerName + ": "
                         + ex.toString());
                 throw new PerfSONARException(
                         "error.ma.metadata_query_mapping_configuration", 
                         "BaseChainingMergerFactory.getBaseChainingMerger: "
                         + "Unable to create an object of "
-                        + className);
+                        + mergerName);
 
             }
 
             baseChainingMergers.add(baseChainingMerger);
-               
+
         }
 
-
         if (baseChainingMergers.size() == 0) return null;
-
         return baseChainingMergers;
 
     }

Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
  2007-09-28 11:15:14 UTC (rev 2882)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
  2007-10-01 14:19:13 UTC (rev 2883)
@@ -303,8 +303,8 @@
     protected Message getKey(Message request)
         throws PerfSONARException {
 
-        // process the base chaining
-        // request = messageProcess(request);
+        //process the base chaining
+        request = messageProcess(request);
 
         Message response = new Message();
 
@@ -361,30 +361,37 @@
      *
      *  @throws PerfSONARException
      */
-    /*
     protected Message messageProcess(Message message)
         throws PerfSONARException {
 
-       Set baseChainingMergers =
-               BaseChainingMergerFactory.getBaseChainingMergers();
+        String mergerNames = null;
+        try {
+               mergerNames =
+                
configuration.getProperty("service.ma.base_chaining_mergers");
+        } catch (Exception ex) {;}
 
-       if (baseChainingMergers == null)
-               return message;
+        if (mergerNames == null || mergerNames.trim().equals(""))
+            return message;
 
-       BaseChaining baseChaining = null;
+        Set baseChainingMergers =
+            BaseChainingMergerFactory.getBaseChainingMergers(mergerNames);
 
-       Iterator iterator = baseChainingMergers.iterator();
-       while (iterator.hasNext()) {
-               
-               baseChaining = (BaseChaining) iterator.next();
-               message = baseChaining.processChaining(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;
 
     }
-    */
 
 
     /**