You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/05/17 18:40:14 UTC
svn commit: r1339699 [7/8] - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/airavata/
xbaya-gui/src/main/java/org/apache/airavata/workflow/
xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ xbay...
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -39,8 +39,8 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.schemas.wec.ContextHeaderDocument;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
@@ -181,9 +181,9 @@ public class GenericInvoker implements I
/**
*
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setup() throws XBayaException {
+ public void setup() throws WorkflowException {
try {
WsdlDefinitions definitions = null;
if (this.wsdlLocation != null && !this.wsdlLocation.equals("")) {
@@ -195,7 +195,7 @@ public class GenericInvoker implements I
setup(definitions);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
this.notifier.invocationFailed(e.getMessage(), e);
@@ -204,26 +204,26 @@ public class GenericInvoker implements I
logger.error(e.getMessage(), e);
String message = "The location of the WSDL has to be a valid URL or file path: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (WsdlException e) {
logger.error(e.getMessage(), e);
String message = "Error in processing the WSDL: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in processing the WSDL: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
- private void setup(WsdlDefinitions definitions) throws XBayaException {
+ private void setup(WsdlDefinitions definitions) throws WorkflowException {
// Set LEAD context header.
WorkflowContextHeaderBuilder builder;
@@ -272,12 +272,12 @@ public class GenericInvoker implements I
*
* @param operationName
* The name of the operation
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setOperation(String operationName) throws XBayaException {
+ public void setOperation(String operationName) throws WorkflowException {
try {
this.invoker.setOperation(operationName);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
this.notifier.invocationFailed(e.getMessage(), e);
@@ -286,12 +286,12 @@ public class GenericInvoker implements I
logger.error(e.getMessage(), e);
String message = "The WSDL does not conform to the invoking service: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
@@ -301,9 +301,9 @@ public class GenericInvoker implements I
* The name of the input parameter
* @param value
* The value of the input parameter
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setInput(String name, Object value) throws XBayaException {
+ public void setInput(String name, Object value) throws WorkflowException {
try {
if (value instanceof XmlElement) {
logger.info("value: " + XMLUtil.xmlElementToString((XmlElement) value));
@@ -311,7 +311,7 @@ public class GenericInvoker implements I
this.inputNames.add(name);
this.inputValues.add(value);
this.invoker.setInput(name, value);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
this.notifier.invocationFailed(e.getMessage(), e);
@@ -320,21 +320,21 @@ public class GenericInvoker implements I
logger.error(e.getMessage(), e);
String message = "Error in setting an input. name: " + name + " value: " + value;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
/**
*
* @return
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public synchronized boolean invoke() throws XBayaException {
+ public synchronized boolean invoke() throws WorkflowException {
try {
WSIFMessage inputMessage = this.invoker.getInputs();
logger.info("inputMessage: " + XMLUtil.xmlElementToString((XmlElement) inputMessage));
@@ -364,12 +364,12 @@ public class GenericInvoker implements I
GenericInvoker.this.failerSent = true;
}
return success;
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
GenericInvoker.this.notifier.invocationFailed(e.getMessage(), e);
GenericInvoker.this.failerSent = true;
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + GenericInvoker.this.serviceInformation;
@@ -401,28 +401,28 @@ public class GenericInvoker implements I
// already.
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
return true;
}
/**
*
- * @throws XBayaException
+ * @throws WorkflowException
*/
@SuppressWarnings("boxing")
- public synchronized void waitToFinish() throws XBayaException {
+ public synchronized void waitToFinish() throws WorkflowException {
try {
while (this.result == null) {
// The job is not submitted yet.
@@ -441,7 +441,7 @@ public class GenericInvoker implements I
// WSIFMessageElement, implements toString(), which
// serialize the message XML.
message += faultMessage.toString();
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
} catch (InterruptedException e) {
logger.error(e.getMessage(), e);
@@ -449,17 +449,17 @@ public class GenericInvoker implements I
// The service-failed notification should have been sent already.
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error while waiting for a service to finish: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
@@ -468,9 +468,9 @@ public class GenericInvoker implements I
* @param name
* The name of the output parameter
* @return
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public Object getOutput(String name) throws XBayaException {
+ public Object getOutput(String name) throws WorkflowException {
try {
waitToFinish();
Object output = this.invoker.getOutput(name);
@@ -478,7 +478,7 @@ public class GenericInvoker implements I
logger.info("output: " + XMLUtil.xmlElementToString((XmlElement) output));
}
return output;
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
if (!this.failerSent) {
@@ -489,21 +489,21 @@ public class GenericInvoker implements I
logger.error(e.getMessage(), e);
String message = "Error while waiting for a output: " + name;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
/**
*
* @return
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WSIFMessage getOutputs() throws XBayaException {
+ public WSIFMessage getOutputs() throws WorkflowException {
return this.invoker.getOutputs();
}
@@ -513,12 +513,12 @@ public class GenericInvoker implements I
}
@Override
- public WSIFMessage getInputs() throws XBayaException {
+ public WSIFMessage getInputs() throws WorkflowException {
return null;
}
@Override
- public WSIFMessage getFault() throws XBayaException {
+ public WSIFMessage getFault() throws WorkflowException {
return null;
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/Invoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/Invoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/Invoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/Invoker.java Thu May 17 16:39:54 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.xbaya.invoker;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import xsul.wsif.WSIFMessage;
import xsul.xwsif_runtime.WSIFClient;
@@ -31,9 +31,9 @@ public interface Invoker {
/**
* Sets up the service.
*
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setup() throws XBayaException;
+ public void setup() throws WorkflowException;
/**
* @return The WSIFClient.
@@ -45,9 +45,9 @@ public interface Invoker {
*
* @param operationName
* The name of the operation
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setOperation(String operationName) throws XBayaException;
+ public void setOperation(String operationName) throws WorkflowException;
/**
* Sets an input parameter
@@ -56,33 +56,33 @@ public interface Invoker {
* The name of the input parameter
* @param value
* The value of the input parameter
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setInput(String name, Object value) throws XBayaException;
+ public void setInput(String name, Object value) throws WorkflowException;
/**
* Returns the all input parameters
*
* @return The input parameters
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WSIFMessage getInputs() throws XBayaException;
+ public WSIFMessage getInputs() throws WorkflowException;
/**
* Invokes the service.
*
* @return true if the invocation succeeds; fase otherwise
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public boolean invoke() throws XBayaException;
+ public boolean invoke() throws WorkflowException;
/**
* Returns the all output parameters
*
* @return The output parameters
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WSIFMessage getOutputs() throws XBayaException;
+ public WSIFMessage getOutputs() throws WorkflowException;
/**
* Returns the output of a specified name.
@@ -90,16 +90,16 @@ public interface Invoker {
* @param name
* The name of the output parameter
* @return The value of the output
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public Object getOutput(String name) throws XBayaException;
+ public Object getOutput(String name) throws WorkflowException;
/**
* Returns the fault message.
*
* @return The fault message
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WSIFMessage getFault() throws XBayaException;
+ public WSIFMessage getFault() throws WorkflowException;
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientInvoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientInvoker.java Thu May 17 16:39:54 2012
@@ -24,12 +24,12 @@ package org.apache.airavata.xbaya.invoke
import java.net.URI;
import java.util.List;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.lead.LEADWorkflowInvoker;
import org.apache.airavata.xbaya.security.XBayaSecurity;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.ietf.jgss.GSSCredential;
import xsul.XmlConstants;
@@ -61,7 +61,7 @@ public class ODEClientInvoker {
if (null != componentPort.getDefaultValue()) {
componentPort.setValue(componentPort.getDefaultValue());
} else {
- throw new XBayaRuntimeException("Workflow input cannot be null :" + componentPort.getName());
+ throw new WorkflowRuntimeException("Workflow input cannot be null :" + componentPort.getName());
}
}
// This is a check that we do to make sure if the user didnt bother
@@ -91,20 +91,20 @@ public class ODEClientInvoker {
} else {
XmlConstants.BUILDER.serializeToString(finalInvoker.getFaultMessage());
}
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
ODEClientInvoker.this.throwException(e);
}
}
}.start();
} catch (Exception e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
}
private void throwException(Exception e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java Thu May 17 16:39:54 2012
@@ -21,9 +21,9 @@
package org.apache.airavata.xbaya.invoker;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
import org.apache.airavata.xbaya.lead.LEADTypes;
import javax.xml.namespace.QName;
@@ -59,7 +59,7 @@ public class ODEClientUtil {
if (false) {
// Some user wants to pass empty strings, so this check is disabled.
if (valueString.length() == 0) {
- throw new XBayaRuntimeException("Input parameter, " + name + ", cannot be empty");
+ throw new WorkflowRuntimeException("Input parameter, " + name + ", cannot be empty");
}
}
QName type = input.getType();
@@ -72,10 +72,10 @@ public class ODEClientUtil {
if(XBayaConstants.HTTP_SCHEMAS_AIRAVATA_APACHE_ORG_GFAC_TYPE.equals(input.getType().getNamespaceURI())){
value = XMLUtil.stringToXmlElement3(ODEClientUtil.createInputForGFacService(input, valueString));
}else {
- throw new XBayaRuntimeException("Input parameter, " + name + ", Unkown Type");
+ throw new WorkflowRuntimeException("Input parameter, " + name + ", Unkown Type");
}
} catch (RuntimeException e) {
- throw new XBayaRuntimeException("Input parameter, " + name + ", is not valid XML", e);
+ throw new WorkflowRuntimeException("Input parameter, " + name + ", is not valid XML", e);
}
}
return value;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java Thu May 17 16:39:54 2012
@@ -25,11 +25,12 @@ import java.net.URI;
import java.util.List;
import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
import org.apache.airavata.xbaya.gui.Cancelable;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.WaitDialog;
@@ -39,7 +40,6 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
import org.apache.airavata.xbaya.security.XBayaSecurity;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -198,7 +198,7 @@ public class ODEInvoker implements Cance
result = XmlConstants.BUILDER.serializeToString(workflowInvoker.getFaultMessage());
}
logger.info("Done with the execution. result: " + result);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
ODEInvoker.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.invoke
import java.util.Iterator;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.jackrabbit.core.cache.ConcurrentCache;
import org.xmlpull.v1.builder.XmlElement;
@@ -70,7 +70,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setup()
*/
- public void setup() throws XBayaException {
+ public void setup() throws WorkflowException {
try {
WSIFService service = WSIFServiceFactory.newInstance().getService(this.definitions);
WSIFPort port = service.getPort();
@@ -78,7 +78,7 @@ public class SimpleInvoker implements In
this.client.setAsyncResponseTimeoutInMs(999999999);
} catch (RuntimeException e) {
String message = "The WSDL is in the wrong format";
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
@@ -92,7 +92,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setOperation(java.lang.String)
*/
- public void setOperation(String operationName) throws XBayaException {
+ public void setOperation(String operationName) throws WorkflowException {
try {
WSIFPort port = this.client.getPort();
this.operation = port.createOperation(operationName);
@@ -101,14 +101,14 @@ public class SimpleInvoker implements In
this.faultMessage = this.operation.createFaultMessage();
} catch (RuntimeException e) {
String message = "The WSDL does not conform to the invoking service.";
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setInput(java.lang.String, java.lang.Object)
*/
- public void setInput(String name, Object value) throws XBayaException {
+ public void setInput(String name, Object value) throws WorkflowException {
try {
if (value instanceof XmlElement) {
// If the value is a complex type, change the name of the
@@ -129,7 +129,7 @@ public class SimpleInvoker implements In
this.inputMessage.setObjectPart(name, value);
} catch (RuntimeException e) {
String message = "Error in setting an input. name: " + name + " value: " + value;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
@@ -143,7 +143,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#invoke()
*/
- public boolean invoke() throws XBayaException {
+ public boolean invoke() throws WorkflowException {
try {
boolean success = this.operation.executeRequestResponseOperation(this.inputMessage, this.outputMessage,
this.faultMessage);
@@ -153,7 +153,7 @@ public class SimpleInvoker implements In
return success;
} catch (RuntimeException e) {
String message = "Error in invoking a service.";
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
@@ -175,7 +175,7 @@ public class SimpleInvoker implements In
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutput(java.lang.String)
*/
- public Object getOutput(String name) throws XBayaException {
+ public Object getOutput(String name) throws WorkflowException {
try {
// This code doesn't work when the output is a complex type.
// Object output = this.outputMessage.getObjectPart(name);
@@ -202,7 +202,7 @@ public class SimpleInvoker implements In
return valueElement;
} catch (RuntimeException e) {
String message = "Error in getting output. name: " + name;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -32,8 +32,8 @@ import java.util.concurrent.TimeoutExcep
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +64,7 @@ public class WorkflowInvokerWrapperForGF
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#invoke()
*/
- public synchronized boolean invoke() throws XBayaException {
+ public synchronized boolean invoke() throws WorkflowException {
try {
WSIFMessage inputMessage = super.getInputs();
@@ -95,12 +95,12 @@ public class WorkflowInvokerWrapperForGF
WorkflowInvokerWrapperForGFacInvoker.this.failerSent = true;
}
return success;
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
WorkflowInvokerWrapperForGFacInvoker.this.notifier.invocationFailed(e.getMessage(), e);
WorkflowInvokerWrapperForGFacInvoker.this.failerSent = true;
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: "
@@ -133,18 +133,18 @@ public class WorkflowInvokerWrapperForGF
// already.
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
boolean success = super.invoke();
@@ -161,7 +161,7 @@ public class WorkflowInvokerWrapperForGF
return success;
}
- public synchronized void waitToFinish() throws XBayaException {
+ public synchronized void waitToFinish() throws WorkflowException {
try {
while (this.result == null) {
// The job is not submitted yet.
@@ -180,7 +180,7 @@ public class WorkflowInvokerWrapperForGF
// WSIFMessageElement, implements toString(), which
// serialize the message XML.
message += faultMessage.toString();
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
} catch (InterruptedException e) {
logger.error(e.getMessage(), e);
@@ -188,21 +188,21 @@ public class WorkflowInvokerWrapperForGF
// The service-failed notification should have been sent already.
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error while waiting for a service to finish: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
- public Object getOutput(String name) throws XBayaException {
+ public Object getOutput(String name) throws WorkflowException {
try {
waitToFinish();
Object output = super.getOutput(name);
@@ -210,7 +210,7 @@ public class WorkflowInvokerWrapperForGF
logger.info("output: " + XMLUtil.xmlElementToString((XmlElement) output));
}
return output;
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
if (!this.failerSent) {
@@ -221,12 +221,12 @@ public class WorkflowInvokerWrapperForGF
logger.error(e.getMessage(), e);
String message = "Error while waiting for a output: " + name;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
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.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.invoker.AsynchronousInvoker;
import org.apache.airavata.xbaya.invoker.GFacInvoker;
import org.apache.airavata.xbaya.invoker.Invoker;
@@ -42,10 +42,10 @@ public class InvokerFactory {
* @param gfacURL
* @param messageBoxURL
* @return The invoker
- * @throws XBayaException
+ * @throws WorkflowException
*/
public static Invoker createInvoker(QName portTypeQName, WsdlDefinitions definitions, String gfacURL,
- String messageBoxURL, LeadContextHeader leadContext) throws XBayaException {
+ String messageBoxURL, LeadContextHeader leadContext) throws WorkflowException {
Invoker invoker = null;
if (definitions != null && definitions.getServices().iterator().hasNext()) {
@@ -61,13 +61,13 @@ public class InvokerFactory {
if (invoker == null) {
String message = "Cannot find an appropriate way to invoke the service";
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
return invoker;
}
public static Invoker createInvoker(QName portTypeQName, WsdlDefinitions definitions, String gfacURL,
- String messageBoxURL, WorkflowContextHeaderBuilder builder, boolean differ) throws XBayaException {
+ String messageBoxURL, WorkflowContextHeaderBuilder builder, boolean differ) throws WorkflowException {
Invoker invoker = null;
if (definitions != null && definitions.getServices().iterator().hasNext()) {
@@ -83,7 +83,7 @@ public class InvokerFactory {
if (invoker == null) {
String message = "Cannot find an appropriate way to invoke the service";
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
return invoker;
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -38,15 +38,16 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
@@ -56,7 +57,6 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -377,7 +377,7 @@ public class JythonRunnerWindow {
// } catch (InterruptedException e) {
// logger.error(e.getMessage(), e);
// }
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
JythonRunnerWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
JythonRunnerWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java Thu May 17 16:39:54 2012
@@ -27,7 +27,7 @@ import java.net.URISyntaxException;
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
@@ -71,9 +71,9 @@ public class GFacServiceCreator {
* @param wsdlURL
* The URL of the GFac service
* @throws URISyntaxException
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public GFacServiceCreator(String wsdlURL) throws URISyntaxException, XBayaException {
+ public GFacServiceCreator(String wsdlURL) throws URISyntaxException, WorkflowException {
this(new URI(wsdlURL));
}
@@ -82,9 +82,9 @@ public class GFacServiceCreator {
*
* @param wsdlURI
* The URI of the GFac service
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public GFacServiceCreator(URI wsdlURI) throws XBayaException {
+ public GFacServiceCreator(URI wsdlURI) throws WorkflowException {
try {
WsdlDefinitions definitions = WsdlResolver.getInstance().loadWsdl(wsdlURI);
WSIFService service = WSIFServiceFactory.newInstance().getService(definitions);
@@ -92,25 +92,25 @@ public class GFacServiceCreator {
this.gFacOperation = port.createOperation(CREATE_SERVICE_OPERATION);
} catch (RuntimeException e) {
String message = "Failed to connect to the Generic Factory: " + wsdlURI;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
/**
* @param serviceQName
* @return The WSDL definitions of the service created.
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WsdlDefinitions createService(QName serviceQName) throws XBayaException {
+ public WsdlDefinitions createService(QName serviceQName) throws WorkflowException {
return createService(serviceQName.toString());
}
/**
* @param serviceQName
* @return The WSDL definitions of the service created.
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WsdlDefinitions createService(String serviceQName) throws XBayaException {
+ public WsdlDefinitions createService(String serviceQName) throws WorkflowException {
logger.debug(serviceQName);
try {
WSIFMessage inputMessage = this.gFacOperation.createInputMessage();
@@ -127,7 +127,7 @@ public class GFacServiceCreator {
// An implementation of WSIFMessage, WSIFMessageElement,
// implements toString(), which serialize the message XML.
String message = "Failed to create a service: " + faultMessage.toString();
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
String wsdl = (String) outputMessage.getObjectPart(WSDL_PART);
@@ -139,16 +139,16 @@ public class GFacServiceCreator {
return this.serviceDefinitions;
} catch (RuntimeException e) {
String message = "Failed to create a service";
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
/**
* Shutdowns the service created.
*
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void shutdownService() throws XBayaException {
+ public void shutdownService() throws WorkflowException {
WSIFService service = WSIFServiceFactory.newInstance().getService(this.serviceDefinitions);
WSIFPort port = service.getPort();
WSIFOperation operation = port.createOperation(SHUTDOWN_OPERATION);
@@ -162,7 +162,7 @@ public class GFacServiceCreator {
// An implementation of WSIFMessage, WSIFMessageElement,
// implements toString(), which serialize the message XML.
String message = "Failed to shutdown the service: " + faultMessage.toString();
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
}
}
\ 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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -23,11 +23,11 @@ package org.apache.airavata.xbaya.jython
import java.net.URI;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.graph.controller.NodeController;
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;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java Thu May 17 16:39:54 2012
@@ -43,7 +43,7 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.apache.airavata.common.utils.IOUtil;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.XBayaVersion;
import org.apache.airavata.xbaya.jython.lib.NotificationSender;
import org.python.util.PythonInterpreter;
@@ -221,7 +221,7 @@ public class JythonClassLoader extends S
URL jarURL = new URL(jarURLString);
return jarURL;
} catch (MalformedURLException e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
}
@@ -230,7 +230,7 @@ public class JythonClassLoader extends S
try {
path = URLDecoder.decode(url.getPath(), "UTF-8");
} catch (UnsupportedEncodingException e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
logger.info("path: " + path);
if (path.endsWith("/")) {
@@ -244,7 +244,7 @@ public class JythonClassLoader extends S
JarFile jarFile = new JarFile(path);
return jarFile;
} catch (IOException e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
} else {
// url = http://example.com/a/b/c.jar
@@ -268,7 +268,7 @@ public class JythonClassLoader extends S
JarFile jarFile = new JarFile(file);
return jarFile;
} catch (IOException e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunner.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunner.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunner.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunner.java Thu May 17 16:39:54 2012
@@ -21,15 +21,15 @@
package org.apache.airavata.xbaya.jython.runner;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
public interface JythonOneTimeRunner {
/**
* @param script
* @param arguments
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void run(String script, String[] arguments) throws XBayaException;
+ public void run(String script, String[] arguments) throws WorkflowException;
}
\ 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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -27,7 +27,7 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import java.util.jar.JarFile;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.python.core.PySystemState;
import org.python.util.PythonInterpreter;
import org.slf4j.Logger;
@@ -38,10 +38,10 @@ public class JythonOneTimeRunnerImpl imp
private static final Logger logger = LoggerFactory.getLogger(JythonOneTimeRunnerImpl.class);
/**
- * @throws XBayaException
+ * @throws WorkflowException
* @see org.apache.airavata.xbaya.jython.runner.JythonOneTimeRunner#run(java.lang.String, java.lang.String[])
*/
- public void run(final String script, final String[] arguments) throws XBayaException {
+ public void run(final String script, final String[] arguments) throws WorkflowException {
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@@ -77,7 +77,7 @@ public class JythonOneTimeRunnerImpl imp
});
} catch (PrivilegedActionException e) {
logger.error(e.getMessage(), e);
- throw new XBayaException(e.getCause());
+ throw new WorkflowException(e.getCause());
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.jython
import java.util.List;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
public class JythonRunner {
@@ -43,29 +43,29 @@ public class JythonRunner {
/**
* @param script
* @param arguments
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void run(String script, List<String> arguments) throws XBayaException {
+ public void run(String script, List<String> arguments) throws WorkflowException {
run(script, arguments.toArray(new String[arguments.size()]));
}
/**
* @param script
* @param arguments
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void run(final String script, final String[] arguments) throws XBayaException {
+ public void run(final String script, final String[] arguments) throws WorkflowException {
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);
+ throw new WorkflowRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (InstantiationException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ throw new WorkflowRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (IllegalAccessException e) {
- throw new XBayaRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
+ throw new WorkflowRuntimeException(ErrorMessages.UNEXPECTED_ERROR, e);
} finally {
loader.cleanUp();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java Thu May 17 16:39:54 2012
@@ -32,25 +32,25 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.system.ConstantNode;
+import org.apache.airavata.workflow.model.graph.system.EndifNode;
+import org.apache.airavata.workflow.model.graph.system.IfNode;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.MemoNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaVersion;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.system.ConstantNode;
-import org.apache.airavata.xbaya.graph.system.EndifNode;
-import org.apache.airavata.xbaya.graph.system.IfNode;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.MemoNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.invoker.GenericInvoker;
import org.apache.airavata.xbaya.jython.lib.NotificationSender;
-import org.apache.airavata.xbaya.wf.Workflow;
public class JythonScript {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java Thu May 17 16:39:54 2012
@@ -29,11 +29,11 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
@@ -196,9 +196,9 @@ public class LEADWorkflowInvoker {
/**
* @return true if it succeeds; false otherwise
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public boolean invoke() throws XBayaException {
+ public boolean invoke() throws WorkflowException {
try {
logger.info("leadContext: " + XMLUtil.xmlElementToString(this.leadContext));
logger.info("inputMessage: " + XMLUtil.xmlElementToString((XmlElement) this.inputMessage));
@@ -214,7 +214,7 @@ public class LEADWorkflowInvoker {
return this.success;
} catch (RuntimeException e) {
String message = "Error in invoking a service.";
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -24,11 +24,11 @@ package org.apache.airavata.xbaya.lead;
import java.net.URI;
import org.apache.airavata.common.utils.WSDLUtil;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.airavata.xbaya.XBayaConfiguration;
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 xsul.lead.LeadContextHeader;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java Thu May 17 16:39:54 2012
@@ -34,10 +34,11 @@ import javax.swing.event.ChangeListener;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.wf.WorkflowExecutionState;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.event.Event;
import org.apache.airavata.xbaya.event.Event.Type;
import org.apache.airavata.xbaya.event.EventListener;
@@ -55,7 +56,6 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.monitor.gui.MonitorConfigurationWindow;
import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
-import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -321,7 +321,7 @@ public class RunMenuItem implements Eve
}
count++;
if(count > 20){
- throw new XBayaRuntimeException("Error stopping previous workflow Execution");
+ throw new WorkflowRuntimeException("Error stopping previous workflow Execution");
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/BPELFiler.java Thu May 17 16:39:54 2012
@@ -29,15 +29,15 @@ import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.gpel.script.BPELScript;
+import org.apache.airavata.workflow.model.gpel.script.BPELScriptType;
+import org.apache.airavata.workflow.model.gpel.script.WorkflowWSDL;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.gpel.script.BPELScript;
-import org.apache.airavata.xbaya.gpel.script.BPELScriptType;
-import org.apache.airavata.xbaya.gpel.script.WorkflowWSDL;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.gpel.model.GpelProcess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/JythonFiler.java Thu May 17 16:39:54 2012
@@ -29,13 +29,13 @@ import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.apache.airavata.common.utils.IOUtil;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.jython.script.JythonScript;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ODEScriptFiler.java Thu May 17 16:39:54 2012
@@ -34,13 +34,13 @@ import javax.swing.filechooser.FileFilte
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.WSDLUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.gpel.model.GpelProcess;
import org.xmlpull.infoset.XmlElement;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/ScuflFiler.java Thu May 17 16:39:54 2012
@@ -29,13 +29,13 @@ import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.apache.airavata.common.utils.IOUtil;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.scufl.script.ScuflScript;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java Thu May 17 16:39:54 2012
@@ -29,16 +29,16 @@ import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.ws.WSGraph;
+import org.apache.airavata.workflow.model.graph.ws.WSGraphFactory;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
-import org.apache.airavata.xbaya.graph.ws.WSGraph;
-import org.apache.airavata.xbaya.graph.ws.WSGraphFactory;
import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/XBayaMenuItem.java Thu May 17 16:39:54 2012
@@ -34,10 +34,10 @@ import javax.swing.event.ChangeListener;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.appwrapper.ApplicationDescriptionDialog;
import org.apache.airavata.xbaya.appwrapper.HostDescriptionDialog;
import org.apache.airavata.xbaya.appwrapper.ServiceDescriptionDialog;
@@ -559,7 +559,7 @@ public class XBayaMenuItem implements XB
public void actionPerformed(ActionEvent event) {
try {
XBayaMenuItem.this.engine.dispose();
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
} finally {
XBayaMenuItem.this.engine.getGUI().getFrame().dispose();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java Thu May 17 16:39:54 2012
@@ -31,26 +31,26 @@ import java.util.Set;
import org.apache.airavata.common.exception.UtilsException;
import org.apache.airavata.common.utils.WSDLUtil;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.system.InputComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.workflow.model.component.system.InputComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.impl.PortImpl;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSGraph;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.graph.ws.WSPort;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.graph.impl.PortImpl;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSGraph;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.xbaya.graph.ws.WSPort;
import org.apache.airavata.xbaya.monitor.MonitorEvent;
import org.apache.airavata.xbaya.monitor.MonitorEventData;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -115,7 +115,7 @@ public class WorkflowModifier {
output = getOutput(fromNodeID, messageName, parameterName);
} else {
// This should not happen.
- throw new XBayaRuntimeException(originalFromNode.getClass().getName());
+ throw new WorkflowRuntimeException(originalFromNode.getClass().getName());
}
Port originalToPort = originalFromPort.getToPorts().get(0);
PortImpl toPort = graph.getPort(originalToPort.getID());
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.event.Event;
import org.apache.airavata.xbaya.event.Event.Type;
import org.apache.airavata.xbaya.event.EventProducer;
@@ -131,7 +131,7 @@ public class Monitor extends EventProduc
public void run() {
try {
unsubscribe(client);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
// Ignore the error in unsubscription.
logger.error(e.getMessage(), e);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorException.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorException.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorException.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorException.java Thu May 17 16:39:54 2012
@@ -21,9 +21,9 @@
package org.apache.airavata.xbaya.monitor;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-public class MonitorException extends XBayaException {
+public class MonitorException extends WorkflowException {
/**
* Constructs a MonitorException.
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java Thu May 17 16:39:54 2012
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
import java.util.Date;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -537,16 +537,16 @@ public class MonitorUtil {
}
XmlElement notificationSource = event.element(WOR_NS, NOTIFICATION_SOURCE_TAG);
if (notificationSource == null) {
- throw new XBayaRuntimeException("The notification should have " + NOTIFICATION_SOURCE_TAG + " element.");
+ throw new WorkflowRuntimeException("The notification should have " + NOTIFICATION_SOURCE_TAG + " element.");
}
String workflowInstanceID = notificationSource.attributeValue(WOR_NS, SERVICE_ID_ATTRIBUTE);
if (workflowInstanceID == null) {
- throw new XBayaRuntimeException("The notification should have " + SERVICE_ID_ATTRIBUTE + " attribute.");
+ throw new WorkflowRuntimeException("The notification should have " + SERVICE_ID_ATTRIBUTE + " attribute.");
}
try {
return new URI(workflowInstanceID);
} catch (URISyntaxException e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -35,29 +35,29 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.airavata.common.utils.WSDLUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.ControlPort;
+import org.apache.airavata.workflow.model.graph.EPRPort;
+import org.apache.airavata.workflow.model.graph.Edge;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.amazon.InstanceNode;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSGraph;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.graph.ControlPort;
-import org.apache.airavata.xbaya.graph.EPRPort;
-import org.apache.airavata.xbaya.graph.Edge;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.amazon.InstanceNode;
import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-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.graph.ws.WSGraph;
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.wf.Workflow;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowClient.WorkflowType;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java Thu May 17 16:39:54 2012
@@ -39,13 +39,14 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.gpel.script.BPELScript;
+import org.apache.airavata.workflow.model.gpel.script.BPELScriptType;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.gpel.script.BPELScript;
-import org.apache.airavata.xbaya.gpel.script.BPELScriptType;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
@@ -60,7 +61,6 @@ import org.apache.airavata.xbaya.myproxy
import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
import org.apache.airavata.xbaya.security.UserX509Credential;
import org.apache.airavata.xbaya.security.XBayaSecurity;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
import org.ietf.jgss.GSSCredential;