perfsonar development work

Author: michael.bischoff
Date: 2008-12-12 23:55:35 -0500 (Fri, 12 Dec 2008)
New Revision: 4780

Added:
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/WizzardResponse.java
Removed:
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/WizzardResponse.java
Modified:
   trunk/ps-mdm-flowsub-mp/conf/wizard.properties
   trunk/ps-mdm-flowsub-mp/pom.xml
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicServiceConfig.java
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/Wizard.java
Log:
wizard fixes

Modified: trunk/ps-mdm-flowsub-mp/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-12-13 04:54:13 
UTC (rev 4779)
+++ trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-12-13 04:55:35 
UTC (rev 4780)
@@ -107,10 +107,10 @@
   <property>
     <entry key="service.as.authn_active">on</entry>
     <Comment>Activate authentication for this service?</Comment>    
-    <ProposedValue>on</ProposedValue>
+    <ProposedValue>off</ProposedValue>
     <Group order="1" check="true">Authentication</Group>    
-    <AcceptedValue>on</AcceptedValue>
     <AcceptedValue>off</AcceptedValue>    
+    <AcceptedValue>on</AcceptedValue>
   </property>
   <property>
     <entry 
key="service.as.authn_for_msg_types">SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest</entry>

Modified: trunk/ps-mdm-flowsub-mp/pom.xml
===================================================================
--- trunk/ps-mdm-flowsub-mp/pom.xml     2008-12-13 04:54:13 UTC (rev 4779)
+++ trunk/ps-mdm-flowsub-mp/pom.xml     2008-12-13 04:55:35 UTC (rev 4780)
@@ -177,14 +177,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>

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicServiceConfig.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicServiceConfig.java
        2008-12-13 04:54:13 UTC (rev 4779)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/BasicServiceConfig.java
        2008-12-13 04:55:35 UTC (rev 4780)
@@ -84,7 +84,7 @@
                // The WizardProperties to be configured
                WizardProperties properties = new WizardProperties();         
          
                // Loading the wizard properties
-               properties.loadFromXML(new FileInputStream(servicePath + 
WIZARD_PROPERTIES_PATH));
+               properties.loadFromXML(servicePath + WIZARD_PROPERTIES_PATH);
                // Preparing properties into groups
                prepareProperties(properties);
                
@@ -126,7 +126,7 @@
                // Iterating through the properties so that we can divide 
them into groups
                while (it.hasNext()) {
                        
-                       WizardProperty property = 
loadedProperties.getWizardProperty((String) it.next());
+                       WizardProperty property = (WizardProperty) it.next();
                        
                        PerfsonarProperty value = 
serviceDotProperties.getProperty(property.getKey());
 

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/Wizard.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/Wizard.java
    2008-12-13 04:54:13 UTC (rev 4779)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/Wizard.java
    2008-12-13 04:55:35 UTC (rev 4780)
@@ -67,7 +67,7 @@
                try {
                        ServletContext sc = config.getServletContext();
                        configPath = sc.getRealPath("/");                     
  
-                       if(!configPath.endsWith(File.pathSeparator) || 
!configPath.endsWith("/")) {
+                       if(!configPath.endsWith(File.separator) || 
!configPath.endsWith("/")) {
                                configPath += "/";
                        }
                        

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

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


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