Author: chathuri
Date: Thu Dec 13 21:13:20 2012
New Revision: 1421538
URL: http://svn.apache.org/viewvc?rev=1421538&view=rev
Log:
updating workflow instance node type
Modified:
airavata/trunk/modules/integration-tests/derby-start.txt
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
Modified: airavata/trunk/modules/integration-tests/derby-start.txt
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/derby-start.txt?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/derby-start.txt (original)
+++ airavata/trunk/modules/integration-tests/derby-start.txt Thu Dec 13
21:13:20 2012
@@ -1 +1 @@
-./derby.sh: line 22: cd:
/Users/thejaka/development/apache/airavata/trunk-integration/modules/integration-tests/target/tests/apache-tomcat-7.0.33/webapps/axis2/WEB-INF/bin:
No such file or directory
+./derby.sh: line 22: cd:
/Users/chathuri/airavata/source/trunk_new/modules/integration-tests/target/tests/apache-tomcat-7.0.33/webapps/axis2/WEB-INF/bin:
No such file or directory
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
Thu Dec 13 21:13:20 2012
@@ -1301,7 +1301,7 @@ public class AiravataJPARegistry extends
WorkflowInstanceNodeData data = new
WorkflowInstanceNodeData(new WorkflowInstanceNode(new
WorkflowInstance(nodeData.getWorkflowDataResource().getExperimentID(),nodeData.getWorkflowDataResource().getWorkflowInstanceID()),nodeData.getNodeID()));
data.setInput(nodeData.getInputs());
data.setOutput(nodeData.getOutputs());
-
data.setType(WorkflowNodeType.WorkflowNode.valueOf(nodeData.getNodeType()));
+
data.setType(WorkflowNodeType.getType(nodeData.getNodeType()).getNodeType());
//TODO setup status
return data;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
Thu Dec 13 21:13:20 2012
@@ -128,6 +128,7 @@ public class ExperimentDataRetriever {
workflowInstanceNodeData.setInput(inputData);
workflowInstanceNodeData.setOutput(outputData);
workflowInstanceNodeData.setStatus(createExecutionStatus(rs.getString(16)),
getTime(rs.getString(18)));
+
workflowInstanceNodeData.setType(WorkflowNodeType.getType(rs.getString(15)).getNodeType());
workflowInstanceData.getNodeDataList().add(workflowInstanceNodeData);
}
Modified:
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
(original)
+++
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
Thu Dec 13 21:13:20 2012
@@ -1352,6 +1352,8 @@ public class AiravataRegistryAPITest ext
registry.addWorkflowInstance("testExp", "testWorkflow7", "template1");
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(new WorkflowInstance("testExp", "testWorkflow7"),
"testNode");
+ WorkflowNodeType nodeType = new
WorkflowNodeType(WorkflowNodeType.WorkflowNode.INPUTNODE);
+ registry.updateWorkflowNodeType(workflowInstanceNode, nodeType);
registry.updateWorkflowNodeInput(workflowInstanceNode, "testData");
WorkflowInstanceNodeData nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow7", "testNode");
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
Thu Dec 13 21:13:20 2012
@@ -27,6 +27,13 @@ import javax.xml.bind.annotation.XmlRoot
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement
public class WorkflowNodeType {
+ public WorkflowNodeType(WorkflowNode nodeType) {
+ this.nodeType = nodeType;
+ }
+
+ public WorkflowNodeType() {
+ }
+
public enum WorkflowNode {
SERVICENODE {
public String toString() {
@@ -64,4 +71,14 @@ public class WorkflowNodeType {
public void setNodeType(WorkflowNode nodeType) {
this.nodeType = nodeType;
}
+
+ public static WorkflowNodeType getType(String type){
+ for(WorkflowNode w:WorkflowNode.values()){
+ if (w.toString().equalsIgnoreCase(type)){
+ return new WorkflowNodeType(w);
+ }
+ }
+ return new WorkflowNodeType(WorkflowNode.UNKNOWN);
+ }
+
}
Modified:
airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
Binary files - no diff available.
Modified: airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
Binary files - no diff available.
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java?rev=1421538&r1=1421537&r2=1421538&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
Thu Dec 13 21:13:20 2012
@@ -55,7 +55,7 @@ public class XBayaWorkflowNodeElementNod
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf,
boolean hasFocus) {
- String type = "";
+ String type =
getXbayaWorkflowNodeElement().getNodeData().getType().toString();
// if (selected) {
// type = " <font color=\"#D3D3D3\">Service call</font>";
// }
