You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/31 21:56:46 UTC
svn commit: r1195667 [9/12] - in /incubator/airavata/trunk/modules:
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
commons/registry-api/src/main/java/org...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java Mon Oct 31 20:56:37 2011
@@ -19,107 +19,107 @@
*
*/
-package org.apache.airavata.xbaya.interpretor;
-
-import java.net.URI;
-import java.util.List;
-
-import org.apache.airavata.common.utils.StringUtil;
-import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
-import org.apache.airavata.xbaya.jython.lib.StandaloneServiceNotificationSender;
-import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.addressing.EndpointReference;
-import org.python.core.PyObject;
-
-public class StandaloneNotificationSender implements WorkflowNotifiable {
-
- private Workflow workflow;
- private URI workflowID;
-
- public StandaloneNotificationSender(String topic, Workflow workflow) {
- this.workflow = workflow;
- this.workflowID = URI.create(StringUtil.convertToJavaIdentifier(topic));
- }
-
- @Override
- public EndpointReference getEventSink() {
- return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
- }
-
- @Override
- public void workflowStarted(PyObject[] args, String[] keywords) {
- List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
- for (InputNode inputNode : inputs) {
- inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
-
- }
-
- @Override
- public void workflowStarted(Object[] args, String[] keywords) {
- List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
- for (InputNode inputNode : inputs) {
- inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
- }
-
- @Override
- public void workflowFinished(Object[] args, String[] keywords) {
- List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
- for (OutputNode outputNode : outputs) {
- outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- }
-
- @Override
- public void sendingPartialResults(Object[] args, String[] keywords) {
- // noop
-
- }
-
- @Override
- public void workflowFinished(PyObject[] args, String[] keywords) {
- List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
- for (OutputNode outputNode : outputs) {
- outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- }
-
- @Override
- public void workflowTerminated() {
- // noop
-
- }
-
- @Override
- public void workflowFailed(String message) {
- // noop
-
- }
-
- @Override
- public void workflowFailed(Throwable e) {
- // noop
-
- }
-
- @Override
- public void workflowFailed(String message, Throwable e) {
- // noop
-
- }
-
- @Override
- public ServiceNotifiable createServiceNotificationSender(String nodeID) {
- return new StandaloneServiceNotificationSender(this.workflow, this.workflowID);
- }
-
-}
+package org.apache.airavata.xbaya.interpretor;
+
+import java.net.URI;
+import java.util.List;
+
+import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.xbaya.graph.system.OutputNode;
+import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
+import org.apache.airavata.xbaya.jython.lib.StandaloneServiceNotificationSender;
+import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
+import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
+import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.addressing.EndpointReference;
+import org.python.core.PyObject;
+
+public class StandaloneNotificationSender implements WorkflowNotifiable {
+
+ private Workflow workflow;
+ private URI workflowID;
+
+ public StandaloneNotificationSender(String topic, Workflow workflow) {
+ this.workflow = workflow;
+ this.workflowID = URI.create(StringUtil.convertToJavaIdentifier(topic));
+ }
+
+ @Override
+ public EndpointReference getEventSink() {
+ return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
+ }
+
+ @Override
+ public void workflowStarted(PyObject[] args, String[] keywords) {
+ List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
+ for (InputNode inputNode : inputs) {
+ inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+
+ }
+
+ @Override
+ public void workflowStarted(Object[] args, String[] keywords) {
+ List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
+ for (InputNode inputNode : inputs) {
+ inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+ }
+
+ @Override
+ public void workflowFinished(Object[] args, String[] keywords) {
+ List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
+ for (OutputNode outputNode : outputs) {
+ outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ }
+
+ @Override
+ public void sendingPartialResults(Object[] args, String[] keywords) {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFinished(PyObject[] args, String[] keywords) {
+ List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
+ for (OutputNode outputNode : outputs) {
+ outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ }
+
+ @Override
+ public void workflowTerminated() {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFailed(String message) {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFailed(Throwable e) {
+ // noop
+
+ }
+
+ @Override
+ public void workflowFailed(String message, Throwable e) {
+ // noop
+
+ }
+
+ @Override
+ public ServiceNotifiable createServiceNotificationSender(String nodeID) {
+ return new StandaloneServiceNotificationSender(this.workflow, this.workflowID);
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java Mon Oct 31 20:56:37 2011
@@ -30,13 +30,13 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.UUID;
-import org.apache.airavata.common.utils.Pair;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.component.ws.WSComponentPort;
import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.security.SecurityUtil;
+import org.apache.airavata.common.utils.Pair;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowClient;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowContext;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Mon Oct 31 20:56:37 2011
@@ -155,7 +155,7 @@ public class WorkflowInterpreter {
private boolean isoffline = false;
- private PredicatedTaskRunner provenanceWriter;
+ private PredicatedTaskRunner provenanceWriter;
public WorkflowInterpreter(XBayaConfiguration configuration, String topic, Workflow workflow, String username,
String password) {
@@ -217,7 +217,7 @@ public class WorkflowInterpreter {
/**
*
* Constructs a WorkflowInterpreter.
- *
+ *
* @param engine
* @param topic
* @param workflow
@@ -239,9 +239,10 @@ public class WorkflowInterpreter {
this.topic = topic;
// testing
- if (this.configuration.isCollectProvenance()) {
- provenanceWriter = new PredicatedTaskRunner(1);
- }
+
+ if (this.configuration.isCollectProvenance()) {
+ provenanceWriter = new PredicatedTaskRunner(1);
+ }
}
@@ -392,7 +393,7 @@ public class WorkflowInterpreter {
* @throws MonitorException
*/
public void cleanup() throws MonitorException {
- if (this.configuration.isCollectProvenance()) {
+ if(this.configuration.isCollectProvenance()){
this.provenanceWriter.shutDown();
}
if (this.mode == GUI_MODE) {
@@ -1319,44 +1320,43 @@ public class WorkflowInterpreter {
return null;
}
- /**
- * @param node
- * @throws XBayaException
- * @throws java.io.IOException
- */
- private void readProvenance(Node node) {
-
- try {
- List<DataPort> inputPorts = node.getInputPorts();
- Pair<String, String>[] inputs = new Pair[inputPorts.size()];
- for (int i = 0; i < inputPorts.size(); ++i) {
- inputs[i] = new Pair<String, String>(inputPorts.get(i).getName(), XBayaUtil.findInputFromPort(
- inputPorts.get(i), this.invokerMap).toString());
- }
-
- Object result = new ProvenanceReader().read(node.getID(), inputs);
- if (result != null) {
- SystemComponentInvoker invoker = new SystemComponentInvoker();
- invoker.addOutput(node.getID(), result);
- this.invokerMap.put(node, invoker);
- node.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
- } catch (Exception e) {
- throw new XBayaRuntimeException(e);
- }
-
- }
+ /**
+ * @param node
+ * @throws XBayaException
+ * @throws java.io.IOException
+ */
+ private void readProvenance(Node node) {
- /**
- * @param node
- * @throws XBayaException
- */
- private void writeProvenanceLater(Node node) throws XBayaException {
+ try {
+ List<DataPort> inputPorts = node.getInputPorts();
+ Pair<String, String>[] inputs = new Pair[inputPorts.size()];
+ for (int i =0; i<inputPorts.size(); ++i) {
+ inputs[i] = new Pair<String, String>(inputPorts.get(i).getName(), XBayaUtil.findInputFromPort(inputPorts.get(i), this.invokerMap).toString());
+ }
+
+ Object result = new ProvenanceReader().read(node.getID(), inputs);
+ if(result != null){
+ SystemComponentInvoker invoker = new SystemComponentInvoker();
+ invoker.addOutput(node.getID(), result);
+ this.invokerMap.put(node, invoker);
+ node.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+ } catch (Exception e) {
+ throw new XBayaRuntimeException(e);
+ }
+
+ }
+
+ /**
+ * @param node
+ * @throws XBayaException
+ */
+ private void writeProvenanceLater(Node node) throws XBayaException {
- if (node instanceof ForEachNode) {
- node = XBayaUtil.findEndForEachFor((ForEachNode) node);
- }
- this.provenanceWriter.scedule(new ProvenanceWrite(node, this.workflow.getName(), invokerMap, this.topic,
- this.configuration.getJcrComponentRegistry().getRegistry()));
- }
+ if(node instanceof ForEachNode){
+ node = XBayaUtil.findEndForEachFor((ForEachNode)node);
+ }
+ this.provenanceWriter.scedule(new ProvenanceWrite(node,
+ this.workflow.getName(), invokerMap, this.topic,this.configuration.getJcrComponentRegistry().getRegistry()));
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Mon Oct 31 20:56:37 2011
@@ -26,7 +26,10 @@ import java.net.URI;
import java.util.LinkedList;
import java.util.List;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.commons.WorkFlowUtils;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.NotificationHandler;
@@ -135,7 +138,6 @@ public class WorkflowInterpretorEventLis
/**
* @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
*/
- @Override
public void handleNotification(String message) {
try {
// String soapBody = WorkFlowUtils.getSoapBodyContent(message);
@@ -312,7 +314,6 @@ public class WorkflowInterpretorEventLis
/**
* @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
*/
- @Override
public void handleNotification(SOAPEnvelope message) {
String soapBody = message.getBody().toString();
this.handleNotification(soapBody);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorStub.java Mon Oct 31 20:56:37 2011
@@ -278,7 +278,6 @@ public class WorkflowInterpretorStub ext
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
- @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -292,7 +291,6 @@ public class WorkflowInterpretorStub ext
}
}
- @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault) error;
@@ -355,14 +353,12 @@ public class WorkflowInterpretorStub ext
}
}
- @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils
.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
- @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -508,7 +504,6 @@ public class WorkflowInterpretorStub ext
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
- @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
LaunchWorkflowResponse.this.serialize(MY_QNAME, factory, xmlWriter);
@@ -518,14 +513,12 @@ public class WorkflowInterpretorStub ext
}
- @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
- @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
@@ -755,7 +748,6 @@ public class WorkflowInterpretorStub ext
* databinding method to get an XML representation of this object
*
*/
- @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
throws org.apache.axis2.databinding.ADBException {
@@ -1210,7 +1202,6 @@ public class WorkflowInterpretorStub ext
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
- @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
LaunchWorkflow.this.serialize(MY_QNAME, factory, xmlWriter);
@@ -1220,14 +1211,12 @@ public class WorkflowInterpretorStub ext
}
- @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
- @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
@@ -1681,7 +1670,6 @@ public class WorkflowInterpretorStub ext
* databinding method to get an XML representation of this object
*
*/
- @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName)
throws org.apache.axis2.databinding.ADBException {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java Mon Oct 31 20:56:37 2011
@@ -22,6 +22,7 @@
package org.apache.airavata.xbaya.invoker;
import java.net.URI;
+import java.util.UUID;
import javax.xml.namespace.QName;
@@ -36,6 +37,7 @@ import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
import xsul.wsdl.WsdlResolver;
import xsul.wsif.WSIFMessage;
+import xsul.xhandler_soap_sticky_header.StickySoapHeaderHandler;
import xsul.xwsif_runtime.WSIFClient;
public class GFacInvoker implements Invoker {
@@ -79,7 +81,6 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setup()
*/
- @Override
public void setup() throws XBayaException {
if (this.gfacURL == null) {
@@ -124,7 +125,6 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getClient()
*/
- @Override
public WSIFClient getClient() {
return this.invoker.getClient();
}
@@ -133,7 +133,6 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#setOperation(java.lang.String)
*/
- @Override
public void setOperation(String operationName) throws XBayaException {
this.invoker.setOperation(operationName);
}
@@ -142,7 +141,6 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#setInput(java.lang.String, java.lang.Object)
*/
- @Override
public void setInput(String name, Object value) throws XBayaException {
this.invoker.setInput(name, value);
}
@@ -150,7 +148,6 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getInputs()
*/
- @Override
public WSIFMessage getInputs() throws XBayaException {
return this.invoker.getInputs();
}
@@ -159,7 +156,6 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#invoke()
*/
- @Override
public boolean invoke() throws XBayaException {
WSIFClient client = invoker.getClient();
@@ -180,7 +176,6 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutputs()
*/
- @Override
public WSIFMessage getOutputs() throws XBayaException {
return this.invoker.getOutputs();
}
@@ -189,7 +184,6 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutput(java.lang.String)
*/
- @Override
public Object getOutput(String name) throws XBayaException {
return this.invoker.getOutput(name);
}
@@ -198,7 +192,6 @@ public class GFacInvoker implements Invo
* @throws XBayaException
* @see org.apache.airavata.xbaya.invoker.Invoker#getFault()
*/
- @Override
public WSIFMessage getFault() throws XBayaException {
return this.invoker.getFault();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java Mon Oct 31 20:56:37 2011
@@ -36,8 +36,8 @@ import java.util.concurrent.TimeoutExcep
import javax.xml.namespace.QName;
-import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
+import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
@@ -156,7 +156,7 @@ public class GenericInvoker implements I
}
/**
- *
+ *
* @param portTypeQName
* @param wsdl
* @param nodeID
@@ -181,7 +181,6 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setup()
*/
- @Override
public void setup() throws XBayaException {
try {
WsdlDefinitions definitions = null;
@@ -258,7 +257,6 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setOperation(java.lang.String)
*/
- @Override
public void setOperation(String operationName) throws XBayaException {
try {
this.invoker.setOperation(operationName);
@@ -283,7 +281,6 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setInput(java.lang.String, java.lang.Object)
*/
- @Override
public void setInput(String name, Object value) throws XBayaException {
try {
if (value instanceof XmlElement) {
@@ -313,7 +310,6 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#invoke()
*/
- @Override
public synchronized boolean invoke() throws XBayaException {
try {
WSIFMessage inputMessage = this.invoker.getInputs();
@@ -322,7 +318,6 @@ public class GenericInvoker implements I
ExecutorService executor = Executors.newSingleThreadExecutor();
this.result = executor.submit(new Callable<Boolean>() {
- @Override
@SuppressWarnings("boxing")
public Boolean call() {
try {
@@ -446,7 +441,6 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#getOutput(java.lang.String)
*/
- @Override
public Object getOutput(String name) throws XBayaException {
try {
waitToFinish();
@@ -478,7 +472,6 @@ public class GenericInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#getOutputs()
*/
- @Override
public WSIFMessage getOutputs() throws XBayaException {
return this.invoker.getOutputs();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java Mon Oct 31 20:56:37 2011
@@ -66,7 +66,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setup()
*/
- @Override
public void setup() throws XBayaException {
try {
WSIFService service = WSIFServiceFactory.newInstance().getService(this.definitions);
@@ -81,7 +80,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getClient()
*/
- @Override
public WSIFClient getClient() {
return this.client;
}
@@ -89,7 +87,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setOperation(java.lang.String)
*/
- @Override
public void setOperation(String operationName) throws XBayaException {
try {
WSIFPort port = this.client.getPort();
@@ -106,7 +103,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setInput(java.lang.String, java.lang.Object)
*/
- @Override
public void setInput(String name, Object value) throws XBayaException {
try {
if (value instanceof XmlElement) {
@@ -130,7 +126,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getInputs()
*/
- @Override
public WSIFMessage getInputs() {
return this.inputMessage;
}
@@ -138,7 +133,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#invoke()
*/
- @Override
public boolean invoke() throws XBayaException {
try {
boolean success = this.operation.executeRequestResponseOperation(this.inputMessage, this.outputMessage,
@@ -153,7 +147,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutputs()
*/
- @Override
public WSIFMessage getOutputs() {
return this.outputMessage;
}
@@ -161,7 +154,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutput(java.lang.String)
*/
- @Override
public Object getOutput(String name) throws XBayaException {
try {
// This code doesn't work when the output is a complex type.
@@ -196,7 +188,6 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getFault()
*/
- @Override
public WSIFMessage getFault() {
return this.faultMessage;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java Mon Oct 31 20:56:37 2011
@@ -64,7 +64,6 @@ public class WorkflowInvokerWrapperForGF
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#invoke()
*/
- @Override
public synchronized boolean invoke() throws XBayaException {
try {
@@ -74,7 +73,6 @@ public class WorkflowInvokerWrapperForGF
ExecutorService executor = Executors.newSingleThreadExecutor();
this.result = executor.submit(new Callable<Boolean>() {
- @Override
@SuppressWarnings("boxing")
public Boolean call() {
try {
@@ -204,7 +202,6 @@ public class WorkflowInvokerWrapperForGF
}
}
- @Override
public Object getOutput(String name) throws XBayaException {
try {
waitToFinish();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/factory/InvokerFactory.java Mon Oct 31 20:56:37 2011
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.invoke
import javax.xml.namespace.QName;
-import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
+import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.invoker.AsynchronousInvoker;
import org.apache.airavata.xbaya.invoker.GFacInvoker;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java Mon Oct 31 20:56:37 2011
@@ -263,7 +263,6 @@ public class JythonRunnerWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute();
}
@@ -271,7 +270,6 @@ public class JythonRunnerWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotifiable.java Mon Oct 31 20:56:37 2011
@@ -19,64 +19,64 @@
*
*/
-package org.apache.airavata.xbaya.jython.lib;
-
-import java.net.URI;
-
-import org.apache.axis2.addressing.EndpointReference;
-
-import xsul.wsif.WSIFMessage;
-
-public interface ServiceNotifiable {
-
- /**
- * @param serviceID
- */
- public abstract void setServiceID(String serviceID);
-
- /**
- * @return The event sink.
- */
- public abstract EndpointReference getEventSink();
-
- /**
- * @return The workflow ID.
- */
- public abstract URI getWorkflowID();
-
- /**
- * @param inputs
- */
- public abstract void invokingService(WSIFMessage inputs);
-
- /**
- * @param outputs
- */
- public abstract void serviceFinished(WSIFMessage outputs);
-
- /**
- * Sends an InvokeServiceFinishedFailed notification message.
- *
- * @param message
- * The message to send
- * @param e
- */
- public abstract void invocationFailed(String message, Throwable e);
-
- /**
- * Sends a receivedFault notification message.
- *
- * @param message
- * The message to send
- */
- @Deprecated
- public abstract void receivedFault(String message);
-
- /**
- * Sends a receivedFault notification message.
- *
- * @param fault
- */
- public abstract void receivedFault(WSIFMessage fault);
-
+package org.apache.airavata.xbaya.jython.lib;
+
+import java.net.URI;
+
+import org.apache.axis2.addressing.EndpointReference;
+
+import xsul.wsif.WSIFMessage;
+
+public interface ServiceNotifiable {
+
+ /**
+ * @param serviceID
+ */
+ public abstract void setServiceID(String serviceID);
+
+ /**
+ * @return The event sink.
+ */
+ public abstract EndpointReference getEventSink();
+
+ /**
+ * @return The workflow ID.
+ */
+ public abstract URI getWorkflowID();
+
+ /**
+ * @param inputs
+ */
+ public abstract void invokingService(WSIFMessage inputs);
+
+ /**
+ * @param outputs
+ */
+ public abstract void serviceFinished(WSIFMessage outputs);
+
+ /**
+ * Sends an InvokeServiceFinishedFailed notification message.
+ *
+ * @param message
+ * The message to send
+ * @param e
+ */
+ public abstract void invocationFailed(String message, Throwable e);
+
+ /**
+ * Sends a receivedFault notification message.
+ *
+ * @param message
+ * The message to send
+ */
+ @Deprecated
+ public abstract void receivedFault(String message);
+
+ /**
+ * Sends a receivedFault notification message.
+ *
+ * @param fault
+ */
+ public abstract void receivedFault(WSIFMessage fault);
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java Mon Oct 31 20:56:37 2011
@@ -19,72 +19,75 @@
*
*/
-package org.apache.airavata.xbaya.jython.lib;
-
-import java.net.URI;
-
-import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.addressing.EndpointReference;
-
-import xsul.wsif.WSIFMessage;
-
-public class StandaloneServiceNotificationSender implements ServiceNotifiable {
-
- private Workflow workflow;
- private String serviceID;
- private URI workflowID;
-
- public StandaloneServiceNotificationSender(Workflow workflow, URI workflowID) {
- this.workflow = workflow;
- this.workflowID = workflowID;
- }
-
- @Override
- public void setServiceID(String serviceID) {
- this.serviceID = serviceID;
- System.out.println(serviceID);
-
- }
-
- @Override
- public EndpointReference getEventSink() {
- return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
- }
-
- @Override
- public URI getWorkflowID() {
- return this.workflowID;
- }
-
- @Override
- public void invokingService(WSIFMessage inputs) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- @Override
- public void serviceFinished(WSIFMessage outputs) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FINISHED.color);
-
- }
-
- @Override
- public void invocationFailed(String message, Throwable e) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
-
- }
-
- @Override
- public void receivedFault(String message) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
-
- }
-
- @Override
- public void receivedFault(WSIFMessage fault) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
-
- }
-
-}
+package org.apache.airavata.xbaya.jython.lib;
+
+import java.awt.Color;
+import java.net.URI;
+
+import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.xbaya.graph.Node;
+import org.apache.airavata.xbaya.graph.gui.NodeGUI;
+import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
+import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.addressing.EndpointReference;
+
+import xsul.wsif.WSIFMessage;
+
+public class StandaloneServiceNotificationSender implements ServiceNotifiable {
+
+ private Workflow workflow;
+ private String serviceID;
+ private URI workflowID;
+
+ public StandaloneServiceNotificationSender(Workflow workflow, URI workflowID) {
+ this.workflow = workflow;
+ this.workflowID = workflowID;
+ }
+
+ @Override
+ public void setServiceID(String serviceID) {
+ this.serviceID = serviceID;
+ System.out.println(serviceID);
+
+ }
+
+ @Override
+ public EndpointReference getEventSink() {
+ return new EndpointReference(XBayaConstants.DEFAULT_BROKER_URL.toString());
+ }
+
+ @Override
+ public URI getWorkflowID() {
+ return this.workflowID;
+ }
+
+ @Override
+ public void invokingService(WSIFMessage inputs) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ @Override
+ public void serviceFinished(WSIFMessage outputs) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FINISHED.color);
+
+ }
+
+ @Override
+ public void invocationFailed(String message, Throwable e) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+
+ }
+
+ @Override
+ public void receivedFault(String message) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+
+ }
+
+ @Override
+ public void receivedFault(WSIFMessage fault) {
+ this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/WorkflowNotifiable.java Mon Oct 31 20:56:37 2011
@@ -19,70 +19,70 @@
*
*/
-package org.apache.airavata.xbaya.jython.lib;
-
-import org.apache.axis2.addressing.EndpointReference;
-import org.python.core.PyObject;
-
-public interface WorkflowNotifiable {
-
- /**
- * @return The event sink EPR.
- */
- public abstract EndpointReference getEventSink();
-
- /**
- * @param args
- * @param keywords
- */
- public abstract void workflowStarted(PyObject[] args, String[] keywords);
-
- public abstract void workflowStarted(Object[] args, String[] keywords);
-
- /**
- * @param args
- * @param keywords
- */
- public abstract void workflowFinished(Object[] args, String[] keywords);
-
- public abstract void sendingPartialResults(Object[] args, String[] keywords);
-
- /**
- * @param args
- * @param keywords
- */
- public abstract void workflowFinished(PyObject[] args, String[] keywords);
-
- public abstract void workflowTerminated();
-
- /**
- * Sends a START_INCOMPLETED notification message.
- *
- * @param message
- * The message to send
- */
- public abstract void workflowFailed(String message);
-
- /**
- * Sends a START_INCOMPLETED notification message.
- *
- * @param e
- */
- public abstract void workflowFailed(Throwable e);
-
- /**
- * Sends a START_INCOMPLETED notification message.
- *
- * @param message
- * The message to send
- * @param e
- */
- public abstract void workflowFailed(String message, Throwable e);
-
- /**
- * @param nodeID
- * @return The ServiceNoficationSender created.
- */
- public abstract ServiceNotifiable createServiceNotificationSender(String nodeID);
-
+package org.apache.airavata.xbaya.jython.lib;
+
+import org.apache.axis2.addressing.EndpointReference;
+import org.python.core.PyObject;
+
+public interface WorkflowNotifiable {
+
+ /**
+ * @return The event sink EPR.
+ */
+ public abstract EndpointReference getEventSink();
+
+ /**
+ * @param args
+ * @param keywords
+ */
+ public abstract void workflowStarted(PyObject[] args, String[] keywords);
+
+ public abstract void workflowStarted(Object[] args, String[] keywords);
+
+ /**
+ * @param args
+ * @param keywords
+ */
+ public abstract void workflowFinished(Object[] args, String[] keywords);
+
+ public abstract void sendingPartialResults(Object[] args, String[] keywords);
+
+ /**
+ * @param args
+ * @param keywords
+ */
+ public abstract void workflowFinished(PyObject[] args, String[] keywords);
+
+ public abstract void workflowTerminated();
+
+ /**
+ * Sends a START_INCOMPLETED notification message.
+ *
+ * @param message
+ * The message to send
+ */
+ public abstract void workflowFailed(String message);
+
+ /**
+ * Sends a START_INCOMPLETED notification message.
+ *
+ * @param e
+ */
+ public abstract void workflowFailed(Throwable e);
+
+ /**
+ * Sends a START_INCOMPLETED notification message.
+ *
+ * @param message
+ * The message to send
+ * @param e
+ */
+ public abstract void workflowFailed(String message, Throwable e);
+
+ /**
+ * @param nodeID
+ * @return The ServiceNoficationSender created.
+ */
+ public abstract ServiceNotifiable createServiceNotificationSender(String nodeID);
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java Mon Oct 31 20:56:37 2011
@@ -41,12 +41,10 @@ public class JythonOneTimeRunnerImpl imp
* @throws XBayaException
* @see org.apache.airavata.xbaya.jython.runner.JythonOneTimeRunner#run(java.lang.String, java.lang.String[])
*/
- @Override
public void run(final String script, final String[] arguments) throws XBayaException {
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
- @Override
public Void run() {
ClassLoader loader = this.getClass().getClassLoader();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonRunner.java Mon Oct 31 20:56:37 2011
@@ -19,55 +19,55 @@
*
*/
-package org.apache.airavata.xbaya.jython.runner;
-
-import java.util.List;
-
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-
-public class JythonRunner {
-
- private JythonClassLoader loader;
-
- /**
- *
- * Constructs a JythonRunner.
- *
- */
- public JythonRunner() {
- this.loader = new JythonClassLoader(this.getClass().getClassLoader());
- }
-
- /**
- * @param script
- * @param arguments
- * @throws XBayaException
- */
- public void run(String script, List<String> arguments) throws XBayaException {
- run(script, arguments.toArray(new String[arguments.size()]));
- }
-
- /**
- * @param script
- * @param arguments
- * @throws XBayaException
- */
- public void run(final String script, final String[] arguments) throws XBayaException {
- try {
- Class<?> runnerClass = this.loader.loadClass(JythonOneTimeRunnerImpl.class.getName(), true);
- JythonOneTimeRunner runner = (JythonOneTimeRunner) runnerClass.newInstance();
- runner.run(script, arguments);
-
- } catch (ClassNotFoundException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
- } catch (InstantiationException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
- } catch (IllegalAccessException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
- } finally {
- loader.cleanUp();
- }
- }
+package org.apache.airavata.xbaya.jython.runner;
+
+import java.util.List;
+
+import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.xbaya.gui.ErrorMessages;
+
+public class JythonRunner {
+
+ private JythonClassLoader loader;
+
+ /**
+ *
+ * Constructs a JythonRunner.
+ *
+ */
+ public JythonRunner() {
+ this.loader = new JythonClassLoader(this.getClass().getClassLoader());
+ }
+
+ /**
+ * @param script
+ * @param arguments
+ * @throws XBayaException
+ */
+ public void run(String script, List<String> arguments) throws XBayaException {
+ run(script, arguments.toArray(new String[arguments.size()]));
+ }
+
+ /**
+ * @param script
+ * @param arguments
+ * @throws XBayaException
+ */
+ public void run(final String script, final String[] arguments) throws XBayaException {
+ try {
+ Class<?> runnerClass = this.loader.loadClass(JythonOneTimeRunnerImpl.class.getName(), true);
+ JythonOneTimeRunner runner = (JythonOneTimeRunner) runnerClass.newInstance();
+ runner.run(script, arguments);
+
+ } catch (ClassNotFoundException e) {
+ throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ } catch (InstantiationException e) {
+ throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ } catch (IllegalAccessException e) {
+ throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ } finally {
+ loader.cleanUp();
+ }
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java Mon Oct 31 20:56:37 2011
@@ -29,8 +29,8 @@ import org.apache.airavata.xbaya.XBayaCo
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.EndpointReference;
import xsul.lead.LeadContextHeader;
import xsul.ws_addressing.WsaEndpointReference;
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=1195667&r1=1195666&r2=1195667&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 Mon Oct 31 20:56:37 2011
@@ -104,7 +104,6 @@ public class Monitor extends EventProduc
/**
* @see org.apache.airavata.xbaya.monitor.EventFilter#isAcceptable(org.apache.airavata.xbaya.monitor.MonitorEvent)
*/
- @Override
public boolean isAcceptable(MonitorEvent event) {
return event != null && event.getNodeID() != null && event.getNodeID().equals(nodeID);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java Mon Oct 31 20:56:37 2011
@@ -24,10 +24,10 @@ package org.apache.airavata.xbaya.monito
import java.net.URI;
import java.util.List;
-import org.apache.airavata.common.utils.StringUtil;
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.common.utils.StringUtil;
public class MonitorConfiguration extends EventProducer {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java Mon Oct 31 20:56:37 2011
@@ -187,7 +187,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#getRowCount()
*/
- @Override
public int getRowCount() {
// Only show the events up to the slider value.
return this.sliderValue;
@@ -196,7 +195,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#getColumnCount()
*/
- @Override
public int getColumnCount() {
return Column.values().length;
}
@@ -204,7 +202,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#getColumnName(int)
*/
- @Override
public String getColumnName(int columnIndex) {
Column[] columns = Column.values();
if (columnIndex < 0 || columnIndex >= columns.length) {
@@ -217,7 +214,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#getColumnClass(int)
*/
- @Override
public Class<?> getColumnClass(int columnIndex) {
return String.class;
}
@@ -225,7 +221,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#isCellEditable(int, int)
*/
- @Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
return false;
}
@@ -233,7 +228,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#getValueAt(int, int)
*/
- @Override
public Object getValueAt(int rowIndex, int columnIndex) {
String value;
try {
@@ -251,7 +245,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int)
*/
- @Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
throw new UnsupportedOperationException();
}
@@ -259,7 +252,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#addTableModelListener(javax.swing.event.TableModelListener)
*/
- @Override
public void addTableModelListener(TableModelListener listener) {
this.tableModelListeners.add(listener);
}
@@ -267,7 +259,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.table.TableModel#removeTableModelListener(javax.swing.event.TableModelListener)
*/
- @Override
public void removeTableModelListener(TableModelListener listener) {
this.tableModelListeners.remove(listener);
}
@@ -277,7 +268,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#getExtent()
*/
- @Override
public int getExtent() {
return 0;
}
@@ -285,7 +275,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#setExtent(int)
*/
- @Override
public void setExtent(int newExtent) {
throw new UnsupportedOperationException();
}
@@ -293,7 +282,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#getMaximum()
*/
- @Override
public int getMaximum() {
return getEventSize();
}
@@ -301,7 +289,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#setMaximum(int)
*/
- @Override
public void setMaximum(int newMaximum) {
throw new UnsupportedOperationException();
}
@@ -309,7 +296,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#getMinimum()
*/
- @Override
public int getMinimum() {
return 0;
}
@@ -317,7 +303,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#setMinimum(int)
*/
- @Override
public void setMinimum(int newMinimum) {
throw new UnsupportedOperationException();
}
@@ -325,7 +310,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#getValue()
*/
- @Override
public int getValue() {
return this.sliderValue;
}
@@ -333,7 +317,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#setValue(int)
*/
- @Override
public void setValue(int newValue) {
if (this.sliderValue == newValue) {
return;
@@ -365,7 +348,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#getValueIsAdjusting()
*/
- @Override
public boolean getValueIsAdjusting() {
return this.sliderAdjusting;
}
@@ -373,7 +355,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#setValueIsAdjusting(boolean)
*/
- @Override
public void setValueIsAdjusting(boolean adjusting) {
this.sliderAdjusting = adjusting;
fireSliderChanged();
@@ -382,7 +363,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#setRangeProperties(int, int, int, int, boolean)
*/
- @Override
public void setRangeProperties(int value, int extent, int min, int max, boolean adjusting) {
throw new UnsupportedOperationException();
}
@@ -390,7 +370,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#addChangeListener(javax.swing.event.ChangeListener)
*/
- @Override
public void addChangeListener(ChangeListener listener) {
this.sliderModelListeners.add(listener);
}
@@ -398,7 +377,6 @@ public class MonitorEventData implements
/**
* @see javax.swing.BoundedRangeModel#removeChangeListener(javax.swing.event.ChangeListener)
*/
- @Override
public void removeChangeListener(ChangeListener listener) {
this.sliderModelListeners.remove(listener);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java Mon Oct 31 20:56:37 2011
@@ -124,7 +124,6 @@ public class WsmgClient implements Consu
/**
* @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
*/
- @Override
public void handleNotification(SOAPEnvelope message) {
String soapBody = message.getBody().toString();
this.handleNotification(soapBody);
@@ -134,7 +133,6 @@ public class WsmgClient implements Consu
*
* @param message
*/
- @Override
public void handleNotification(String message) {
try {
XmlElement event = XMLUtil.stringToXmlElement(message);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorConfigurationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorConfigurationWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorConfigurationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorConfigurationWindow.java Mon Oct 31 20:56:37 2011
@@ -148,7 +148,6 @@ public class MonitorConfigurationWindow
this.messageBoxTextField.setEnabled(false);
this.pullCheckBox.addItemListener(new ItemListener() {
- @Override
public void itemStateChanged(ItemEvent event) {
int stateChange = event.getStateChange();
if (stateChange == ItemEvent.SELECTED) {
@@ -172,7 +171,6 @@ public class MonitorConfigurationWindow
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
setConfiguration();
}
@@ -180,7 +178,6 @@ public class MonitorConfigurationWindow
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java Mon Oct 31 20:56:37 2011
@@ -124,7 +124,6 @@ public class MonitorEventHandler impleme
/**
* @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent)
*/
- @Override
public void stateChanged(ChangeEvent event) {
try {
Object source = event.getSource();
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=1195667&r1=1195666&r2=1195667&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 Mon Oct 31 20:56:37 2011
@@ -85,7 +85,6 @@ public class MonitorMenu implements Even
/**
* @see org.apache.airavata.xbaya.event.EventListener#eventReceived(org.apache.airavata.xbaya.event.Event)
*/
- @Override
public void eventReceived(Event event) {
Type type = event.getType();
if (type.equals(Event.Type.MONITOR_CONFIGURATION_CHANGED)) {
@@ -129,7 +128,6 @@ public class MonitorMenu implements Even
item.addActionListener(new AbstractAction() {
private MonitorConfigurationWindow window;
- @Override
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
this.window = new MonitorConfigurationWindow(MonitorMenu.this.engine);
@@ -146,7 +144,6 @@ public class MonitorMenu implements Even
item.addActionListener(new AbstractAction() {
private MonitorStarter starter;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.starter == null) {
this.starter = new MonitorStarter(MonitorMenu.this.engine);
@@ -163,7 +160,6 @@ public class MonitorMenu implements Even
JMenuItem item = new JMenuItem("Stop Monitoring");
item.setMnemonic(KeyEvent.VK_T);
item.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
try {
MonitorMenu.this.engine.getMonitor().asynchronousStop();
@@ -182,7 +178,6 @@ public class MonitorMenu implements Even
JMenuItem item = new JMenuItem("Reset");
item.setMnemonic(KeyEvent.VK_R);
item.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
try {
MonitorMenu.this.engine.getMonitor().reset();
@@ -203,7 +198,6 @@ public class MonitorMenu implements Even
item.addActionListener(new AbstractAction() {
private WorkflowModifierGUI modifierGUI;
- @Override
public void actionPerformed(ActionEvent event) {
if (this.modifierGUI == null) {
this.modifierGUI = new WorkflowModifierGUI(MonitorMenu.this.engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java Mon Oct 31 20:56:37 2011
@@ -103,7 +103,6 @@ public class MonitorPanel implements XBa
*
* @return The scroll pane
*/
- @Override
public JPanel getSwingComponent() {
return this.panel;
}
@@ -111,10 +110,8 @@ public class MonitorPanel implements XBa
/**
* @see javax.swing.event.TableModelListener#tableChanged(javax.swing.event.TableModelEvent)
*/
- @Override
public void tableChanged(final TableModelEvent event) {
SwingUtilities.invokeLater(new Runnable() {
- @Override
public void run() {
tableChangedInSwingThread(event);
}
@@ -257,9 +254,9 @@ public class MonitorPanel implements XBa
* @param firstElement
*/
private void findAndLuanchBrowser(XmlElement firstElement) {
- Iterator children = firstElement.children().iterator();
+ Iterator children = ((XmlElement) firstElement).children().iterator();
while (children.hasNext()) {
- Object object = children.next();
+ Object object = (Object) children.next();
if (object instanceof String) {
try {
new URL(((String) object).trim());
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java Mon Oct 31 20:56:37 2011
@@ -56,7 +56,6 @@ public class MonitorStarter implements C
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.subscribingThread.interrupt();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java Mon Oct 31 20:56:37 2011
@@ -120,7 +120,6 @@ public class MonitorWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/ResourcePaintable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/ResourcePaintable.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/ResourcePaintable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/ResourcePaintable.java Mon Oct 31 20:56:37 2011
@@ -57,7 +57,6 @@ public class ResourcePaintable implement
/**
* @see org.apache.airavata.xbaya.graph.gui.Paintable#paint(java.awt.Graphics2D, java.awt.Point)
*/
- @Override
public void paint(Graphics2D graphics, Point point) {
graphics.setColor(Color.BLACK);
graphics.drawString(this.displayText, point.x, point.y - 10);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java Mon Oct 31 20:56:37 2011
@@ -199,7 +199,6 @@ public class MyProxyDialog {
this.okButton = new JButton("OK");
this.okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -207,7 +206,6 @@ public class MyProxyDialog {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java Mon Oct 31 20:56:37 2011
@@ -57,7 +57,6 @@ public class MyProxyLoader implements Ca
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.loadingThread.interrupt();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java Mon Oct 31 20:56:37 2011
@@ -70,7 +70,6 @@ public class MyProxyMenu {
this.loadMenuItem.addActionListener(new AbstractAction() {
private MyProxyDialog dialog;
- @Override
public void actionPerformed(ActionEvent e) {
if (this.dialog == null) {
this.dialog = new MyProxyDialog(MyProxyMenu.this.engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java Mon Oct 31 20:56:37 2011
@@ -27,8 +27,8 @@ import java.util.Map;
import javax.xml.namespace.QName;
-import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.common.utils.StringUtil;
import org.gpel.model.GpelActivity;
import org.gpel.model.GpelAssign;
import org.gpel.model.GpelAssignCopy;
@@ -195,7 +195,7 @@ public class ODEBPELTransformer {
private String findNamespacePrefix(GpelProcess gpelProcess, QName messageQname) {
Iterator<XmlNamespace> iterator = gpelProcess.xml().namespaces().iterator();
while (iterator.hasNext()) {
- XmlNamespace xmlNamespace = iterator.next();
+ XmlNamespace xmlNamespace = (XmlNamespace) iterator.next();
if (xmlNamespace.getName().equals(messageQname.getNamespaceURI())) {
return xmlNamespace.getPrefix();
}
@@ -213,7 +213,7 @@ public class ODEBPELTransformer {
Map<String, WsdlDefinitions> wsdls) {
Iterator<String> iterator = wsdls.keySet().iterator();
while (iterator.hasNext()) {
- String key = iterator.next();
+ String key = (String) iterator.next();
WsdlDefinitions wsdlDefinitions = wsdls.get(key);
WsdlPortType pType = wsdlDefinitions.getPortType(portType.getLocalPart());
WsdlPortTypeOperation operation = null;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java Mon Oct 31 20:56:37 2011
@@ -22,12 +22,14 @@
package org.apache.airavata.xbaya.ode;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.LinkedList;
import java.util.List;
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.component.ComponentException;
@@ -40,6 +42,8 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.graph.system.OutputNode;
import org.apache.airavata.xbaya.lead.LEADTypes;
import org.apache.airavata.xbaya.lead.LEADWorkflowInvoker;
+import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.security.XBayaSecurity;
import org.apache.airavata.xbaya.wf.Workflow;
import org.ietf.jgss.GSSCredential;
@@ -47,6 +51,7 @@ import org.ietf.jgss.GSSCredential;
import xsul.XmlConstants;
import xsul.invoker.gsi.GsiInvoker;
import xsul.lead.LeadContextHeader;
+import xsul.lead.LeadResourceMapping;
import xsul5.wsdl.WsdlDefinitions;
public class ODEClient {
@@ -185,7 +190,6 @@ public class ODEClient {
final LEADWorkflowInvoker finalInvoker = invoker;
new Thread() {
- @Override
public synchronized void run() {
boolean success;
try {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java Mon Oct 31 20:56:37 2011
@@ -131,7 +131,8 @@ public class ODEDeploymentDescriptor {
QName portTypeQname = null;
// find the qname of the porttype
while (namespaceIterator.hasNext()) {
- org.xmlpull.infoset.XmlNamespace ns = namespaceIterator.next();
+ org.xmlpull.infoset.XmlNamespace ns = (org.xmlpull.infoset.XmlNamespace) namespaceIterator
+ .next();
if (ns.getPrefix().equals(portTypeSegs[0])) {
portTypeQname = new QName(ns.getName(), portTypeSegs[1]);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java Mon Oct 31 20:56:37 2011
@@ -71,7 +71,6 @@ public class ODEInvoker implements Cance
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.invokeThread.interrupt();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java Mon Oct 31 20:56:37 2011
@@ -40,6 +40,7 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaConfiguration;
+import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.component.ws.WSComponentPort;
@@ -170,7 +171,6 @@ public class ODEInvokerWindow {
this.invokeButton = new JButton("Invoke");
this.invokeButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute(false);
}
@@ -178,7 +178,6 @@ public class ODEInvokerWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java Mon Oct 31 20:56:37 2011
@@ -192,7 +192,7 @@ public class ODEWSDLTransformer {
xmlElement.setNamespace(plinkNs);
Iterator childItr = xmlElement.children().iterator();
while (childItr.hasNext()) {
- Object object = childItr.next();
+ Object object = (Object) childItr.next();
if (object instanceof org.xmlpull.infoset.XmlElement) {
((org.xmlpull.infoset.XmlElement) object).setNamespace(plinkNs);
}
@@ -285,10 +285,10 @@ public class ODEWSDLTransformer {
Iterator<WsdlBinding> bindingItr = wsdl.bindings().iterator();
while (bindingItr.hasNext()) {
- WsdlBinding wsdlBinding = bindingItr.next();
+ WsdlBinding wsdlBinding = (WsdlBinding) bindingItr.next();
Iterator<WsdlBindingOperation> operationsItr = wsdlBinding.operations().iterator();
while (operationsItr.hasNext()) {
- WsdlBindingOperation wsdlBindingOperation = operationsItr.next();
+ WsdlBindingOperation wsdlBindingOperation = (WsdlBindingOperation) operationsItr.next();
org.xmlpull.infoset.XmlElement input = wsdlBindingOperation.xml().element(INPUT);
org.xmlpull.infoset.XmlElement body = input.element(BODY);
if (body == null) {
@@ -313,7 +313,7 @@ public class ODEWSDLTransformer {
Iterable<WsdlMessagePart> parts = wsdlMessage.parts();
Iterator<WsdlMessagePart> partsItr = parts.iterator();
while (partsItr.hasNext()) {
- WsdlMessagePart wsdlMessagePart = partsItr.next();
+ WsdlMessagePart wsdlMessagePart = (WsdlMessagePart) partsItr.next();
if (!LEAD_HEADER.equals(wsdlMessagePart.getName())) {
inputPartName = wsdlMessagePart.getName();
break;