perfsonar development work

Author: michael.bischoff
Date: 2008-12-12 23:54:13 -0500 (Fri, 12 Dec 2008)
New Revision: 4779

Added:
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java
Removed:
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java
Modified:
   trunk/ps-mdm-flowsa-ma/conf/wizard.properties
   trunk/ps-mdm-flowsa-ma/pom.xml
Log:
Wizard fixes

Modified: trunk/ps-mdm-flowsa-ma/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/wizard.properties       2008-12-12 15:05:48 
UTC (rev 4778)
+++ trunk/ps-mdm-flowsa-ma/conf/wizard.properties       2008-12-13 04:54:13 
UTC (rev 4779)
@@ -105,6 +105,27 @@
   </property>
   
   <property>
+    <entry key="service.as.authn_active">on</entry>
+    <Comment>Activate authentication for this service?</Comment>    
+    <ProposedValue>on</ProposedValue>
+    <Group order="1" check="true">Authentication</Group>    
+    <AcceptedValue>on</AcceptedValue>
+    <AcceptedValue>off</AcceptedValue>    
+  </property>
+  <property>
+    <entry key="service.as.authn_for_msg_types">SetupDataRequest</entry>
+    <Comment>Message types for which authentication is needed.</Comment>
+    <ProposedValue>SetupDataRequest</ProposedValue>
+    <Group order="2">Authentication</Group>
+  </property>
+  <property>
+    <entry 
key="service.as.point">http://localhost:8080/perfSONAR-AS/services/AuthService</entry>
+    <Comment>AS address</Comment>
+    
<ProposedValue>http://localhost:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+    <Group order="3">Authentication</Group>
+  </property> 
+  
+  <property>
     <entry key="service.ma.flowsa.query.timeout">60</entry>
     <Comment>timeout/max execution time of a query (value is in 
seconds)</Comment>
     <ProposedValue>60</ProposedValue>
@@ -193,7 +214,7 @@
     <Group order="9">Exporter01</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.1.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter01</Group>
@@ -240,49 +261,49 @@
     <Group order="4">Exporter02</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.2.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.2.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.2.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.2.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.2.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.2.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.2.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter02</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.2.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter02</Group>
@@ -317,49 +338,49 @@
     <Group order="4">Exporter03</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.3.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.3.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.3.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.3.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.3.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.3.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.3.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter03</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.3.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter03</Group>
@@ -394,49 +415,49 @@
     <Group order="4">Exporter04</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.4.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.4.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.4.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.4.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.4.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.4.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.4.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter04</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.4.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter04</Group>
@@ -471,49 +492,49 @@
     <Group order="4">Exporter05</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.5.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.5.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.5.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.5.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.5.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.5.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.5.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter05</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.5.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter05</Group>
@@ -546,49 +567,49 @@
     <Group order="4">Exporter06</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.6.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.6.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.6.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.6.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.6.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.6.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.6.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter06</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.6.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter06</Group>
@@ -623,49 +644,49 @@
     <Group order="4">Exporter07</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.7.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.7.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.7.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.7.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.7.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.7.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.7.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter07</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.7.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter07</Group>
@@ -700,49 +721,49 @@
     <Group order="4">Exporter08</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.8.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.8.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.8.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.8.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.8.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.8.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.8.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter08</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.8.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter08</Group>
@@ -777,49 +798,49 @@
     <Group order="4">Exporter09</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.9.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.9.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.9.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry key="service.common.flow.exporter.9.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.9.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.9.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.9.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter09</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.9.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter09</Group>
@@ -854,49 +875,49 @@
     <Group order="4">Exporter10</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.10.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.10.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.10.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.10.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.10.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.10.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.10.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter10</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.10.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter10</Group>
@@ -931,49 +952,49 @@
     <Group order="4">Exporter11</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.11.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.11.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.11.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.11.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.11.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.11.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.11.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter11</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.11.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter11</Group>
@@ -1008,49 +1029,49 @@
     <Group order="4">Exporter12</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.12.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.12.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.12.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.12.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.12.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.12.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.12.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter12</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.12.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter12</Group>
@@ -1085,49 +1106,49 @@
     <Group order="4">Exporter13</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.13.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.13.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.13.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.13.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.13.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.13.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.13.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter13</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.13.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter13</Group>
@@ -1162,49 +1183,49 @@
     <Group order="4">Exporter14</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.14.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.14.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.14.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.14.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.14.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.14.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.14.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter14</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.14.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter14</Group>
@@ -1239,49 +1260,49 @@
     <Group order="4">Exporter15</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.15.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.15.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.15.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.15.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.15.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.15.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.15.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter15</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.15.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter15</Group>
@@ -1316,49 +1337,49 @@
     <Group order="4">Exporter16</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.16.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.16.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.16.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.16.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.16.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.16.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.16.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter16</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.16.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter16</Group>
@@ -1393,49 +1414,49 @@
     <Group order="4">Exporter17</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.17.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.17.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.17.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.17.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.17.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.17.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.17.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter17</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.17.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter17</Group>
@@ -1470,49 +1491,49 @@
     <Group order="4">Exporter18</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.18.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.18.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.18.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.18.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.18.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.18.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.18.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter18</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.18.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter18</Group>
@@ -1547,49 +1568,49 @@
     <Group order="4">Exporter19</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.19.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.19.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.19.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.19.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.19.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.19.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.19.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter19</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.19.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter19</Group>
@@ -1624,49 +1645,49 @@
     <Group order="4">Exporter20</Group>
   </property>
     <property>
-    <entry key="service.common.flow.exporter.1.flow-version" 
required="true"></entry>
+    <entry key="service.common.flow.exporter.20.flow-version" 
required="true"></entry>
     <Comment>The flow version used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="5">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.sample-rate"></entry>
+    <entry key="service.common.flow.exporter.20.sample-rate"></entry>
     <Comment>The sample-rate used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="6">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.operating-system"></entry>
+    <entry key="service.common.flow.exporter.20.operating-system"></entry>
     <Comment>The operating system used</Comment>
     <ProposedValue></ProposedValue>
     <Group order="7">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.institution"></entry>
+    <entry 
key="service.common.flow.exporter.20.location.institution"></entry>
     <Comment>Institution</Comment>
     <ProposedValue></ProposedValue>
     <Group order="8">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.city"></entry>
+    <entry key="service.common.flow.exporter.20.location.city"></entry>
     <Comment>City</Comment>
     <ProposedValue></ProposedValue>
     <Group order="9">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.country""></entry>
+    <entry key="service.common.flow.exporter.20.location.country"></entry>
     <Comment>Country</Comment>
     <ProposedValue></ProposedValue>
     <Group order="10">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.latitude"></entry>
+    <entry key="service.common.flow.exporter.20.location.latitude"></entry>
     <Comment>Latitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="11">Exporter20</Group>
   </property>
   <property>
-    <entry key="service.common.flow.exporter.1.location.longitude"></entry>
+    <entry key="service.common.flow.exporter.20.location.longitude"></entry>
     <Comment>Longitude</Comment>
     <ProposedValue></ProposedValue>
     <Group order="12">Exporter20</Group>

Modified: trunk/ps-mdm-flowsa-ma/pom.xml
===================================================================
--- trunk/ps-mdm-flowsa-ma/pom.xml      2008-12-12 15:05:48 UTC (rev 4778)
+++ trunk/ps-mdm-flowsa-ma/pom.xml      2008-12-13 04:54:13 UTC (rev 4779)
@@ -5,7 +5,7 @@
        <artifactId>ps-mdm-flowsa-ma</artifactId>
        <packaging>war</packaging>
        <name>Flowsa Measurement Archive</name>
-       <version>1.0.1</version>
+       <version>1.0.2</version>
        <description>
                Flow selection and aggregation Measurement Archive for
                perfSONAR. For more information see the wiki-page.
@@ -186,14 +186,14 @@
                </dependency>
                <dependency>
                        <groupId>perfsonar</groupId>
-                       <artifactId>perfsonar-web-admin</artifactId>
-                       <version>0.9.6b</version>
+                       <artifactId>perfsonar-base</artifactId>
+                       <version>1.0.20080924</version>
                        <optional>false</optional>
                </dependency>
                <dependency>
                        <groupId>perfsonar</groupId>
-                       <artifactId>perfsonar-base</artifactId>
-                       <version>1.0.20080924</version>
+                       <artifactId>perfsonar-web-admin</artifactId>
+                       <version>0.9.2c</version>
                        <optional>false</optional>
                </dependency>
        </dependencies>

Deleted: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java

Added: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java


Property changes on: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java

Added: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java


Property changes on: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java

Added: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java


Property changes on: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain