perfsonar development work

Author: michael.bischoff
Date: 2008-03-03 09:25:25 -0500 (Mon, 03 Mar 2008)
New Revision: 3451

Removed:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/MA.conf
Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
Log:
MA address updated

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2008-03-03 13:52:50 UTC (rev 3450)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2008-03-03 14:25:25 UTC (rev 3451)
@@ -37,4 +37,5 @@
 
;PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/XML-LS-1.1.1/services/LookupService,ls,"",ls,ls
 
;SWITCH-LS,http://ls.sonar.net.switch.ch:8180/XML-LS-1.1.1/services/LookupService,ls,"",ls,ls
 
 
;REDIRIS-Test-AS,http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService,as,"",as,as
 
-TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2/services/TelnetSSH,lg,"",lg,lg
\ No newline at end of file
+TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2/services/TelnetSSH,lg,"",lg,lg
+SURFnet,http://sonar1.amsterdam.surfnet.nl/SURFnet-FLOWSA-MA/services/FlowsaMeasurementArchiveService,flowsa,"",flowsa,flowsa

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java  
2008-03-03 13:52:50 UTC (rev 3450)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java  
2008-03-03 14:25:25 UTC (rev 3451)
@@ -53,7 +53,6 @@
  */
 public class FlowsaMATab extends PerfsonarModel {
 
-       private static final IPerfsonarSchema PERFSONAR_SCHEMA = 
PerfsonarSchema.getInstance("flowsa");
        private final OptionsPanel optionsPanel;
 
        /**
@@ -83,9 +82,9 @@
        public MAEndpointList createEndpoints() {
            MAEndpointList endpoints = new MAEndpointList(new 
File("MA.conf"),getSupportedRequests());
            if (endpoints.size() == 0) {
-                       endpoints.add(new 
MAEndpoint("local,http://localhost:8080/flowsa-ma-0.7.0/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+                       endpoints.add(new 
MAEndpoint("local,http://localhost:8080/flowsa-ma-0.9.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
                        endpoints.add(new MAEndpoint("SURFnet 
test,http://sonar1.amsterdam.surfnet.nl:8080/SURFnet-FLOWSA-MA/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
-                       endpoints.add(new MAEndpoint("SURFnet 
development,http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.7.0/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+                       endpoints.add(new MAEndpoint("SURFnet 
development,http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.9.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
            }   
            return endpoints;
        }
@@ -190,7 +189,7 @@
        @Override
        public List<IPerfsonarSchema> getSupportedRequests() {
                List<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
-               supported.add(PERFSONAR_SCHEMA);
+               supported.add(PerfsonarSchema.getInstance("flowsa"));
                return supported;
        }
 

Deleted: branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/MA.conf