perfsonar development work

Author: gijs
Date: 2007-10-02 09:55:15 -0400 (Tue, 02 Oct 2007)
New Revision: 2892

Added:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
Removed:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java
Modified:
   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/NMWGInterfaceBaseChaining.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/TopFlowsResponse.java
   
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/nfdump/Flow.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpOutputReader.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/TopDatum.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/SimpleFilter.java
Log:
ip formatting.

Modified: branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml 2007-10-02 
12:43:45 UTC (rev 2891)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml 2007-10-02 
13:55:15 UTC (rev 2892)
@@ -403,6 +403,9 @@
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>javancss-maven-plugin</artifactId>
+                               <configuration>
+                         <failOnViolation>false</failOnViolation>
+                       </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
    2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
    2007-10-02 13:55:15 UTC (rev 2892)
@@ -9,7 +9,11 @@
 import org.perfsonar.service.base.messages.BaseChaining;
 
 /**
- * This class handles base chaining of NMWG Interface element for MA 
requests 
+ * This class handles base chaining of NMWG Interface element for MA requests
+ * 
+ * IMPORTANT: this class is not merging it simply discards the other data, 
please implement 
+ * correctly when we actually need the functionally profided by this class.
+ * 
  * @author romradz, Michael bischoff 
  * @version $Id$
  */

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/TopFlowsResponse.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/TopFlowsResponse.java
     2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/TopFlowsResponse.java
     2007-10-02 13:55:15 UTC (rev 2892)
@@ -31,7 +31,7 @@
                datum.setBytes(element.getBytes());
                datum.setBpp(element.getBytesPerPacket());
                datum.setBps(element.getBytesPerSecond());
-               datum.setDateFirstSeen(element.getDateFirstSeen());
+               datum.setDateFirstSeen(element.getTimeFirstSeen());
                datum.setDuration(element.getDuration());
                datum.setFlows(element.getFlows());
                datum.setPackets(element.getPackets());

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-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfcapd/NfcapdControll.java
        2007-10-02 13:55:15 UTC (rev 2892)
@@ -6,6 +6,11 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+/**
+ * Central class for nfcapd support.
+ * @author Michael.Bischoff
+ *
+ */
 public class NfcapdControll {
        public static class FileData {
 

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
  2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Flow.java
  2007-10-02 13:55:15 UTC (rev 2892)
@@ -13,13 +13,13 @@
     /** Time first seen UNIX time seconds */
     private String timeFirstSeen;
 
-    /** msec first seen Mili seconds first seen */
+    /** msec first seen Milliseconds first seen */
     private String msecFirstSeen;
 
     /** Time last seen UNIX time seconds */
     private String timeLastSeen;
 
-    /** msec last seen Mili seconds last seen */
+    /** msec last seen Milliseconds seconds last seen */
     private String msecLastSeen;
 
     /** Protocol Protocol */

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
        2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
        2007-10-02 13:55:15 UTC (rev 2892)
@@ -18,7 +18,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeoutException;
 
-import 
org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump152OutputReaderFactory;
+import 
org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory;
 
 /**
  * Core of the nfdump wrapper.
@@ -352,7 +352,7 @@
        private NfdumpOutputReaderFactory configureOutputFactory(String 
className) throws InstantiationException, IllegalAccessException, 
ClassNotFoundException {
         // default, convention over configuration
         if(className == null) {
-            return new Nfdump152OutputReaderFactory();
+            return new Nfdump1_5_5OutputReaderFactory();
         }
         Class<?> factoryClass = Class.forName(className);
         return (NfdumpOutputReaderFactory) factoryClass.newInstance();

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpOutputReader.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpOutputReader.java
    2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpOutputReader.java
    2007-10-02 13:55:15 UTC (rev 2892)
@@ -5,14 +5,14 @@
 /**
  * Interface for Nfdump output readers this reader reads the outputstream of 
a
  * nfdump application. please see 
{@link
 NfdumpControll} for imput flags and
- * createCommandXXX for what is specificly passed onto nfdump. Given the case
- * that the flags will change over differend versions of nfdump 
createCommandXXX
- * methods should be externalised to a serparate class and that class should 
be
- * served by NfdumpReaderFactory (Refactored: droppign the output prefix, see
+ * createCommandXXX for what is specifically passed onto nfdump. Given the 
case
+ * that the flags will change over differed versions of nfdump 
createCommandXXX
+ * methods should be externalised to a separate class and that class should 
be
+ * served by NfdumpReaderFactory (Refactored: dropping the output prefix, see
  * 
{@link
 NfdumpOutputReaderFactory}) and that Factory should serve two
  * classes: output readers and commandLineExpressionCreator (or simply
  * commandCreator) Considering the maturity of nfdump it's unlikely to change
- * soon therefor a simpler solution is currently used.
+ * soon therefore a simpler solution is currently used.
  * 
  * @author Michael Bischoff
  * @version $id$

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/TopDatum.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/TopDatum.java
      2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/TopDatum.java
      2007-10-02 13:55:15 UTC (rev 2892)
@@ -7,8 +7,11 @@
  * @version $Id$
  */
 public class TopDatum {
-       private String dateFirstSeen;
-    private String duration;
+       private String adressFamily;
+       private String timeFirstSeen;
+       private String msecFirstSeen;
+       private String timeLastSeen;
+       private String msecLastSeen;
     private String topStatistic;
        private String protocol;
     private String parameter;
@@ -17,20 +20,37 @@
     private String bytes;
     private String packetsPerSecond;
     private String bytesPerSecond;
-    private String bytesPerPacket;
+    private String bytesPerPacket;     
+       
+       //cached value.
+    private String duration;
 
-    public String getDateFirstSeen() {
-               return dateFirstSeen;
+
+       
+    public String getTimeFirstSeen() {
+               return timeFirstSeen;
        }
-       public void setDateFirstSeen(String dateFirstSeen) {
-               this.dateFirstSeen = dateFirstSeen;
+       public void setTimeFirstSeen(String dateFirstSeen) {
+               this.timeFirstSeen = dateFirstSeen;
+               duration = null;
        }
+       
+       /**
+        * Makes a best attempt based on the current data associated with 
this bean.
+        * @return duration of this top flow
+        */
        public String getDuration() {
+               if(duration==null) {
+                       try {
+                               int first = Integer.parseInt(timeFirstSeen);
+                               int last = Integer.parseInt(timeLastSeen);
+                               duration = String.valueOf(last - first);
+                       } catch(NumberFormatException e) {
+                               duration = null;
+                       }                       
+               }
                return duration;
        }
-       public void setDuration(String duration) {
-               this.duration = duration;
-       }
        public String getTopStatistic() {
                return topStatistic;
        }
@@ -85,4 +105,31 @@
        public void setBytesPerPacket(String bytesPerPacket) {
                this.bytesPerPacket = bytesPerPacket;
        }
+       public String getTimeLastSeen() {
+               return timeLastSeen;
+       }
+       public void setTimeLastSeen(String dateLastSeen) {
+               this.timeLastSeen = dateLastSeen;
+               duration = null;
+       }       
+       public void setAdressFamily(String adressFamily) {
+               this.adressFamily = adressFamily;
+       }
+       public String getAdressFamily() {
+               return adressFamily;
+       }
+       public String getMsecFirstSeen() {
+               return msecFirstSeen;
+       }
+       public void setMsecFirstSeen(String msecFirstSeen) {
+               this.msecFirstSeen = msecFirstSeen;
+               duration = null;
+       }
+       public String getMsecLastSeen() {
+               return msecLastSeen;
+       }
+       public void setMsecLastSeen(String msecLastSeen) {
+               this.msecLastSeen = msecLastSeen;
+               duration = null;
+       }
 }

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/SimpleFilter.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/SimpleFilter.java
  2007-10-02 12:43:45 UTC (rev 2891)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/SimpleFilter.java
  2007-10-02 13:55:15 UTC (rev 2892)
@@ -7,7 +7,7 @@
  * 
  * takes a static expression as a string in the constuctor
  * @author Michael Bischoff
- * @version $id$
+ * @version $Id$
  */
 public class SimpleFilter implements Filter {
     private final String expression;

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderFactory.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderFactory.java
 (from rev 2868, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderFactory.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
 (from rev 2868, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java)