perfsonar development work

Author: michael.bischoff
Date: 2007-08-31 21:44:48 -0400 (Fri, 31 Aug 2007)
New Revision: 2757

Added:
   branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/log4j.properties
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/EventType.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowStatisticsResponse.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
   
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/RawFlowsResponse.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/nfdump/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/AggegrationRule.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Filter.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/NfdumpOutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/QueryException.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/RawFlowsQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/Statistics.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/StatisticsQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/TopData.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/TopQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/
   
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/package-info.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/
   
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
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/package-info.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/package-info.java
   branches/new-structure/trunk/surfnet_java-flowsa-ma/src/test/
   branches/new-structure/trunk/surfnet_java-flowsa-ma/src/test/java/
   branches/new-structure/trunk/surfnet_java-flowsa-ma/target/
Removed:
   
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/package-info.java
   
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
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/package-info.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/EventType.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/FlowStatisticsResponse.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/FlowsaMAServiceEngine.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/NMWGInterfaceBaseChaining.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/RawFlowsResponse.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/TopFlowsResponse.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/AggegrationRule.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Filter.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Flow.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpControll.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpOutputReader.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpOutputReaderFactory.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/NfdumpQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/QueryException.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/RawFlowsQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/Statistics.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/StatisticsQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/TopData.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/TopQuery.java
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/package-info.java
Modified:
   branches/new-structure/trunk/surfnet_java-flowsa-ma/
   branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/users.lst
   
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
   branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.jsp
   branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/objects.config
   branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties
   branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/README.txt
   branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml
Log:



Property changes on: branches/new-structure/trunk/surfnet_java-flowsa-ma
___________________________________________________________________
Name: svn:ignore
   - .settings

   + .settings
bin
build


Modified: branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath      
2007-08-31 20:33:27 UTC (rev 2756)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/.classpath      
2007-09-01 01:44:48 UTC (rev 2757)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/test/java"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="con" 
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
   2007-08-31 20:33:27 UTC (rev 2756)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/i18n.properties
   2007-09-01 01:44:48 UTC (rev 2757)
@@ -4,7 +4,7 @@
 
 #################### [i18n global setting] #################
 #
-locales=en ja
+locales=en
 
 #################### [index.jsp] ###########################
 #
@@ -12,14 +12,14 @@
 ### Header ###
 #
 language=Language
-welcomeMessage=Hello! Welcome to Apache-Axis.
+welcomeMessage=Apache-Axis.
 
 ### Operation list ###
 #
-operationType=What do you want to do today?
+operationType=Listing options:
 
 # Validation
-validation=Validation
+validation=Validate
 validationURL=happyaxis.jsp
 validationFootnote00=Validate the local installation's configuration
 validationFootnote01=see below if this does not work.
@@ -51,7 +51,7 @@
 soapMonitorFootnote=[disabled by default for security reasons]
 
 # Sidenote
-sideNote=To enable the disabled features, uncomment the appropriate 
declarations in WEB-INF/web.xml in the webapplication and restart it. 
+sideNote=This installation of axis runs a flowsa-ma
 
 ### Validating Axis ###
 #

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/users.lst
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/users.lst
 2007-08-31 20:33:27 UTC (rev 2756)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/users.lst
 2007-09-01 01:44:48 UTC (rev 2757)
@@ -1,3 +1 @@
-user1 pass1
-user2 
-user3 pass3
+admin geheim
\ No newline at end of file

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
   2007-08-31 20:33:27 UTC (rev 2756)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
   2007-09-01 01:44:48 UTC (rev 2757)
@@ -23,15 +23,6 @@
   </servlet>
 
   <servlet>
-    <servlet-name>AdminServlet</servlet-name>
-    <display-name>Axis Admin Servlet</display-name>
-    <servlet-class>
-        org.apache.axis.transport.http.AdminServlet
-    </servlet-class>
-    <load-on-startup>100</load-on-startup>
-  </servlet>
-
-  <servlet>
     <servlet-name>SOAPMonitorService</servlet-name>
     <display-name>SOAPMonitorService</display-name>
     <servlet-class>
@@ -64,14 +55,6 @@
     <url-pattern>/SOAPMonitor</url-pattern>
   </servlet-mapping>
 
- <!-- uncomment this if you want the admin servlet -->
- <!--
-  <servlet-mapping>
-    <servlet-name>AdminServlet</servlet-name>
-    <url-pattern>/servlet/AdminServlet</url-pattern>
-  </servlet-mapping>
- -->
-
     <session-config>
         <!-- Default to 5 minute session timeouts -->
         <session-timeout>5</session-timeout>

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.jsp
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.jsp 
2007-08-31 20:33:27 UTC (rev 2756)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.jsp 
2007-09-01 01:44:48 UTC (rev 2757)
@@ -80,22 +80,6 @@
     %>
   </li>
 
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("adminURL") +"\">");
-      out.print(getMessage("admin") +"</a> - ");
-      out.print(getMessage("adminFootnote"));
-    %>
-  </li>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("soapMonitorURL") +"\">");
-      out.print(getMessage("soapMonitor") +"</a> - ");
-      out.print(getMessage("soapMonitorFootnote"));
-    %>
-  </li>
-
 </ul>
 
 <%

Added: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/log4j.properties

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/objects.config
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/objects.config   
  2007-08-31 20:33:27 UTC (rev 2756)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/objects.config   
  2007-09-01 01:44:48 UTC (rev 2757)
@@ -39,6 +39,9 @@
 http://ggf.org/ns/nmwg/tools/bwctl/2.0/subject/        
org.ggf.ns.nmwg.tools.bwctl.v2_0.Subject
 http://ggf.org/ns/nmwg/tools/bwctl/2.0/parameters/     
org.ggf.ns.nmwg.tools.bwctl.v2_0.Parameters
 http://ggf.org/ns/nmwg/tools/bwctl/2.0/datum/  
org.ggf.ns.nmwg.tools.bwctl.v2_0.Datum
+http://ggf.org/ns/nmwg/tools/flow/2.0/subject/ 
org.ggf.ns.nmwg.tools.flow.v2_0.Subject
+http://ggf.org/ns/nmwg/tools/flow/2.0/parameters/      
org.ggf.ns.nmwg.tools.flow.v2_0.Parameters
+http://ggf.org/ns/nmwg/tools/flow/2.0/datum/   
org.ggf.ns.nmwg.tools.flow.v2_0.Datum
 http://ggf.org/ns/nmwg/tools/iperf/2.0/subject/        
org.ggf.ns.nmwg.tools.iperf.v2_0.Subject
 http://ggf.org/ns/nmwg/tools/iperf/2.0/parameters/     
org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters
 http://ggf.org/ns/nmwg/tools/iperf/2.0/datum/  
org.ggf.ns.nmwg.tools.iperf.v2_0.Datum

Modified: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties 
2007-08-31 20:33:27 UTC (rev 2756)
+++ 
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/service.properties 
2007-09-01 01:44:48 UTC (rev 2757)
@@ -10,7 +10,11 @@
 service.ma.message_types=SetupDataRequest
 
 # === Flowsa specific properties ===
-# exporters - list of source devices that generated our data (format 
<URI>:<PORT>, separeted by comma's eg: "exporters=foo:3200, bar:4444") 
+# exporters - list of source devices that generated our data.
+# service.ma.flowsa.exporters - a number indicating the amount of diferent 
sources
+# service.ma.flowsa.source1.hostname - 
+# service.ma.flowsa.source1.port - 
+# service.ma.flowsa.source1.description - 
 service.ma.flowsa.exporters=
 
 # --- query properties ---
@@ -23,13 +27,14 @@
 # nfdump.source - location of nfcapd files
 # nfdump.location - the location of the nfdump (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/flows
+service.ma.flowsa.nfdump.source=/var/nfdump/flows
 service.ma.flowsa.nfdump.location=/usr/local/bin/nfdump
-service.ma.flowsa.nfdump.ouputreader=org.perfsonar.service.mesurementArchive.flowsa.nfdump.outputreaders.Nfdump152OutputReaderImpl
+service.ma.flowsa.nfdump.ouputreader=org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump152OutputReaderFactory
 
 # === Logger properties ===
-service.log.log4j.config=D:/services/apache-tomcat-5.5.23/common/classes/log4j.properties
+service.log.log4j.config=/perfsonar/conf/log4j.properties
 
+# === nmwg ===
+service.sax_parser.config=/perfsonar/conf/objects.config
 
 
-

Modified: branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/README.txt
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/README.txt  
2007-08-31 20:33:27 UTC (rev 2756)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/README.txt  
2007-09-01 01:44:48 UTC (rev 2757)
@@ -2,3 +2,4 @@
 
http://wiki.perfsonar.net/jra1-wiki/index.php/Flow_Selection_and_Aggregation_MA
 for up to date information about the service.
 
+mvn cargo:deploy -DtomcatHostname=sonar1.amsterdam.surfnet.nl 
-DtomcatUsername=username -DtomcatPassword=password
\ No newline at end of file

Modified: branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml
===================================================================
--- branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml 2007-08-31 
20:33:27 UTC (rev 2756)
+++ branches/new-structure/trunk/surfnet_java-flowsa-ma/pom.xml 2007-09-01 
01:44:48 UTC (rev 2757)
@@ -51,9 +51,7 @@
        </organization>
        <build>
                <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-               <testSourceDirectory>
-                       ${basedir}/src/test/java
-               </testSourceDirectory>
+               
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
                <outputDirectory>${basedir}/bin</outputDirectory>
                <directory>${basedir}/build</directory>
                <plugins>
@@ -68,17 +66,17 @@
                                <groupId>org.codehaus.cargo</groupId>
                                <artifactId>cargo-maven2-plugin</artifactId>
                                <configuration>
-                                       <wait>false</wait>
                                        <container>
                                                
<containerId>tomcat5x</containerId>
-                                               
<home>${tomcatInstallDir}</home>
+                                               <type>remote</type>
                                        </container>
                                        <configuration>
+                                               <type>runtime</type>
                                                <properties>
-                                                       
<cargo.logging>high</cargo.logging>
-                                                       <cargo.servlet.port>
-                                                               8080
-                                                       </cargo.servlet.port>
+                                                       
<cargo.tomcat.manager.url>http://${tomcatHostname}/manager/html</cargo.tomcat.manager.url>
       
+                                                       
<cargo.hostname>${tomcatHostname}</cargo.hostname>
+                                                       
<cargo.remote.username>${tomcatUsername}</cargo.remote.username>
+                                                       
<cargo.remote.password>${tomcatPassword}</cargo.remote.password>
                                                </properties>
                                        </configuration>
                                </configuration>
@@ -97,8 +95,7 @@
                                                                        
classpathref="maven.compile.classpath"
                                                                        
dir="${basedir}/conf/axis-1.4/WEB-INF/">
                                                                        <arg 
value="server" />
-                                                                       <arg
-                                                                             
  value="${basedir}/conf/wsdd/service-deploy.wsdd" />
+                                                                       <arg 
value="${basedir}/conf/wsdd/service-deploy.wsdd" />
                                                                </java>
                                                        </tasks>
                                                </configuration>
@@ -175,12 +172,12 @@
                <dependency>
                        <groupId>perfsonar</groupId>
                        <artifactId>perfsonar-base</artifactId>
-                       <version>1.0.20070723</version>
+                       <version>1.0.20070825</version>
                </dependency>
                <dependency>
                        <groupId>nmwg</groupId>
                        <artifactId>nmwg</artifactId>
-                       <version>1.0.20070704</version>
+                       <version>1.0.20070815</version>
                </dependency>
                <dependency>
                        <groupId>xerces</groupId>

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/EventType.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/EventType.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowStatisticsResponse.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/FlowStatisticsResponse.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/FlowsaMAServiceEngine.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/NMWGInterfaceBaseChaining.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/NMWGInterfaceBaseChaining.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/RawFlowsResponse.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/RawFlowsResponse.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/TopFlowsResponse.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/TopFlowsResponse.java)

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

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

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

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

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

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

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

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

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/RawFlowsQuery.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/RawFlowsQuery.java)

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

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

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

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

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters)

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

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/SimpleFilter.java
 (from rev 2635, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/SimpleFilter.java)

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

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/filters/package-info.java
 (from rev 2635, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/filters/package-info.java)

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

Deleted: 
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/Nfdump152OutputReaderFactory.java
 (from rev 2635, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/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/Nfdump152OutputReaderImpl.java
 (from rev 2635, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/Nfdump152OutputReaderImpl.java)

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

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/package-info.java
 (from rev 2635, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/nfdump/outputreaders/package-info.java)

Copied: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/package-info.java
 (from rev 2624, 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/package-info.java)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deleted: 
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/mesurementArchive/flowsa/package-info.java