perfsonar development work

Author: nina
Date: 2008-06-22 15:04:58 -0400 (Sun, 22 Jun 2008)
New Revision: 4041

Modified:
   branches/perfsonarui/ant/javadoc.xml
   branches/perfsonarui/dist/PerfsonarUI-v0.12.zip
   branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
Log:
final updates for v 0.12 

Modified: branches/perfsonarui/ant/javadoc.xml
===================================================================
--- branches/perfsonarui/ant/javadoc.xml        2008-06-22 18:29:30 UTC (rev 
4040)
+++ branches/perfsonarui/ant/javadoc.xml        2008-06-22 19:04:58 UTC (rev 
4041)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="javadoc">
+<property name="version" value="0.12" />
 <target name="javadoc">
-<javadoc access="public" author="true" 
classpath="../jars/xml/activation.jar;../jars/axis/wsdl4j-1.5.1.jar;../jars/axis/commons-discovery-0.2.jar;../jars/ui/junit.jar;../jars/xml/commons-cli-1.0.jar;../jars/ui/jfreechart-1.0.3.jar;../jars/axis/log4j-1.2.8.jar;C:\eclipse\plugins\org.junit_3.8.1\junit.jar;../jars/axis/axis-ant.jar;../jars/axis/jaxrpc.jar;../jars/ui/jcommon-1.0.8.jar;../jars/axis/axis.jar;../jars/l2fprod/l2fprod-common-all.jar;j../ars/xml/mail.jar;../jars/xml/jdom.jar;../jars/axis/commons-logging-1.0.4.jar;../jars/axis/saaj.jar"
 destdir="../dist/PerfsonarUI-v0.10/doc" doctitle="Perfsonar UI" 
nodeprecated="false" nodeprecatedlist="false" noindex="false" 
nonavbar="false" notree="false" overview="../src/overview.html" 
packagenames="org.perfsonar.perfsonarui.playground,org.perfsonar.perfsonarui.ui,org.perfsonar.perfsonarui,org.perfsonar.perfsonarui.ma.ui.panels,org.perfsonar.perfsonarui.ippm.ui.panels,org.perfsonar.perfsonarui.demo,org.perfsonar.perfsonarui.ma,org.
 
perfsonar.perfsonarui.test.misc,org.perfsonar.perfsonarui.test,org.perfsonar.perfsonarui.ui.panels,org.perfsonar.perfsonarui.ippm.ui.actions,org.perfsonar.perfsonarui.ippm,org.perfsonar.perfsonarui.ma.ui.actions,org.perfsonar.perfsonarui.plugins,org.perfsonar.perfsonarui.ui.actions"
 source="1.5" sourcepath="../src" splitindex="true" use="true" version="true">
+<javadoc access="public" author="true" 
classpath="../jars/xml/activation.jar;../jars/axis/wsdl4j-1.5.1.jar;../jars/axis/commons-discovery-0.2.jar;../jars/ui/junit.jar;../jars/xml/commons-cli-1.0.jar;../jars/ui/jfreechart-1.0.3.jar;../jars/axis/log4j-1.2.8.jar;C:\eclipse\plugins\org.junit_3.8.1\junit.jar;../jars/axis/axis-ant.jar;../jars/axis/jaxrpc.jar;../jars/ui/jcommon-1.0.8.jar;../jars/axis/axis.jar;../jars/l2fprod/l2fprod-common-all.jar;j../ars/xml/mail.jar;../jars/xml/jdom.jar;../jars/axis/commons-logging-1.0.4.jar;../jars/axis/saaj.jar"
 destdir="../dist/PerfsonarUI-v${version}/doc" doctitle="Perfsonar UI" 
nodeprecated="false" nodeprecatedlist="false" noindex="false" 
nonavbar="false" notree="false" overview="../src/overview.html" 
packagenames="org.perfsonar.perfsonarui.playground,org.perfsonar.perfsonarui.ui,org.perfsonar.perfsonarui,org.perfsonar.perfsonarui.ma.ui.panels,org.perfsonar.perfsonarui.ippm.ui.panels,org.perfsonar.perfsonarui.demo,org.perfsonar.perfsonarui.m
 
a,org.perfsonar.perfsonarui.test.misc,org.perfsonar.perfsonarui.test,org.perfsonar.perfsonarui.ui.panels,org.perfsonar.perfsonarui.ippm.ui.actions,org.perfsonar.perfsonarui.ippm,org.perfsonar.perfsonarui.ma.ui.actions,org.perfsonar.perfsonarui.plugins,org.perfsonar.perfsonarui.ui.actions"
 source="1.5" sourcepath="../src" splitindex="true" use="true" version="true">
 <link href="http://www.jfree.org/jfreechart/api/javadoc"/>
-<link href="../dist/PerfsonarUI-v0.10/doc/"/>
+<link href="../dist/PerfsonarUI-v${version}/doc/"/>
 <link href="http://ws.apache.org/axis/java/apiDocs"/>
 </javadoc>
 </target>

Modified: branches/perfsonarui/dist/PerfsonarUI-v0.12.zip
===================================================================
(Binary files differ)

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2008-06-22 18:29:30 UTC (rev 4040)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2008-06-22 19:04:58 UTC (rev 4041)
@@ -1,41 +1,48 @@
 
GEANT2,http://stats.geant2.net/perfsonar/RRDMA-access/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
-;CARNet,http://noc-mon.srce.hr:8090,NMWG2v2_netutil,"",utilization,utilization
+CARNet,http://perfsonar.CARNet.hr:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
;Cesnet,http://perfmonc.cesnet.cz:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
 
Cynet,http://leonidas.cynet.ac.cy:8080/perfSONAR-RRD-MA-2.0/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
-;GARR,http://srv4.dir.garr.it:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-GARR-new,http://srv4.dir.garr.it:8080/perfSONAR-RRD-MA-2.2/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+GARR,http://srv4.dir.garr.it:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
GRNET,http://gridmachine.admin.grnet.gr:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
+INTERNET2,http://rrdma.net.internet2.edu:8080/perfSONAR_PS/services/snmpMA,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+ISTF-3.0,http://uran.acad.bg:8080/geant2_java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
ISTF-J,http://selena.acad.bg:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
 ;ISTF-P,http://selena.acad.bg:8090,NMWG2v2_netutil,"",utilization,utilization
 
MREN,http://perfsonar.cg.ac.yu:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-PIONIER-RRD,http://rrdma.perfsonar.pionier.net.pl:8080/perfSONAR-RRD-MA-2.2/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,,http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+PIONIER-RRD,http://rrdma.perfsonar.pionier.net.pl:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,,http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
RENATER,http://perfsonar.renater.fr:8080/perfSONAR-RRD-MA-2.2/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
SEEREN,http://admin.seeren.org:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-SWITCH,http://archive.sonar.net.switch.ch:8180/perfSONAR-RRD-MA-2.2/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
+;SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
+SWITCH,http://rrdma.sonar.net.switch.ch:8080/geant2-java-rrd-ma/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
Uninett,http://mi5.uninett.no:8080/perfSONAR-RRD-MA-2.2/services/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
ESnet_PS,http://mea1.es.net:8080/perfSONAR_PS/services/snmpMA,NMWG2v2_netutil,,http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
Fermilab,http://lhcopnmon1-mgm.fnal.gov:8091/perfSONAR_PS/services/snmpMA,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
RedCLARA,http://server2-saopaulo.lan.redclara.net:8085/perfsonar-RRDMA/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
 
RNP,http://rnp-rrd-ma.gt-med.ufsc.br:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
+APAN-JP,http://nms2.jp.apan.net:8080/perfSONAR_PS/services/snmpMA,http://schemas.perfsonar.net/2.0,"",http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0
 
GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated
 
;RIPE,http://gandalf.rrze.uni-erlangen.de:8090/gandalf/Hades/perfSONAR/MA,ippm,,ripe,ripe
-;GEANT-test,http://gandalf.rrze.uni-erlangen.de:6040/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated
+;MDM,http://radagast.x-win.dfn.de:8090/services/MA/HADES/MDM,ippm,,ippm_aggregated,ippm_aggregated
 ;RIPE,http://radagast.x-win.dfn.de:8090/services/MA/RIPE,ippm,,ripe,ripe
-Amsterdam,http://192.87.102.210:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Athens,http://194.177.210.70:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Gent,http://193.191.172.162:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Lisbon,http://193.136.6.23:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Ljubljana,http://193.2.63.2:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Paris,http://193.51.181.9:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Prague,http://195.113.161.91:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Rome,http://193.204.221.82:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Sofia,http://194.141.0.13:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Thessaloniki,http://195.251.213.131:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Tromsoe,http://129.242.2.142:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;Zagreb,http://193.198.229.166:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
-;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
 
+;ARNES_Ljubljana_JRA1,http://193.2.63.2:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;BELNET_Gent_JRA1,http://193.191.172.162:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;CARNET_Zagreb_JRA1,http://193.198.229.166:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;CESNET_Prague_JRA1,http://195.113.161.91:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;FCCN_Lisbon_JRA1,http://193.136.6.23:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;GARR_Bologna_JRA1,http://193.204.221.143:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;GARR_Rome_JRA1,http://193.204.221.82:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;GRNET_Athens_JRA1,http://194.177.210.70:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;GRNET_Thessaloniki_JRA1,http://195.251.213.131:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;Hungarnet_Budapest_JRA1,http://152.66.116.81:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;ISTF_Sofia_JRA1,http://194.141.0.13:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;RENATER_Paris_JRA1,http://193.51.181.9:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;SURFNet_Amsterdam_JRA1,http://192.87.102.210:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;PSNC_Poznan_JRA1,http://212.191.227.58:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+;UNINet_Tromsoe_JRA1,http://129.242.2.142:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
+PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/xml-ls/services/LookupService,ls,"",ls,ls
+BREN-LS,http://uran.acad.bg:8080/XML-LS/services/LookupService,ls,"",ls,ls
+GARR-LS,http://perfsonar1.dir.garr.it:8080/xml-ls/,ls,"",ls,ls
+SWITCH-LS,http://ls.sonar.net.switch.ch:8080/xml-ls/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
-SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma/services/FlowsaMeasurementArchiveService,flowsa,"",flowsa,flowsa
+;Telnet-SSH,http://mdm-1.par.fr.geant2.net:8090/geant2-java-sshtelnet-mp/services/TelnetSSH,lg,",lg,lg
 
+PIONIER-globalLS,http://loco4.man.poznan.pl:8080/xml-ls-global/services/LookupService,gls,"",ls,ls
\ No newline at end of file