perfsonar-dev - perfsonar: r2866 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/config src/org/perfsonar/perfsonarui/lookingglass src/org/perfsonar/perfsonarui/ui
Subject: perfsonar development work
List archive
perfsonar: r2866 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/config src/org/perfsonar/perfsonarui/lookingglass src/org/perfsonar/perfsonarui/ui
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2866 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/config src/org/perfsonar/perfsonarui/lookingglass src/org/perfsonar/perfsonarui/ui
- Date: Tue, 25 Sep 2007 11:59:07 -0400
Author: nina
Date: 2007-09-25 11:59:06 -0400 (Tue, 25 Sep 2007)
New Revision: 2866
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MANIFEST_LG_plugin.MFT
Modified:
branches/perfsonarui/ant/build.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
Log:
a very basic skeleton for Looking glass plugin
Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml 2007-09-24 12:00:07 UTC (rev 2865)
+++ branches/perfsonarui/ant/build.xml 2007-09-25 15:59:06 UTC (rev 2866)
@@ -2,7 +2,7 @@
<!--
This is the build file for PerfsonarUI application http://perfsonar.acad.bg
-Copyright perfsonar.acad.bg (C) 2005-2007
+Copyright perfsonar.acad.bg (C) 2005-2007
Contact:
This program is free software; you can redistribute it and/or
@@ -21,13 +21,13 @@
-->
<project basedir="../" default="all" name="perfsonar">
-
+
<property name="version" value="0.10" />
<!-- compile options -->
<property name="build.sysclasspath" value="ignore" />
<property name="build.compiler" value="modern" />
<property name="debug" value="off" />
- <property name="deprecation" value="on" />
+ <property name="deprecation" value="off" />
<property name="optimization" value="on" />
<!-- Properties need to be setup !!!!!! -->
@@ -35,22 +35,22 @@
<property name="dist" value="dist" />
<property name="sourcedist.dir" value="sourcedist" />
<property name="appdist.dir" value ="${dist}/PerfsonarUI-v${version}" />
-
- <property name="src" value="src" />
- <property name="ant" value="ant" />
- <property name="data" value="data" />
+
+ <property name="src" value="src" />
+ <property name="ant" value="ant" />
+ <property name="data" value="data" />
<property name="build" value="build" />
<property name="lib" value="jars" />
-
+
<!-- Thawte freemail cert - used by sign task -->
<property name="keystore" value="/src/certificates/keystore/keystore.ks"
/>
-
+
<!-- Ant will ask for the alias and password
<property name="alias" value="xxx" />
- <property name="storepass" value="xxxx" />
+ <property name="storepass" value="xxxx" />
-->
<path id="classpath">
-
+
<fileset dir="./jars/axis/">
<include name="*.jar"/>
</fileset>
@@ -62,11 +62,11 @@
</fileset>
<fileset dir="./jars/l2fprod/">
<include name="*.jar"/>
- </fileset>
+ </fileset>
<fileset dir="./jars/dns/">
<include name="*.jar"/>
- </fileset>
-
+ </fileset>
+
<!--
<fileset dir="C:\Program Files\Apache Software Foundation\Tomcat
5.5\webapps\axis\WEB-INF\lib">
<include name="*.jar"/>
@@ -83,11 +83,11 @@
<mkdir dir="${appdist.dir}" />
<mkdir dir="${appdist.dir}/bin" />
<mkdir dir="${appdist.dir}/bin/ext" />
- <mkdir dir="${appdist.dir}/src" />
- <mkdir dir="${appdist.dir}/doc" />
+ <mkdir dir="${appdist.dir}/src" />
+ <mkdir dir="${appdist.dir}/doc" />
</target>
-
+
<target name="init" depends="setupBuildDir">
<tstamp/>
</target>
@@ -115,21 +115,21 @@
<target id="all" name="all" depends="appdist">
</target>
-
+
<target id="dist" name="dist" depends="build, plugins">
- <jar jarfile="${appdist.dir}/bin/perfSonarApp.jar" compress="true"
+ <jar jarfile="${appdist.dir}/bin/perfSonarApp.jar" compress="true"
manifest="${src}/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT" >
-
+
<fileset dir="${build}">
- <includesfile name="${src}/app.classes" />
- <includesfile name="${src}/ui.classes" />
- <includesfile name="${src}/perfsonarui.classes" />
-
+ <includesfile name="${src}/app.classes" />
+ <includesfile name="${src}/ui.classes" />
+ <includesfile name="${src}/perfsonarui.classes" />
+
</fileset>
<fileset dir="${src}">
- <includesfile name="${src}/resources.files" />
- </fileset>
+ <includesfile name="${src}/resources.files" />
+ </fileset>
</jar>
<!--
<signjar jar="${appdist.dir}/bin/perfSonarApp.jar"
@@ -138,24 +138,24 @@
keypass="${storepass}"/>
-->
</target>
-
+
<target id="plugin-demo" name="plugin-demo" depends="build">
<!-- demo -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-demo.jar" compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-demo.jar" compress="true"
manifest="${src}/org/perfsonar/perfsonarui/demo/MANIFEST_DEMO_plugin.MFT" >
-
+
<fileset dir="${build}">
- <includesfile name="${src}/plugins.demo.classes" />
+ <includesfile name="${src}/plugins.demo.classes" />
</fileset>
</jar>
- </target>
+ </target>
<target id="plugins" name="plugins" depends="build">
<!-- MA -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-ma.jar" compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-ma.jar" compress="true"
manifest="${src}/org/perfsonar/perfsonarui/ma/MANIFEST_MA_plugin.MFT" >
-
+
<fileset dir="${build}">
- <includesfile name="${src}/plugins.ma.classes" />
+ <includesfile name="${src}/plugins.ma.classes" />
</fileset>
</jar>
<!--
@@ -165,13 +165,13 @@
keypass="${storepass}"/>
-->
<!-- ippm -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-ippm.jar"
compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-ippm.jar"
compress="true"
manifest="${src}/org/perfsonar/perfsonarui/ippm/MANIFEST_IPPM_plugin.MFT" >
-
+
<fileset dir="${build}">
- <includesfile name="${src}/plugins.ippm.classes" />
+ <includesfile name="${src}/plugins.ippm.classes" />
</fileset>
- </jar>
+ </jar>
<!--
<signjar jar="${appdist.dir}/bin/ext/plugins-ippm.jar"
keystore="${keystore}"
@@ -179,68 +179,71 @@
keypass="${storepass}"/>
-->
<!-- playground -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-playground.jar"
compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-playground.jar"
compress="true"
manifest="${src}/org/perfsonar/perfsonarui/playground/MANIFEST_PLAYGROUND_plugin.MFT"
>
-
+
<fileset dir="${build}">
- <includesfile
name="${src}/plugins.playground.classes" />
+ <includesfile
name="${src}/plugins.playground.classes" />
</fileset>
- </jar>
+ </jar>
<!--
<signjar
jar="${appdist.dir}/bin/ext/plugins-playground.jar"
keystore="${keystore}"
alias="${alias}"
storepass="${storepass}"
keypass="${storepass}"/>
-->
-
+
<!-- flow selection and aggregation MA client -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-flowsa.jar"
compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-flowsa.jar"
compress="true"
manifest="${src}/org/perfsonar/perfsonarui/flowsa/MANIFEST_FLOWSA_plugin.MFT"
>
-
+
<fileset dir="${build}">
- <includesfile name="${src}/plugins.flowsa.classes" />
+ <includesfile name="${src}/plugins.flowsa.classes" />
</fileset>
- </jar>
- <!--
- <signjar
jar="${appdist.dir}/bin/ext/plugins-flowsa.jar"
-
keystore="${keystore}"
-
alias="${alias}" storepass="${storepass}"
-
keypass="${storepass}"/>
- -->
-
-
+ </jar>
+
+ <!-- looking glass client -->
+ <jar
jarfile="${appdist.dir}/bin/ext/plugins-lookingglass.jar" compress="true"
+
manifest="${src}/org/perfsonar/perfsonarui/lookingglass/MANIFEST_LG_plugin.MFT"
>
+
+ <fileset dir="${build}">
+ <includesfile
name="${src}/plugins.lookingglass.classes" />
+ </fileset>
+ </jar>
+
+
<!-- linkstatus -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-linkstatus.jar"
compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-linkstatus.jar"
compress="true"
manifest="${src}/org/perfsonar/perfsonarui/linkstatus/MANIFEST_LINKSTATUS_plugin.MFT"
>
-
+
<fileset dir="${build}">
- <includesfile
name="${src}/plugins.linkstatus.classes" />
+ <includesfile
name="${src}/plugins.linkstatus.classes" />
</fileset>
- </jar>
+ </jar>
<!--
<signjar
jar="${appdist.dir}/bin/ext/plugins-linkstatus.jar"
keystore="${keystore}"
alias="${alias}"
storepass="${storepass}"
keypass="${storepass}"/>
-->
-
+
<!-- links -->
- <jar jarfile="${appdist.dir}/bin/ext/plugins-links.jar"
compress="true"
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-links.jar"
compress="true"
manifest="${src}/org/perfsonar/perfsonarui/links/MANIFEST_LINKS_plugin.MFT" >
-
+
<fileset dir="${build}">
- <includesfile name="${src}/plugins.links.classes" />
+ <includesfile name="${src}/plugins.links.classes" />
</fileset>
- </jar>
+ </jar>
<!--
<signjar jar="${appdist.dir}/bin/ext/plugins-links.jar"
keystore="${keystore}"
alias="${alias}"
storepass="${storepass}"
keypass="${storepass}"/>
-->
-
+
</target>
-
+
<target id="sign" name="sign" >
<input addproperty="alias" message="Enter Keystore
alias"/>
<input addproperty="storepass" message="Enter Keystore
password"/>
@@ -250,8 +253,8 @@
<signjar jar="${appdist.dir}/bin/perfSonarApp.jar"
keystore="${keystore}"
alias="${alias}"
storepass="${storepass}"
- keypass="${storepass}"/>
-
+ keypass="${storepass}"/>
+
<!--
<signjar
jar="${appdist.dir}/bin/ext/plugins-ma.jar"
keystore="${keystore}"
@@ -260,60 +263,60 @@
<signjar jar="${appdist.dir}/bin/ext/plugins-ippm.jar"
keystore="${keystore}"
alias="${alias}"
storepass="${storepass}"
-
keypass="${storepass}"/>
-
+
keypass="${storepass}"/>
+
<signjar jar="${appdist.dir}/bin/ext/plugins-playground.jar"
keystore="${keystore}"
alias="${alias}"
storepass="${storepass}"
-
keypass="${storepass}"/>
-
+
keypass="${storepass}"/>
+
-->
-
- <signjar
+
+ <signjar
keystore="${keystore}"
alias="${alias}" storepass="${storepass}"
keypass="${storepass}"
lazy="true" >
-
+
<fileset dir="${appdist.dir}/bin/ext"
includes="**/*.jar" />
- </signjar>
+ </signjar>
<!-- Lazy signing is used, so the files will only be signed if they
are not already signed -->
- <signjar
+ <signjar
keystore="${keystore}"
alias="${alias}" storepass="${storepass}"
keypass="${storepass}"
lazy="true" >
-
+
<fileset dir="${appdist.dir}/bin/jars"
includes="**/*.jar" />
</signjar>
-
+
</target>
-
+
<!-- srcdist target -->
<target name="srcdist" description="Source distribution.">
<mkdir dir="${appdist.dir}/src" />
<tstamp/>
<property name="package" value
="${ant.project.name}-source-${version}_${DSTAMP}.zip" />
-
+
<copy todir="${sourcedist.dir}/${src}">
<fileset dir="${src}" includes="*.javafiles" />
<fileset dir="${src}" includes="*.classes" />
<fileset dir="${src}" includes="*.set" />
<fileset dir="${src}" includes="**/*" />
- </copy>
+ </copy>
<copy todir="${sourcedist.dir}/${ant}">
<fileset dir="${ant}" includes="build.xml" />
<fileset dir="${ant}" includes="javadoc.xml" />
- </copy>
+ </copy>
<copy todir="${sourcedist.dir}/${data}">
<fileset dir="${data}" includes="**/*" />
- </copy>
+ </copy>
<copy todir="${sourcedist.dir}">
<fileset dir="." includes="MA.conf" />
- </copy>
+ </copy>
<mkdir dir="${sourcedist.dir}/jars" />
<mkdir dir="${sourcedist.dir}/jars/axis" />
<mkdir dir="${sourcedist.dir}/jars/ui" />
@@ -321,61 +324,61 @@
<mkdir dir="${sourcedist.dir}/jars/dns" />
<zip zipfile="${appdist.dir}/src/${package}"
basedir="${sourcedist.dir}" />
<!--tar tarfile="${appdist.dir}/${package}"
basedir="${sourcedist.dir}" compression="gzip" /-->
- <echo message="Source distribution ${srcDist} has been
created." />
- <delete dir="${sourcedist.dir}"/>
+ <echo message="Source distribution ${srcDist} has been
created." />
+ <delete dir="${sourcedist.dir}"/>
</target>
<!-- appdist target -->
<target name="appdist" description="Application distribution."
depends="dist,srcdist">
<tstamp/>
-
-
+
+
<property name="package_all" value ="${appdist.dir}.zip" />
<mkdir dir="${appdist.dir}" />
<mkdir dir="${appdist.dir}/bin" />
<mkdir dir="${appdist.dir}/src" />
- <mkdir dir="${appdist.dir}/doc" />
-
+ <mkdir dir="${appdist.dir}/doc" />
+
<copy todir="${appdist.dir}/bin">
<fileset dir="." includes="MA.conf" />
- </copy>
+ </copy>
<mkdir dir="${appdist.dir}/bin/jars" />
<mkdir dir="${appdist.dir}/bin/jars/axis" />
<mkdir dir="${appdist.dir}/bin/jars/ui" />
<mkdir dir="${appdist.dir}/bin/jars/xml" />
- <mkdir dir="${appdist.dir}/bin/jars/l2fprod" />
- <mkdir dir="${appdist.dir}/bin/jars/dns" />
-
+ <mkdir dir="${appdist.dir}/bin/jars/l2fprod" />
+ <mkdir dir="${appdist.dir}/bin/jars/dns" />
+
<copy todir="${appdist.dir}/bin/jars">
<fileset dir="${lib}" includes="**/*" />
- </copy>
-
+ </copy>
+
<copy todir="${appdist.dir}/bin">
<fileset
dir="${src}/org/perfsonar/perfsonarui/mapprojection" includes="map.jpg" />
</copy>
-
+
<!--tar tarfile="${package_all}" basedir="${appdist.dir}"
compression="gzip" / -->
<zip zipfile="${package_all}" basedir="${appdist.dir}" />
-
- <echo message="Application distribution ${appdist.dir} has
been created." />
-
+
+ <echo message="Application distribution ${appdist.dir} has
been created." />
+
</target>
<target name="javadoc">
- <javadoc access="public" author="true"
-
classpath="jars/axis/jaxrpc.jar;jars/ui/jfreechart-1.0.6.jar;jars/ui/jcommon-1.0.10.jar;jars/axis/axis-ant.jar;jars/axis/commons-discovery-0.2.jar;jars/axis/log4j-1.2.8.jar;jars/axis/commons-logging-1.0.4.jar;jars/xml/mail.jar;jars/axis/axis.jar;jars/xml/activation.jar;jars/axis/saaj.jar;jars/xml/commons-cli-1.0.jar;jars/l2fprod/l2fprod-common-all.jar;jars/ui/junit.jar;C:\nina\bin\eclipse\plugins\org.junit_3.8.1\junit.jar;jars/axis/wsdl4j-1.5.1.jar;jars/xml/jdom.jar"
- destdir="doc"
- doctitle="PerfsonarUI " nodeprecated="false"
- nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false"
-
packagenames="org.perfsonar.perfsonarui.ippm,org.perfsonar.perfsonarui.ma.ui.actions,org.perfsonar.perfsonarui.ui.actions,org.perfsonar.perfsonarui.plugins,org.perfsonar.perfsonarui,org.perfsonar.perfsonarui.ma,org.perfsonar.perfsonarui.ui,org.perfsonar.perfsonarui.test,org.perfsonar.perfsonarui.ippm.ui.panels,org.perfsonar.perfsonarui.test.misc,org.perfsonar.perfsonarui.ma.ui.panels,org.perfsonar.perfsonarui.ui.panels,org.perfsonar.perfsonarui.vertexedgegraph,org.perfsonar.perfsonarui.mapprojection,org.perfsonar.perfsonarui.links,org.perfsonar.perfsonarui.linkstatus"
- source="1.5"
+ <javadoc access="public" author="true"
+
classpath="jars/axis/jaxrpc.jar;jars/ui/jfreechart-1.0.6.jar;jars/ui/jcommon-1.0.10.jar;jars/axis/axis-ant.jar;jars/axis/commons-discovery-0.2.jar;jars/axis/log4j-1.2.8.jar;jars/axis/commons-logging-1.0.4.jar;jars/xml/mail.jar;jars/axis/axis.jar;jars/xml/activation.jar;jars/axis/saaj.jar;jars/xml/commons-cli-1.0.jar;jars/l2fprod/l2fprod-common-all.jar;jars/ui/junit.jar;C:\nina\bin\eclipse\plugins\org.junit_3.8.1\junit.jar;jars/axis/wsdl4j-1.5.1.jar;jars/xml/jdom.jar"
+ destdir="doc"
+ doctitle="PerfsonarUI " nodeprecated="false"
+ nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false"
+
packagenames="org.perfsonar.perfsonarui.ippm,org.perfsonar.perfsonarui.ma.ui.actions,org.perfsonar.perfsonarui.ui.actions,org.perfsonar.perfsonarui.plugins,org.perfsonar.perfsonarui,org.perfsonar.perfsonarui.ma,org.perfsonar.perfsonarui.ui,org.perfsonar.perfsonarui.test,org.perfsonar.perfsonarui.ippm.ui.panels,org.perfsonar.perfsonarui.test.misc,org.perfsonar.perfsonarui.ma.ui.panels,org.perfsonar.perfsonarui.ui.panels,org.perfsonar.perfsonarui.vertexedgegraph,org.perfsonar.perfsonarui.mapprojection,org.perfsonar.perfsonarui.links,org.perfsonar.perfsonarui.linkstatus"
+ source="1.5"
sourcepath="src" splitindex="true" use="true" version="true"/>
- <zip zipfile="${appdist.dir}-javadoc.zip" basedir="doc" />
- </target>
+ <zip zipfile="${appdist.dir}-javadoc.zip" basedir="doc" />
+ </target>
- <target id="info" name="info" depends="check">
+ <target id="info" name="info" depends="check">
<!-- Gives i nformation about the building process. -->
<echo message="Platform:" />
<echo message=" OS: ${os.name}" />
@@ -400,14 +403,14 @@
<echo message="" />
<echo message="Targets:" />
<echo message="info: this page" />
- <echo message="clean: cleanup" />
- <echo message="dist: PerfsonaApp.jar, plugins jars" />
- <echo message="appdist(default): PerfsonaApp.jar,
plugins jars, source distribution" />
- <echo message="srcdist: Source distribution" />
- <echo message="javadoc: Javadoc" />
+ <echo message="clean: cleanup" />
+ <echo message="dist: PerfsonaApp.jar, plugins jars" />
+ <echo message="appdist(default): PerfsonaApp.jar,
plugins jars, source distribution" />
+ <echo message="srcdist: Source distribution" />
+ <echo message="javadoc: Javadoc" />
</target>
- <target id="help" name="help" >
+ <target id="help" name="help" >
<echo message="Usage::" />
<echo message="ant all (default) - compiles and builds everything.
The distribution is in dist/PerfsonarUI-v${version} folder. " />
<echo message="ant appdist - builds binary and source
distribution (included in default build)" />
@@ -415,10 +418,10 @@
<echo message="ant plugins - builds MA , IPPM and Playground
plugins (included in default build)" />
<echo message="ant plugin-demo - builds demo plugin (not included
in default build)" />
<echo message="ant clean - deletes compiled classes" />
- <echo message="ant help - this screen" />
+ <echo message="ant help - this screen" />
<echo message="ant -buildfile javadoc.xml - builds javadoc (to be
found in dist/PerfsonarUI-v${version}/doc folder" />
</target>
-
+
<target id="checkPlatforms" name="checkPlatforms">
<condition property="isMacOsX">
<and>
@@ -427,7 +430,7 @@
</and>
</condition>
</target>
-
+
<target id="check" name="check" depends="checkPlatforms">
<available classname="junit.framework.TestCase"
classpath="${ant.home}/lib/junit.jar"
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
2007-09-24 12:00:07 UTC (rev 2865)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
2007-09-25 15:59:06 UTC (rev 2866)
@@ -1,20 +1,21 @@
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
;Cesnet,http://perfmonc.cesnet.cz:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-GARR,http://srv4.dir.garr.it: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
GRNET,http://gridmachine.admin.grnet.gr:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
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://loco4.man.poznan.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-SQL,http://loco4.man.poznan.pl:8100/axis/services/MeasurementArchiveService,NMWG2v2_netutil,PIONIER-Public,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
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/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-;Uninett,http://mi6.uninett.no:8090,NMWG2v2_netutil,UNINETT-uninett,ifInOctets,ifOutOctets
-ESnet,http://mea1.es.net:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,"",utilization,utilization
-;Fermilab,http://lhcopnmon1-mgm.fnal.gov: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
+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
GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated
@@ -33,3 +34,7 @@
;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
+;REDIRIS-Test-AS,http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService,as,"",as,as
+;TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/axis/services/TelnetSSH,lg,"",lg,lg
\ No newline at end of file
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MANIFEST_LG_plugin.MFT
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2007-09-24 12:00:07 UTC (rev 2865)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2007-09-25 15:59:06 UTC (rev 2866)
@@ -49,9 +49,11 @@
import org.perfsonar.perfsonarui.AbstractMARequest;
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
import org.perfsonar.perfsonarui.demo.DemoPlugin;
import org.perfsonar.perfsonarui.demo.DemoPluginMainPanel;
import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
+import org.perfsonar.perfsonarui.lookingglass.LookingGlassTab;
import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
import org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel;
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -247,6 +249,17 @@
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
+ /*
+ tab = new BWCTLPerfsonarTab();
+ tab.setParameters(cmdOpts);
+ perfsonarTabs.add(tab);
+ */
+ //for testing purposes only
+ tab = new LookingGlassTab();
+ tab.setParameters(cmdOpts);
+ perfsonarTabs.add(tab);
+
+
Collections.sort(perfsonarTabs);
}
- perfsonar: r2866 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/config src/org/perfsonar/perfsonarui/lookingglass src/org/perfsonar/perfsonarui/ui, svnlog, 09/25/2007
Archive powered by MHonArc 2.6.16.