airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1406294 - in /airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api: ./ workflow/
Date Tue, 06 Nov 2012 20:05:06 GMT
Author: chathuri
Date: Tue Nov  6 20:05:06 2012
New Revision: 1406294

URL: http://svn.apache.org/viewvc?rev=1406294&view=rev
Log:
adding annotations compatible with REST service

Modified:
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataExperiment.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataUser.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Gateway.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataExperiment.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataExperiment.java?rev=1406294&r1=1406293&r2=1406294&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataExperiment.java
(original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataExperiment.java
Tue Nov  6 20:05:06 2012
@@ -21,16 +21,26 @@
 
 package org.apache.airavata.registry.api;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Date;
 
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
 public class AiravataExperiment {
 	private String experimentId;
 	private Date submittedDate;
 	private AiravataUser user;
+//    @XmlAnyElement
 	private WorkspaceProject project;
 	private Gateway gateway;
-	
-	public String getExperimentId() {
+
+    public AiravataExperiment() {
+    }
+
+    public String getExperimentId() {
 		return experimentId;
 	}
 	public void setExperimentId(String experimentId) {

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataUser.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataUser.java?rev=1406294&r1=1406293&r2=1406294&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataUser.java
(original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataUser.java
Tue Nov  6 20:05:06 2012
@@ -21,10 +21,19 @@
 
 package org.apache.airavata.registry.api;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
 public class AiravataUser {
 	private String userName;
 
-	public AiravataUser(String userName) {
+    public AiravataUser() {
+    }
+
+    public AiravataUser(String userName) {
 		setUserName(userName);
 	}
 	

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Gateway.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Gateway.java?rev=1406294&r1=1406293&r2=1406294&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Gateway.java
(original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/Gateway.java
Tue Nov  6 20:05:06 2012
@@ -21,10 +21,19 @@
 
 package org.apache.airavata.registry.api;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
 public class Gateway {
 	private String gatewayName = "default";
-	
-	public Gateway(String gatewayName) {
+
+    public Gateway() {
+    }
+
+    public Gateway(String gatewayName) {
 		setGatewayName(gatewayName);
 	}
 	

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java?rev=1406294&r1=1406293&r2=1406294&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
(original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
Tue Nov  6 20:05:06 2012
@@ -26,11 +26,21 @@ import java.util.List;
 
 import org.apache.airavata.registry.api.exception.RegistryException;
 
+import javax.xml.bind.annotation.*;
+
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement
 public class WorkspaceProject{
 	private String projectName;
+
+    @XmlTransient
 	private ProjectsRegistry projectsRegistry;
-	
-	public WorkspaceProject(String projectName, ProjectsRegistry registry) {
+
+    public WorkspaceProject() {
+    }
+
+    public WorkspaceProject(String projectName, ProjectsRegistry registry) {
 		setProjectName(projectName);
 		setProjectsRegistry(registry);
 	}
@@ -43,11 +53,11 @@ public class WorkspaceProject{
 		this.projectName = projectName;
 	}
 
-	public ProjectsRegistry getProjectsRegistry() {
+	private ProjectsRegistry getProjectsRegistry() {
 		return projectsRegistry;
 	}
 
-	public void setProjectsRegistry(ProjectsRegistry projectsRegistry) {
+	private void setProjectsRegistry(ProjectsRegistry projectsRegistry) {
 		this.projectsRegistry = projectsRegistry;
 	}
 	

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java?rev=1406294&r1=1406293&r2=1406294&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
(original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
Tue Nov  6 20:05:06 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 WorkflowNodeIOData extends WorkflowIOData {
 	private String experimentId;
     private String workflowName;

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=1406294&r1=1406293&r2=1406294&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
Tue Nov  6 20:05:06 2012
@@ -20,6 +20,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 WorkflowNodeType {
     public enum WorkflowNode {
         SERVICENODE {



Mime
View raw message