perfsonar development work

Author: michael.bischoff
Date: 2008-03-05 14:05:29 -0500 (Wed, 05 Mar 2008)
New Revision: 3476

Added:
   trunk/surfnet_java-flowsa-ma/conf/servlet.properties
Modified:
   trunk/surfnet_java-flowsa-ma/conf/components.properties
   trunk/surfnet_java-flowsa-ma/conf/service.properties
   trunk/surfnet_java-flowsa-ma/pom.xml
   
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
Log:
RESOLVED - bug 258: FlowSA client: some output columns do not make sens for 
Top Record query 
https://bugzilla.perfsonar.net/show_bug.cgi?id=258

Modified: trunk/surfnet_java-flowsa-ma/conf/components.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/components.properties     2008-03-05 
14:55:02 UTC (rev 3475)
+++ trunk/surfnet_java-flowsa-ma/conf/components.properties     2008-03-05 
19:05:29 UTC (rev 3476)
@@ -15,3 +15,5 @@
 
 
eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
 
+authn=org.perfsonar.commons.auxiliary.components.authn.wssec.WSSecAuthNComponent
+

Modified: trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-03-05 
14:55:02 UTC (rev 3475)
+++ trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-03-05 
19:05:29 UTC (rev 3476)
@@ -16,7 +16,7 @@
 # service.ma.flowsa.exporters - a number indicating the amount of different 
sources
 # service.ma.flowsa.exporter1.hostname - required
 # service.ma.flowsa.exporter1.port - required
-# service.ma.flowsa.exporter1.description - required
+# service.ma.flowsa.exporter1.description - optional
 # service.ma.flowsa.exporter1.flow-version - required
 # service.ma.flowsa.exporter1.sample-rate - required
 # service.ma.flowsa.exporter1.operating-system - optional
@@ -99,3 +99,7 @@
 #component.registrator.scheduler_component=ma_scheduler
 #component.registrator.interval=30000
 
+#=== Authentication ===
+service.as.authn_active=off
+service.as.authn_for_msg_types=SetupDataRequest
+service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
\ No newline at end of file

Added: trunk/surfnet_java-flowsa-ma/conf/servlet.properties

Modified: trunk/surfnet_java-flowsa-ma/pom.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/pom.xml        2008-03-05 14:55:02 UTC (rev 
3475)
+++ trunk/surfnet_java-flowsa-ma/pom.xml        2008-03-05 19:05:29 UTC (rev 
3476)
@@ -4,7 +4,7 @@
   <artifactId>flowsa-ma</artifactId>
   <packaging>war</packaging>
   <name>Flowsa Measurement Archive</name>
-  <version>0.7.0</version>
+  <version>0.9.1</version>
   <description>Flow selection and aggregation Measurement Archive for
                perfSONAR. For more information see the 
wiki-page.</description>
   
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/Flow_Selection_and_Aggregation_MA</url>

Modified: 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
===================================================================
--- 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
       2008-03-05 14:55:02 UTC (rev 3475)
+++ 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
       2008-03-05 19:05:29 UTC (rev 3476)
@@ -350,7 +350,7 @@
            commands.add(TIME_FLAG);        
            commands.add(getTimeCommandFrom(query));
                commands.add("-s");
-               if(!query.isSplitProtocol()) {
+               if(query.isSplitProtocol()) {
                        
commands.add(query.getTopStatistic()+":p/"+query.getOrderBy());
                } else {
                        
commands.add(query.getTopStatistic()+"/"+query.getOrderBy());