perfsonar development work

Author: michael.bischoff
Date: 2008-10-14 13:47:55 -0400 (Tue, 14 Oct 2008)
New Revision: 4619

Added:
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicConfigurationWriter.java
Removed:
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicConfigurationWriter.java
Modified:
   trunk/ps-mdm-flowsub-mp/conf/wizard.properties
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
Log:
-Added properties to wizard (optional exporter properties)
-Changed webadmin to write to service.properties in a sorted matter.
-Fixed bug in selecting routers
-Added exception informing the user if there is no router configured.

Modified: trunk/ps-mdm-flowsub-mp/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-10-14 17:29:35 
UTC (rev 4618)
+++ trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-10-14 17:47:55 
UTC (rev 4619)
@@ -34,65 +34,73 @@
   </property>
 
   <property>
+    <entry key="service.common.ls.use" required="true">true</entry>
+    <Comment>Register to LS?</Comment>
+    <ProposedValue>false</ProposedValue>
+    <Group order="1" check="true">LS</Group>
+    <AcceptedValue>true</AcceptedValue> 
+    <AcceptedValue>false</AcceptedValue>         
+  </property>
+  <property>
     <entry key="service.r.service_type" required="true">mp</entry>
     <Comment>Enter the type of the service</Comment>
     <ProposedValue>mp</ProposedValue>
-    <Group order="1" check="false">LS</Group>
+    <Group order="2" check="false">LS</Group>
     <AcceptedValue>mp</AcceptedValue>
   </property>  
   <property>
     <entry key="service.r.service_name" required="true">Company X Flow 
Subscription MP</entry>
     <Comment>Enter the service name</Comment>
     <ProposedValue>Company X Flow Subscription MP</ProposedValue>
-    <Group order="2">LS</Group>
+    <Group order="3">LS</Group>
   </property>
   <property>
     <entry key="service.r.service_version">0.1</entry>
     <Comment>Enter the version of the service</Comment>
-    <ProposedValue>0.1</ProposedValue>
-    <Group order="3">LS</Group>
+    <ProposedValue>1.0</ProposedValue>
+    <Group order="4">LS</Group>
   </property>
   <property>
     <entry key="service.r.service_description">Flow Subscription MP</entry>
     <Comment>Give a description of the  service</Comment>
     <ProposedValue>Flow Subscription MP</ProposedValue>
-    <Group order="4">LS</Group>
+    <Group order="5">LS</Group>
   </property>
   <property>
     <entry 
key="service.r.contact_email">admin@localhost</entry>
     <Comment>Enter the email address of the person administrating the 
service</Comment>
     
<ProposedValue>admin@localhost</ProposedValue>
-    <Group order="5">LS</Group>
+    <Group order="6">LS</Group>
   </property>
   <property>
     <entry key="service.r.organization_name">Company X</entry>
     <Comment>Enter the name of the organization running this 
service.</Comment>
     <ProposedValue>Company X</ProposedValue>
-    <Group order="6">LS</Group>
+    <Group order="7">LS</Group>
   </property>
   <property>
     <entry key="service.r.ls_url" required="true"></entry>
     <Comment>Give the LS url</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="7">LS</Group>
+    <Group order="8">LS</Group>
   </property>
   <property>
     <entry key="component.registrator.interval">3000</entry>
     <Comment>Give the registration interval</Comment>
     <ProposedValue>3000</ProposedValue>
-    <Group order="8">LS</Group>
+    <Group order="9">LS</Group>
   </property>
   <property>
     <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService</entry>
     <Comment>Give the service access point</Comment>
     
<ProposedValue>http://YOUR-HOST/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService</ProposedValue>
-    <Group order="9">LS</Group>
+    <Group order="10">LS</Group>
   </property>
   <property>
     <entry 
key="component.registrator.scheduler_component">ma_scheduler</entry>
     <Comment>Give the registration component</Comment>
     <ProposedValue>ma_scheduler</ProposedValue>
-    <Group order="10">LS</Group>
+    <Group order="11">LS</Group>
     <AcceptedValue>ma_scheduler</AcceptedValue>
   </property>
   

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
 2008-10-14 17:29:35 UTC (rev 4618)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
 2008-10-14 17:47:55 UTC (rev 4619)
@@ -332,15 +332,18 @@
                        checkCanExecute(nfdumpExecutable, "Nfdump");
                        nfcapTargetDirectory = 
AuxiliaryComponentManager.getInstance().getTempDirectory();
                        
-                       for(int i = 0; ;i++) {
+                       for(int i = 1; ;i++) {
                                try {
-                                       
configuration.getProperty("service.mp.flow.exporter."+i+".name");
+                                       
configuration.getProperty(EXPORTER_FIRST_PART+i+".enabled");
                                } catch (PerfSONARException e) {
                                        break;
                                }
                                initExportingRouter(i);
                        }
                        
+                       if(exportingRouterMap.size()<1) {
+                               throw new PerfSONARException("","No routers 
where configured and enabled, check if the 
'"+EXPORTER_FIRST_PART+"0"+".enabled' is defined in service.properties");
+                       }                       
                } catch (Exception e) {
                        //fail fast with a runtime exception a correctly 
configured service never throws this
                        throw new RuntimeException(e);

Deleted: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicConfigurationWriter.java

Added: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicConfigurationWriter.java


Property changes on: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicConfigurationWriter.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain