You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2011/08/07 16:30:34 UTC
svn commit: r1154709 - in /incubator/airavata/trunk/modules/xbaya-gui: ./
src/main/java/org/apache/airavata/xbaya/monitor/
src/main/java/org/apache/airavata/xbaya/monitor/gui/
Author: smarru
Date: Sun Aug 7 14:30:33 2011
New Revision: 1154709
URL: http://svn.apache.org/viewvc?rev=1154709&view=rev
Log:
Deprecating the support for Karma client as discussed in AIRAVATA-60
Removed:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/KarmaClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/ProvenanceDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/ProvenanceRegisterer.java
Modified:
incubator/airavata/trunk/modules/xbaya-gui/pom.xml
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1154709&r1=1154708&r2=1154709&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Sun Aug 7 14:30:33 2011
@@ -278,16 +278,6 @@
<version>2.6</version>
</dependency>
<dependency>
- <groupId>karma</groupId>
- <artifactId>karma</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>karma</groupId>
- <artifactId>karma_types</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
<groupId>xutil</groupId>
<artifactId>xutil</artifactId>
<version>0.2</version>
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java?rev=1154709&r1=1154708&r2=1154709&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java Sun Aug 7 14:30:33 2011
@@ -32,7 +32,6 @@ import org.apache.airavata.xbaya.XBayaEx
import org.apache.airavata.xbaya.event.Event;
import org.apache.airavata.xbaya.event.Event.Type;
import org.apache.airavata.xbaya.event.EventProducer;
-import org.apache.airavata.xbaya.monitor.KarmaClient.Rate;
import org.xmlpull.infoset.XmlElement;
import xsul5.MLogger;
@@ -116,19 +115,6 @@ public class Monitor extends EventProduc
}
/**
- * @param kermaURL
- * @param workflowInstanceID
- * @param rate
- */
- public synchronized void startKarma(URI kermaURL, URI workflowInstanceID, Rate rate) {
- KarmaClient karma = new KarmaClient(this, kermaURL, workflowInstanceID, rate);
- karma.start();
-
- // Enable/disable some menu items and show the monitor panel.
- sendSafeEvent(new Event(Type.KARMA_STARTED));
- }
-
- /**
* Stops monitoring.
*/
public synchronized void asynchronousStop() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java?rev=1154709&r1=1154708&r2=1154709&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java Sun Aug 7 14:30:33 2011
@@ -58,8 +58,6 @@ public class MonitorMenu implements Even
private JMenuItem resetMenuItem;
- private JMenuItem historyItem;
-
private JMenuItem differenceMenuItem;
/**
@@ -114,7 +112,6 @@ public class MonitorMenu implements Even
this.startMenuItem = createStartItem();
this.stopMenuItem = createStopItem();
this.resetMenuItem = createResetItem();
- this.historyItem = createHistoryItem();
this.differenceMenuItem = createDifferenceItem();
menu.add(this.configMenuItem);
@@ -123,7 +120,6 @@ public class MonitorMenu implements Even
menu.add(this.stopMenuItem);
menu.add(this.resetMenuItem);
menu.addSeparator();
- menu.add(this.historyItem);
menu.addSeparator();
menu.add(this.differenceMenuItem);
return menu;
@@ -199,22 +195,6 @@ public class MonitorMenu implements Even
return item;
}
- private JMenuItem createHistoryItem() {
- JMenuItem item = new JMenuItem("Load History");
- item.setMnemonic(KeyEvent.VK_H);
- item.addActionListener(new AbstractAction() {
- private ProvenanceDialog window;
-
- public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new ProvenanceDialog(MonitorMenu.this.engine);
- }
- this.window.show();
- }
- });
- return item;
- }
-
private JMenuItem createDifferenceItem() {
JMenuItem item = new JMenuItem("Create Difference");
item.setMnemonic(KeyEvent.VK_D);