Author: chathuri
Date: Mon Nov 5 15:39:52 2012
New Revision: 1405842
URL: http://svn.apache.org/viewvc?rev=1405842&view=rev
Log:
adding annotations
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
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=1405842&r1=1405841&r2=1405842&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
Mon Nov 5 15:39:52 2012
@@ -115,7 +115,7 @@ public class ExperimentDataRetriever {
workflowInstanceData = new WorkflowInstanceData(null,
workflowInstance, new
WorkflowInstanceStatus(workflowInstance,
createExecutionStatus(wdStatus),lastUpdateDate), null);
- workflowInstanceData.setExperimentData(experimentData);
+
workflowInstanceData.setExperimentData((ExperimentDataImpl)experimentData);
experimentData.getWorkflowInstanceData().add(workflowInstanceData);
}
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowInstanceData.getWorkflowInstance(),
rs.getString(10));
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
Mon Nov 5 15:39:52 2012
@@ -31,6 +31,12 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
public class ExperimentDataImpl implements ExperimentData{
private WorkflowInstanceStatus executionStatus;
private String user;
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
Mon Nov 5 15:39:52 2012
@@ -25,7 +25,14 @@ import java.util.List;
import
org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
public interface ExperimentData {
+
public String getExperimentId();
public String getTopic();
// public WorkflowInstanceStatus getExecutionStatus();
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
Mon Nov 5 15:39:52 2012
@@ -21,6 +21,12 @@
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
public class WorkflowIOData {
private String value;
private String nodeId;
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java
Mon Nov 5 15:39:52 2012
@@ -21,12 +21,18 @@
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
public class WorkflowInstance {
private String experimentId;
private String workflowInstanceId;
private String templateName;
-
- public WorkflowInstance(String experimentId,String instanceId) {
+
+ public WorkflowInstance() {
+ }
+
+ public WorkflowInstance(String experimentId,String instanceId) {
setExperimentId(experimentId);
setWorkflowInstanceId(instanceId);
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
Mon Nov 5 15:39:52 2012
@@ -26,17 +26,30 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
import
org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
public class WorkflowInstanceData {
private WorkflowInstance workflowInstance;
- private ExperimentData experimentData;
+
+ @XmlTransient
+ private ExperimentDataImpl experimentData;
private WorkflowInstanceStatus workflowInstanceStatus;
private List<WorkflowInstanceNodeData> nodeDataList;
-
- public WorkflowInstanceData(ExperimentData experimentData,
WorkflowInstance workflowInstance,WorkflowInstanceStatus
workflowInstanceStatus,List<WorkflowInstanceNodeData> nodeDataList) {
- this.experimentData=experimentData;
+
+ public WorkflowInstanceData() {
+ }
+
+ public WorkflowInstanceData(ExperimentData experimentData,
WorkflowInstance workflowInstance,WorkflowInstanceStatus
workflowInstanceStatus,List<WorkflowInstanceNodeData> nodeDataList) {
+ this.experimentData= (ExperimentDataImpl)experimentData;
this.workflowInstance=workflowInstance;
this.workflowInstanceStatus=workflowInstanceStatus;
this.nodeDataList=nodeDataList;
@@ -102,11 +115,11 @@ public class WorkflowInstanceData {
return null;
}
- public ExperimentData getExperimentData() {
+ public ExperimentDataImpl getExperimentData() {
return experimentData;
}
- public void setExperimentData(ExperimentData experimentData) {
+ public void setExperimentData(ExperimentDataImpl experimentData) {
this.experimentData = experimentData;
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
Mon Nov 5 15:39:52 2012
@@ -21,11 +21,20 @@
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
public class WorkflowInstanceNode{
private WorkflowInstance workflowInstance;
private String nodeId;
-
- public WorkflowInstanceNode(WorkflowInstance workflowInstance, String
nodeId) {
+
+ public WorkflowInstanceNode() {
+ }
+
+ public WorkflowInstanceNode(WorkflowInstance workflowInstance, String
nodeId) {
setWorkflowInstance(workflowInstance);
setNodeId(nodeId);
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
Mon Nov 5 15:39:52 2012
@@ -21,19 +21,27 @@
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-public class WorkflowInstanceNodeData{
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class WorkflowInstanceNodeData{
private WorkflowInstanceNode workflowInstanceNode;
private List<WorkflowInstanceNodePortData> inputData;
private List<WorkflowInstanceNodePortData> outputData;
private String input;
private String output;
private WorkflowInstanceNodeStatus status;
-
- public WorkflowInstanceNodeData(WorkflowInstanceNode
workflowInstanceNode) {
+
+ public WorkflowInstanceNodeData() {
+ }
+
+ public WorkflowInstanceNodeData(WorkflowInstanceNode workflowInstanceNode)
{
setWorkflowInstanceNode(workflowInstanceNode);
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
Mon Nov 5 15:39:52 2012
@@ -21,12 +21,21 @@
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
public class WorkflowInstanceNodePortData {
private WorkflowInstanceNode workflowInstanceNode;
private String name;
private String value;
-
- public WorkflowInstanceNodePortData(WorkflowInstanceNode
workflowInstanceNode, String portName, String portValue) {
+
+ public WorkflowInstanceNodePortData() {
+ }
+
+ public WorkflowInstanceNodePortData(WorkflowInstanceNode
workflowInstanceNode, String portName, String portValue) {
setWorkflowInstanceNode(workflowInstanceNode);
setName(portName);
setValue(portValue);
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
Mon Nov 5 15:39:52 2012
@@ -26,11 +26,20 @@ import java.util.Date;
import
org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
public class WorkflowInstanceNodeStatus {
private ExecutionStatus executionStatus;
private Date statusUpdateTime = null;
private WorkflowInstanceNode workflowInstanceNode;
+ public WorkflowInstanceNodeStatus() {
+ }
+
public ExecutionStatus getExecutionStatus() {
return executionStatus;
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java
Mon Nov 5 15:39:52 2012
@@ -21,10 +21,18 @@
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.Calendar;
import java.util.Date;
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
public class WorkflowInstanceStatus {
+ public WorkflowInstanceStatus() {
+ }
+
public enum ExecutionStatus {
STARTED {
public String toString() {
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java?rev=1405842&r1=1405841&r2=1405842&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
Mon Nov 5 15:39:52 2012
@@ -20,6 +20,9 @@
*/
package org.apache.airavata.registry.api.workflow;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
public class WorkflowNodeGramData {
String NodeID;
String rsl;
@@ -27,6 +30,9 @@ public class WorkflowNodeGramData {
String gramJobID;
private String workflowInstanceId;
+ public WorkflowNodeGramData() {
+ }
+
public WorkflowNodeGramData(String workflowInstanceId, String nodeID,
String rsl, String invokedHost, String gramJobID) {
NodeID = nodeID;
this.rsl = rsl;
