perfsonar-dev - perfsonar: r4038 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui/ui
Subject: perfsonar development work
List archive
perfsonar: r4038 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui/ui
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4038 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui/ui
- Date: Sun, 22 Jun 2008 08:00:17 -0400
Author: nina
Date: 2008-06-22 08:00:17 -0400 (Sun, 22 Jun 2008)
New Revision: 4038
Modified:
branches/perfsonarui/ant/build.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
Log:
version update to 0.12
Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml 2008-06-21 23:54:38 UTC (rev 4037)
+++ branches/perfsonarui/ant/build.xml 2008-06-22 12:00:17 UTC (rev 4038)
@@ -22,7 +22,7 @@
-->
<project basedir="../" default="all" name="perfsonar">
- <property name="version" value="0.11" />
+ <property name="version" value="0.12" />
<!-- compile options -->
<property name="build.sysclasspath" value="ignore" />
<property name="build.compiler" value="modern" />
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2008-06-21 23:54:38 UTC (rev 4037)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2008-06-22 12:00:17 UTC (rev 4038)
@@ -2,11 +2,11 @@
Main-Class: org.perfsonar.perfsonarui.ui.PerfSonarApp
Class-Path: jars/ui/swing-layout-1.0.jar jars/axis/saaj.jar
jars/axis/axis.jar jars/axis/axis-ant.jar jars/axis/commons-discovery-0.2.jar
jars/axis/commons-logging-1.0.4.jar jars/axis/jaxrpc.jar
jars/axis/log4j-1.2.15.jar jars/axis/wsdl4j-1.5.1.jar jars/xml/activation.jar
jars/xml/mail.jar jars/xml/jdom.jar jars/ui/jcommon-1.0.10.jar
jars/ui/jfreechart-1.0.6.jar jars/l2fprod/l2fprod-common-all.jar
jars/xml/commons-cli-1.0.jar jars/dns/dnsjava-2.0.3.jar
jars/axis/codec-1.0.jar jars/axis/bcprov-jdk15-138.jar
jars/axis/edugain-0.6.jar jars/axis/javolution-3.7.jar
jars/axis/joda-time-1.4.jar jars/axis/opensaml1-1.1.jar
jars/axis/opensaml-2.0-TP2-jdk-1.5.jar jars/axis/perfsonar-base-1.0.20080225
jars/axis/sasl-ca-1.0.jar jars/axis/wsdl4j-1.5.1.jar
jars/axis/wss4j-1.5.3.jar jars/axis/xmlsec-1.4.1.jar
jars/axis/xmltooling-1.0-TP2-jdk-1.5.jar jars/xalan/xalan-2.7.0.jar
jars/xalan/xalan-serializer-2.7.0.jar jars/xalan/xercesImpl-2.8.0.jar
jars/xalan/xerces-xml-apis-2.8.0.jar
Specification-Title: perfSonar test application
-Specification-Version: 0.11
+Specification-Version: 0.12
Specification-Vendor: perfsonar.acad.bg
Package-Title: org.perfsonar.perfsonarui
-Package-Version: 0.11
+Package-Version: 0.12
Package-Vendor: acad.bg
Implementation-Title: Perfsonar UI
-Implementation-Version: 0.11e
+Implementation-Version: 0.12
Implementation-Vendor:
\ No newline at end of file
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2008-06-21 23:54:38 UTC (rev 4037)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2008-06-22 12:00:17 UTC (rev 4038)
@@ -54,16 +54,11 @@
import org.perfsonar.perfsonarui.JAXPCheck;
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.flowsa.FlowsaMATab;
-import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
-import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
import org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel;
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.IUserData;
+import org.perfsonar.perfsonarui.plugins.Introspection;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.PerfsonarTabsList;
import org.perfsonar.perfsonarui.ui.actions.ClearAction;
@@ -249,34 +244,35 @@
*/
if (perfsonarTabs.size()==0) {
logger.info("Plugins not found, loading MA and IPPM tabs.");
- IPerfsonarTab tab = new MAPerfsonarModel();
- tab.setParameters(cmdOpts);
- perfsonarTabs.add(tab);
- tab = new IPPMPerfsonarModel();
- tab.setParameters(cmdOpts);
- perfsonarTabs.add(tab);
- tab = new FlowsaMATab();
- tab.setParameters(cmdOpts);
- perfsonarTabs.add(tab);
+ String[] tabs = {
+ "org.perfsonar.perfsonarui.ma.MAPerfsonarModel",
+ "org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel",
+ "org.perfsonar.perfsonarui.flowsa.FlowsaMATab",
+
"org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel",
+ "org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab",
+ "org.perfsonar.perfsonarui.lookingglass.LookingGlassTab"
+ };
- tab = new PerfsonarPlaygroundModel();
- tab.setParameters(cmdOpts);
- perfsonarTabs.add(tab);
+ for (String tabclass : tabs)
+ try {
+ Object object = Introspection.loadCreateObject(tabclass);
+ if (object instanceof IPerfsonarTab) {
+
+ IPerfsonarTab tab = (IPerfsonarTab) object;
+ tab.setParameters(cmdOpts);
+ perfsonarTabs.add(tab);
+ System.out.println(tabclass + " loaded.");
+ } else {
+ System.out.println(tabclass);
+ }
- tab = new BWCTLPerfsonarTab();
- tab.setParameters(cmdOpts);
- perfsonarTabs.add(tab);
- //for testing purposes only
- /*
-
- tab = new LookingGlassTab();
- tab.setParameters(cmdOpts);
- perfsonarTabs.add(tab);
- */
-
-
-
+
+ } catch (Exception x) {
+ x.printStackTrace();
+ logger.error(x);
+ }
+
Collections.sort(perfsonarTabs);
}
- perfsonar: r4038 - in branches/perfsonarui: ant src/org/perfsonar/perfsonarui/ui, svnlog, 06/22/2008
Archive powered by MHonArc 2.6.16.