You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/10/17 19:27:17 UTC
svn commit: r1399356 [3/3] - in /airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/
airavata-client/src/main/java/org/apache/airavata/client/impl/
airavata-client/src/test/java/org/apache/airavata/client/airavata/ commons...
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Wed Oct 17 17:27:13 2012
@@ -40,7 +40,6 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.xml.namespace.QName;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java Wed Oct 17 17:27:13 2012
@@ -24,16 +24,13 @@ package org.apache.airavata.xbaya.ui.dia
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
-import javax.jcr.RepositoryException;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.common.registry.api.user.AuthorizableExistsException;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/ExperimentMenu.java Wed Oct 17 17:27:13 2012
@@ -28,7 +28,7 @@ import javax.swing.AbstractAction;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.registry.RegistryAccesser;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java Wed Oct 17 17:27:13 2012
@@ -35,7 +35,7 @@ import javax.swing.SwingUtilities;
import javax.swing.border.EtchedBorder;
import javax.swing.border.TitledBorder;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.workflow.model.component.ComponentException;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.wf.Workflow;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/NodeGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/NodeGUI.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/NodeGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/NodeGUI.java Wed Oct 17 17:27:13 2012
@@ -407,7 +407,7 @@ public abstract class NodeGUI implements
g.setColor(TEXT_COLOR);
Font oldFont = g.getFont();
- g.setFont(new Font(oldFont.getFontName(),Font.BOLD,oldFont.getSize()));
+ g.setFont(new Font(oldFont.getFontName(),Font.PLAIN,oldFont.getSize()));
Rectangle2D bounds = g.getFontMetrics().getStringBounds(headerText, g);
g.drawString(headerText, (int)(shape.getBounds().getX() + (shape.getBounds().getWidth()-bounds.getWidth())/2),
(int)(shape.getBounds().getY() + (shape.getBounds().getHeight()+bounds.getHeight())/2));
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java Wed Oct 17 17:27:13 2012
@@ -359,16 +359,16 @@ public class RunMenuItem implements Eve
AbstractAction action = new AbstractAction() {
private WorkflowInterpreterLaunchWindow window;
public void actionPerformed(ActionEvent e) {
-// if(engine.getMonitor().isStatus()){
-// if (JOptionPane.showConfirmDialog(null,
-// "A previous workflow execution data needs to be cleared before launching another workflow. Do you wish to continue?",
-// "Run Workflow", JOptionPane.YES_NO_OPTION)==JOptionPane.YES_OPTION){
-// //TODO: add clean up workflow interpretter
+ if(engine.getMonitor().isStatus()){
+ if (JOptionPane.showConfirmDialog(null,
+ "A previous workflow execution data needs to be cleared before launching another workflow. Do you wish to continue?",
+ "Run Workflow", JOptionPane.YES_NO_OPTION)==JOptionPane.YES_OPTION){
+ //TODO: add clean up workflow interpretter - AIRAVATA-609
// cleanup();
-// }else{
-// return;
-// }
-// }
+ }else{
+ return;
+ }
+ }
if (this.window == null) {
this.window = new WorkflowInterpreterLaunchWindow(engine);
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java Wed Oct 17 17:27:13 2012
@@ -22,9 +22,7 @@
package org.apache.airavata.xbaya.ui.monitor;
import java.awt.Color;
-import java.io.IOException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -33,12 +31,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.jcr.RepositoryException;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.workflow.model.graph.ControlPort;
import org.apache.airavata.workflow.model.graph.EPRPort;
import org.apache.airavata.workflow.model.graph.Edge;
@@ -53,17 +48,13 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.ws.WSGraph;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.monitor.MonitorEvent;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
-import org.apache.airavata.xbaya.provenance.WorkflowNodeStatusUpdater;
-import org.apache.airavata.xbaya.provenance.WorkflowStatusUpdater;
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
-import org.apache.airavata.xbaya.util.XBayaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
Modified: airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties Wed Oct 17 17:27:13 2012
@@ -20,16 +20,6 @@
#
#
-# Properties for JCR Registry interface. By default, Apache Jackrabbit is used.
-#
-#jcr.class=org.apache.jackrabbit.core.RepositoryFactoryImpl
-jcr.class=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-org.apache.jackrabbit.repository.uri=http://localhost:8081/rmi
-jcr.user=admin
-jcr.pass=admin
-
-
-#
# Class which implemented Scheduler interface. It will be used to determine a Provider
#
scheduler.class= org.apache.airavata.core.gfac.scheduler.impl.SchedulerImpl
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java?rev=1399356&r1=1399355&r2=1399356&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java Wed Oct 17 17:27:13 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.xbaya.interpreter;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;