perfsonar development work

Author: michael.bischoff
Date: 2008-09-29 22:29:42 -0400 (Mon, 29 Sep 2008)
New Revision: 4551

Modified:
   trunk/ps-mdm-flowsub-mp/conf/servlet.properties
   trunk/ps-mdm-flowsub-mp/conf/wizard.properties
   trunk/ps-mdm-flowsub-mp/pom.xml
Log:
Commiting fixes for problems reported by sasa against the RC
Fixed wizzard
fixed exporter order

Modified: trunk/ps-mdm-flowsub-mp/conf/servlet.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/servlet.properties     2008-09-29 19:39:27 
UTC (rev 4550)
+++ trunk/ps-mdm-flowsub-mp/conf/servlet.properties     2008-09-30 02:29:42 
UTC (rev 4551)
@@ -1,7 +1,7 @@
 #The type of the service
 servlet.service_type=flowsubscription
 #The ConfigurationHandler interface implementation used by the Wizard Servlet
-servlet.wizard.configHandlers=org.perfsonar.service.measurementPoint.flowsubscription.wizard.WizardHandler
+servlet.wizard.configHandlers=org.perfsonar.service.measurementPoint.flowsubscription.wizard.SimpleHandler
 #The username used for authentication reasons when accessing properties 
configuration and Wizard servlets
 servlet.username=perfsonaruser
 #The password used for authentication reasons when accessing properties 
configuration and Wizard servlets

Modified: trunk/ps-mdm-flowsub-mp/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-09-29 19:39:27 
UTC (rev 4550)
+++ trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-09-30 02:29:42 
UTC (rev 4551)
@@ -165,7 +165,7 @@
     <entry key="service.common.flow.exporter.1.enabled" 
required="true">true</entry>
     <Comment>Use exporter 1</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter1</Group>
+    <Group order="1" check="true">Exporter01</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -173,19 +173,19 @@
     <entry key="service.common.flow.exporter.1.name" 
required="true">exporter1</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter1</Group>
+    <Group order="2">Exporter01</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.1.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter1</Group>
+    <Group order="3">Exporter01</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.1.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter1</Group>
+    <Group order="4">Exporter01</Group>
   </property>
 
 
@@ -193,7 +193,7 @@
     <entry key="service.common.flow.exporter.2.enabled" 
required="true">true</entry>
     <Comment>Use exporter 2</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter2</Group>
+    <Group order="1" check="true">Exporter02</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -201,19 +201,19 @@
     <entry key="service.common.flow.exporter.2.name" 
required="true">exporter2</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter2</Group>
+    <Group order="2">Exporter02</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.2.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter2</Group>
+    <Group order="3">Exporter02</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.2.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter2</Group>
+    <Group order="4">Exporter02</Group>
   </property>
 
 
@@ -221,7 +221,7 @@
     <entry key="service.common.flow.exporter.3.enabled" 
required="true">true</entry>
     <Comment>Use exporter 3</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter3</Group>
+    <Group order="1" check="true">Exporter03</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -229,19 +229,19 @@
     <entry key="service.common.flow.exporter.3.name" 
required="true">exporter3</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter3</Group>
+    <Group order="2">Exporter03</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.3.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter3</Group>
+    <Group order="3">Exporter03</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.3.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter3</Group>
+    <Group order="4">Exporter03</Group>
   </property>
 
 
@@ -249,7 +249,7 @@
     <entry key="service.common.flow.exporter.4.enabled" 
required="true">true</entry>
     <Comment>Use exporter 4</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter4</Group>
+    <Group order="1" check="true">Exporter04</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -257,19 +257,19 @@
     <entry key="service.common.flow.exporter.4.name" 
required="true">exporter4</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter4</Group>
+    <Group order="2">Exporter04</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.4.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter4</Group>
+    <Group order="3">Exporter04</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.4.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter4</Group>
+    <Group order="4">Exporter04</Group>
   </property>
 
 
@@ -277,7 +277,7 @@
     <entry key="service.common.flow.exporter.5.enabled" 
required="true">true</entry>
     <Comment>Use exporter 5</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter5</Group>
+    <Group order="1" check="true">Exporter05</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -285,19 +285,19 @@
     <entry key="service.common.flow.exporter.5.name" 
required="true">exporter5</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter5</Group>
+    <Group order="2">Exporter05</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.5.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter5</Group>
+    <Group order="3">Exporter05</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.5.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter5</Group>
+    <Group order="4">Exporter05</Group>
   </property>
 
 
@@ -305,7 +305,7 @@
     <entry key="service.common.flow.exporter.6.enabled" 
required="true">true</entry>
     <Comment>Use exporter 6</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter6</Group>
+    <Group order="1" check="true">Exporter06</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -313,19 +313,19 @@
     <entry key="service.common.flow.exporter.6.name" 
required="true">exporter6</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter6</Group>
+    <Group order="2">Exporter06</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.6.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter6</Group>
+    <Group order="3">Exporter06</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.6.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter6</Group>
+    <Group order="4">Exporter06</Group>
   </property>
 
 
@@ -333,7 +333,7 @@
     <entry key="service.common.flow.exporter.7.enabled" 
required="true">true</entry>
     <Comment>Use exporter 7</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter7</Group>
+    <Group order="1" check="true">Exporter07</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -341,19 +341,19 @@
     <entry key="service.common.flow.exporter.7.name" 
required="true">exporter7</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter7</Group>
+    <Group order="2">Exporter07</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.7.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter7</Group>
+    <Group order="3">Exporter07</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.7.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter7</Group>
+    <Group order="4">Exporter07</Group>
   </property>
 
 
@@ -361,7 +361,7 @@
     <entry key="service.common.flow.exporter.8.enabled" 
required="true">true</entry>
     <Comment>Use exporter 8</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter8</Group>
+    <Group order="1" check="true">Exporter08</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -369,19 +369,19 @@
     <entry key="service.common.flow.exporter.8.name" 
required="true">exporter8</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter8</Group>
+    <Group order="2">Exporter08</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.8.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter8</Group>
+    <Group order="3">Exporter08</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.8.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter8</Group>
+    <Group order="4">Exporter08</Group>
   </property>
 
 
@@ -389,7 +389,7 @@
     <entry key="service.common.flow.exporter.9.enabled" 
required="true">true</entry>
     <Comment>Use exporter 9</Comment>
     <ProposedValue>false</ProposedValue>
-    <Group order="1" check="true">Exporter9</Group>
+    <Group order="1" check="true">Exporter09</Group>
     <AcceptedValue>true</AcceptedValue> 
     <AcceptedValue>false</AcceptedValue>         
   </property>
@@ -397,19 +397,19 @@
     <entry key="service.common.flow.exporter.9.name" 
required="true">exporter9</entry>
     <Comment>Name</Comment>
     <ProposedValue></ProposedValue>
-    <Group order="2">Exporter9</Group>
+    <Group order="2">Exporter09</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.9.address" 
required="true">exporter.hostname</entry>
     <Comment>Address / Hostname</Comment>
     <ProposedValue>exporter.hostname</ProposedValue>
-    <Group order="3">Exporter9</Group>
+    <Group order="3">Exporter09</Group>
   </property>
   <property>
     <entry key="service.common.flow.exporter.9.port" 
required="true">6999</entry>
     <Comment>Port</Comment>
     <ProposedValue>6999</ProposedValue>
-    <Group order="4">Exporter9</Group>
+    <Group order="4">Exporter09</Group>
   </property>
 
 

Modified: trunk/ps-mdm-flowsub-mp/pom.xml
===================================================================
--- trunk/ps-mdm-flowsub-mp/pom.xml     2008-09-29 19:39:27 UTC (rev 4550)
+++ trunk/ps-mdm-flowsub-mp/pom.xml     2008-09-30 02:29:42 UTC (rev 4551)
@@ -160,11 +160,6 @@
                        <version>1.0.20080721</version>
                </dependency>
                <dependency>
-                       <groupId>perfsonar</groupId>
-                       <artifactId>perfsonar-web-admin</artifactId>
-                       <version>0.8.6b</version>
-               </dependency>
-               <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
                        <version>1.3.2</version>
@@ -185,6 +180,12 @@
                        <version>2.3</version>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>perfsonar</groupId>
+                       <artifactId>perfsonar-web-admin</artifactId>
+                       <version>0.9.6b</version>
+                       <optional>false</optional>
+               </dependency>
        </dependencies>
        <reporting>
                <excludeDefaults>true</excludeDefaults>