perfsonar development work

Author: michael.bischoff
Date: 2007-11-13 03:13:05 -0500 (Tue, 13 Nov 2007)
New Revision: 3034

Modified:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/components.properties
   branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties
   branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/NfcapdControll.java
Log:
ls/nfcapd

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/components.properties
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/components.properties
      2007-11-12 10:44:45 UTC (rev 3033)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/components.properties
      2007-11-13 08:13:05 UTC (rev 3034)
@@ -8,10 +8,10 @@
 
logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 # Simple scheduler
-#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
+ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
 # Registration in LS
-#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
+registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
 
 
eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
 

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties 
2007-11-12 10:44:45 UTC (rev 3033)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties 
2007-11-13 08:13:05 UTC (rev 3034)
@@ -4,7 +4,10 @@
 
 # === Service Type ===
 service.r.type=ma
+service.r.service_name=Java flowSA MA
 
+
+
 # === Measurement Archive general properties ===
 
service.ma.class_name=org.perfsonar.service.measurementArchive.flowsa.FlowsaMAServiceEngine
 service.ma.message_types=SetupDataRequest
@@ -36,7 +39,7 @@
 
 # --- nfdump properties ---
 # nfdump.source - location of nfcapd files
-# nfdump.location - the location of the nfdump (including nfdump filename)
+# nfdump.location - the location of the nfdump executable (including nfdump 
filename)
 # nfdump.outputreader - fully qualified name of the class used for output 
reading (expects a class implementing NfdumpOutputReader)
 service.ma.flowsa.nfdump.source=/var/nfdump/flows
 service.ma.flowsa.nfdump.location=/usr/local/bin/nfdump
@@ -52,4 +55,6 @@
 # === nmwg === 
 service.sax_parser.config=/perfsonar/conf/objects.config
 
-
+#=== LS registrator ===
+component.registrator.scheduler_component=ma_scheduler
+component.registrator.interval=30000

Modified: branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml 2007-11-12 
10:44:45 UTC (rev 3033)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml 2007-11-13 
08:13:05 UTC (rev 3034)
@@ -7,7 +7,7 @@
        <artifactId>flowsa-ma</artifactId>
        <packaging>war</packaging>
        <name>Flowsa Measurement Archive</name>
-       <version>0.0.1</version>
+       <version>0.7.0</version>
        <description>
                Flow selection and aggregation Measurement Archive for
                perfSONAR. For more information see the wiki-page.

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/NfcapdControll.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/NfcapdControll.java
        2007-11-12 10:44:45 UTC (rev 3033)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/NfcapdControll.java
        2007-11-13 08:13:05 UTC (rev 3034)
@@ -60,9 +60,16 @@
        public NfcapdControll(Set<Exporter> exporters, boolean 
startNfcapdProcesses) {
                this.exporters = exporters;
                this.startingNfcapdProcesses = startNfcapdProcesses;
+               if(startNfcapdProcesses) {
+                   startNfcapdProcesses();
+               }
        }
        
-       public Exporter getExporterByHostName(String hostname) {
+       protected void startNfcapdProcesses() {
+        //TODO start nfcapd processes
+    }
+
+    public Exporter getExporterByHostName(String hostname) {
                for(Exporter exporter: exporters) {
                        if(exporter.getHostName().equalsIgnoreCase(hostname)) 
{
                                return exporter;
@@ -108,4 +115,12 @@
                
                return new FileData(startFile,endFile,directories);
        }
+       
+       protected class NfcapdProcessesControllThread implements Runnable {
+
+        public void run() {
+            
+        }
+           
+       }
 }