perfsonar development work

Author: gijs
Date: 2007-07-09 09:37:01 -0400 (Mon, 09 Jul 2007)
New Revision: 2531

Added:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/FlowsaMAServiceEngine.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/AggegrationRule.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Filter.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Flow.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/FlowQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpControll.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpOutputReader.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpOutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/QueryException.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Statistics.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/StatisticsQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/TopData.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/TopQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/
Removed:
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/FlowTypeMAServiceEngine.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/AggegrationRule.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Filter.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Flow.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/FlowQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpControll.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpOutputReader.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpOutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/QueryException.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Statistics.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/StatisticsQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/TopData.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/TopQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/filters/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/outputreaders/
Modified:
   branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/SimpleFilter.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/package-info.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/package-info.java
Log:


Modified: branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath      
2007-07-09 13:23:50 UTC (rev 2530)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath      
2007-07-09 13:37:01 UTC (rev 2531)
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry combineaccessrules="false" kind="src" 
path="/perfsonar_base"/>
        <classpathentry combineaccessrules="false" kind="src" path="/nmwg"/>
+       <classpathentry combineaccessrules="false" kind="src" 
path="/perfSONAR base"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/FlowTypeMAServiceEngine.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/AggegrationRule.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Filter.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Flow.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/FlowQuery.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpControll.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpOutputReader.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpOutputReaderFactory.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpQuery.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/QueryException.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Statistics.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/StatisticsQuery.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/TopData.java

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/TopQuery.java

Added: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/FlowsaMAServiceEngine.java

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/AggegrationRule.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/AggegrationRule.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Filter.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Filter.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Flow.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Flow.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/FlowQuery.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/FlowQuery.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpControll.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpControll.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpOutputReader.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpOutputReader.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpOutputReaderFactory.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpOutputReaderFactory.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpQuery.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/NfdumpQuery.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/QueryException.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/QueryException.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Statistics.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/Statistics.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/StatisticsQuery.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/StatisticsQuery.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/TopData.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/TopData.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/TopQuery.java
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/TopQuery.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/filters)

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/SimpleFilter.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/filters/SimpleFilter.java
   2007-07-09 13:23:50 UTC (rev 2530)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/SimpleFilter.java
     2007-07-09 13:37:01 UTC (rev 2531)
@@ -1,6 +1,6 @@
-package org.perfsonar.service.mesurementArchive.flowType.nfdump.filters;
+package org.perfsonar.service.mesurementArchive.flowsa.nfdump.filters;
 
-import org.perfsonar.service.mesurementArchive.flowType.nfdump.Filter;
+import org.perfsonar.service.mesurementArchive.flowsa.nfdump.Filter;
 
 /**
  * A simple implementation of a nfdump filter

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/package-info.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/filters/package-info.java
   2007-07-09 13:23:50 UTC (rev 2530)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/package-info.java
     2007-07-09 13:37:01 UTC (rev 2531)
@@ -1,4 +1,4 @@
 /**
  * Package that hosts filter Implementations
  */
-package org.perfsonar.service.mesurementArchive.flowType.nfdump.filters;
\ No newline at end of file
+package org.perfsonar.service.mesurementArchive.flowsa.nfdump.filters;
\ No newline at end of file

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders
 (from rev 2530, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/outputreaders)

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderFactory.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/outputreaders/Nfdump152OutputReaderFactory.java
     2007-07-09 13:23:50 UTC (rev 2530)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderFactory.java
       2007-07-09 13:37:01 UTC (rev 2531)
@@ -1,9 +1,9 @@
-package 
org.perfsonar.service.mesurementArchive.flowType.nfdump.outputreaders;
+package org.perfsonar.service.mesurementArchive.flowsa.nfdump.outputreaders;
 
 import java.io.InputStream;
 
-import 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReader;
-import 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReaderFactory;
+import 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReader;
+import 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReaderFactory;
 
 
 /**
@@ -32,7 +32,7 @@
         
     /**
      * creates an 
{@link
 NfdumpOutputReader} and wraps it around the input stream.
-     * @see 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReaderFactory#create(java.io.InputStream)
+     * @see 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReaderFactory#create(java.io.InputStream)
      */
     public NfdumpOutputReader create(InputStream stream) {        
         return new Nfdump152OutputReaderImpl(stream);

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/outputreaders/Nfdump152OutputReaderImpl.java
        2007-07-09 13:23:50 UTC (rev 2530)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java
  2007-07-09 13:37:01 UTC (rev 2531)
@@ -1,13 +1,13 @@
-package 
org.perfsonar.service.mesurementArchive.flowType.nfdump.outputreaders;
+package org.perfsonar.service.mesurementArchive.flowsa.nfdump.outputreaders;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReader;
-import org.perfsonar.service.mesurementArchive.flowType.nfdump.Flow;
-import org.perfsonar.service.mesurementArchive.flowType.nfdump.Statistics;
+import org.perfsonar.service.mesurementArchive.flowsa.nfdump.Flow;
+import 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReader;
+import org.perfsonar.service.mesurementArchive.flowsa.nfdump.Statistics;
 
 
 /**
@@ -39,7 +39,7 @@
      * 
      * @return the record encountered at stream or null if end of stream has
      *         been reached
-     * @see 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReader#readRecord()
+     * @see 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReader#readRecord()
      */
     public Flow readRecord() throws IOException {
         String line;        

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/package-info.java
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowType/nfdump/outputreaders/package-info.java
     2007-07-09 13:23:50 UTC (rev 2530)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/package-info.java
       2007-07-09 13:37:01 UTC (rev 2531)
@@ -1,6 +1,6 @@
 /**
  * Package that hosts OutputReader Implementations
- * @see 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReaderFactory
- * @see 
org.perfsonar.service.mesurementArchive.flowType.nfdump.NfdumpOutputReader
+ * @see 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReaderFactory
+ * @see 
org.perfsonar.service.mesurementArchive.flowsa.nfdump.NfdumpOutputReader
  */
-package 
org.perfsonar.service.mesurementArchive.flowType.nfdump.outputreaders;
\ No newline at end of file
+package org.perfsonar.service.mesurementArchive.flowsa.nfdump.outputreaders;
\ No newline at end of file