perfsonar development work

Author: roman
Date: 2007-10-04 09:53:07 -0400 (Thu, 04 Oct 2007)
New Revision: 2906

Modified:
   branches/geant2_java-rrd-ma-extra/ant/const.properties.template
   branches/geant2_java-rrd-ma-extra/conf/components.properties.template
   branches/geant2_java-rrd-ma-extra/conf/eventType-map.xml
   branches/geant2_java-rrd-ma-extra/conf/log4j.properties.template
   branches/geant2_java-rrd-ma-extra/conf/service.properties.template
   
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
   
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/fetch/UtilizationResponseGenerator.java
Log:

-recent changes in te code provided
-configuration files updated




Modified: branches/geant2_java-rrd-ma-extra/ant/const.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-10-04 13:20:02 UTC (rev 2905)
+++ branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-10-04 13:53:07 UTC (rev 2906)
@@ -13,7 +13,7 @@
 
 
 jarfilename=perfsonar-rrd-ma
-version=2.3-20070913-extra
+version=2.3-20070904-extra
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: 
branches/geant2_java-rrd-ma-extra/conf/components.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/conf/components.properties.template     
  2007-10-04 13:20:02 UTC (rev 2905)
+++ branches/geant2_java-rrd-ma-extra/conf/components.properties.template     
  2007-10-04 13:53:07 UTC (rev 2906)
@@ -14,13 +14,7 @@
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 
-# Simple scheduler
-#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
+eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
 
 
-# Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
 
-
-eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
-

Modified: branches/geant2_java-rrd-ma-extra/conf/eventType-map.xml
===================================================================
--- branches/geant2_java-rrd-ma-extra/conf/eventType-map.xml    2007-10-04 
13:20:02 UTC (rev 2905)
+++ branches/geant2_java-rrd-ma-extra/conf/eventType-map.xml    2007-10-04 
13:53:07 UTC (rev 2906)
@@ -10,7 +10,7 @@
     <eventType>
         <name>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.UtilizationQueryGenerator</metadataQueryGenerator>
-        
<responseGenerator>org.perfsonar.service.measurementArchive.rrdType.fetch.UtilizationResponseGenerator</responseGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.rrdType.fetch.GenericResponseGenerator</responseGenerator>
     </eventType>
     <eventType>
         <name>http://ggf.org/ns/nmwg/characteristic/errors/2.0</name>

Modified: branches/geant2_java-rrd-ma-extra/conf/log4j.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/conf/log4j.properties.template    
2007-10-04 13:20:02 UTC (rev 2905)
+++ branches/geant2_java-rrd-ma-extra/conf/log4j.properties.template    
2007-10-04 13:53:07 UTC (rev 2906)
@@ -4,9 +4,7 @@
 ## author: romradz
 
 
-logDir=_LOGPATH_
 
-
 ##
 ## All log levels is one log file.
 ## Dafaultly debug level is switched off (commented).
@@ -31,7 +29,6 @@
 
 #DEBUG
 log4j.appender.debugAppender.MaxBackupIndex=11
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.debugAppender.MaxFileSize=500KB
@@ -39,7 +36,6 @@
 
 #INFO
 log4j.appender.infoAppender.MaxBackupIndex=11
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.infoAppender.MaxFileSize=500KB
@@ -47,7 +43,6 @@
 
 #WARN
 log4j.appender.warnAppender.MaxBackupIndex=11
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.warnAppender.MaxFileSize=500KB
@@ -55,7 +50,6 @@
 
 #ERROR
 log4j.appender.errorAppender.MaxBackupIndex=11
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.errorAppender.MaxFileSize=500KB
@@ -63,7 +57,6 @@
 
 #FATAL
 log4j.appender.fatalAppender.MaxBackupIndex=11
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.fatalAppender.MaxFileSize=500KB
@@ -71,18 +64,10 @@
 
 #ALL
 log4j.appender.psRootAppender.MaxBackupIndex=11
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
 log4j.appender.psRootAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 log4j.appender.psRootAppender.MaxFileSize=500KB
 
 
-#ROOT
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
-#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-#log4j.rootLogger=DEBUG, rootAppender
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+

Modified: branches/geant2_java-rrd-ma-extra/conf/service.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/conf/service.properties.template  
2007-10-04 13:20:02 UTC (rev 2905)
+++ branches/geant2_java-rrd-ma-extra/conf/service.properties.template  
2007-10-04 13:53:07 UTC (rev 2906)
@@ -9,21 +9,11 @@
 
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
+
 service.ma.conf_file=.
 
-component.ma.xmldb.db_status=on
-#component.ma.xmldb.db_access=xmlrpc
-component.ma.xmldb.db_access=http
-component.ma.xmldb.db_uri=http://localhost:__PORT__/exist/rest/db/rrdmaconfig
-component.ma.xmldb.db_uri.xmlrpc=xmldb:exist://localhost:__PORT__/exist/xmlrpc/db/rrdmaconfig
-component.ma.xmldb.db_username=rrdmaservice
-component.ma.xmldb.db_password=rrdmaservice
-component.ma.xmldb.type=webapp
 
-service.ma.xmldb.db_store=off
-
-
-
 
service.ma.rrd.rrd_storage_manager_rrd_DS_type_default=COUNTER:1800:0:10000000000000
 service.ma.rrd.rrd_storage_manager_rrd_step_default=300
 
service.ma.rrd.rrd_storage_manager_rrd_RRA_default=MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600
@@ -32,3 +22,5 @@
 component.registrator.interval=30000
 component.registrator.scheduler_component=ma_scheduler
 
+
+

Modified: 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
===================================================================
--- 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
     2007-10-04 13:20:02 UTC (rev 2905)
+++ 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/BaseChainingMergerFactory.java
     2007-10-04 13:53:07 UTC (rev 2906)
@@ -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/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
        2007-10-04 13:20:02 UTC (rev 2905)
+++ 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
        2007-10-04 13:53:07 UTC (rev 2906)
@@ -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;
 
     }
-    */
 
 
     /**

Modified: 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/fetch/UtilizationResponseGenerator.java
===================================================================
--- 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/fetch/UtilizationResponseGenerator.java
    2007-10-04 13:20:02 UTC (rev 2905)
+++ 
branches/geant2_java-rrd-ma-extra/src/main/java/org/perfsonar/service/measurementArchive/rrdType/fetch/UtilizationResponseGenerator.java
    2007-10-04 13:53:07 UTC (rev 2906)
@@ -62,7 +62,7 @@
         } catch (Exception ex) {
                throw new PerfSONARException(
                     "error.rrdma.rrd_file",
-                    "GenericResponseGenerator.getResponse: "
+                    "UtilizationResponseGenerator.getResponse: "
                     + ex.toString());
         }