Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B6B8EDFB4 for ; Tue, 13 Nov 2012 22:03:29 +0000 (UTC) Received: (qmail 74586 invoked by uid 500); 13 Nov 2012 22:03:29 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 74545 invoked by uid 500); 13 Nov 2012 22:03:29 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 74538 invoked by uid 99); 13 Nov 2012 22:03:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 22:03:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 22:03:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 359A623888CD for ; Tue, 13 Nov 2012 22:03:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1408982 - in /airavata/trunk/modules/registry: airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ registry-api/src/main/java/org/apache/airavata/registry/api/ Date: Tue, 13 Nov 2012 22:03:07 -0000 To: commits@airavata.apache.org From: chathuri@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121113220308.359A623888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chathuri Date: Tue Nov 13 22:03:06 2012 New Revision: 1408982 URL: http://svn.apache.org/viewvc?rev=1408982&view=rev Log: changing workspace project class map with REST implementation Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java 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=1408982&r1=1408981&r2=1408982&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 Tue Nov 13 22:03:06 2012 @@ -809,6 +809,11 @@ public class AiravataJPARegistry extends setUser(user); } + @Override + public AiravataUser getAiravataUser() { + return getUser(); + } + /**---------------------------------Provenance Registry----------------------------------**/ @Override Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java?rev=1408982&r1=1408981&r2=1408982&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java Tue Nov 13 22:03:06 2012 @@ -30,7 +30,11 @@ public interface AiravataSubRegistry { public abstract void setAiravataUser(AiravataUser user); public abstract void setGateway(Gateway gateway); - + + public abstract Gateway getGateway(); + + public abstract AiravataUser getAiravataUser(); + /** * Determines whether this registry is active. If true the registry is ready to do the * transaction 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=1408982&r1=1408981&r2=1408982&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 13 22:03:06 2012 @@ -33,9 +33,11 @@ import javax.xml.bind.annotation.*; @XmlRootElement public class WorkspaceProject{ private String projectName; + private Gateway gateway; + private AiravataUser airavataUser; @XmlTransient - private ProjectsRegistry projectsRegistry; + private ProjectsRegistry projectsRegistry; public WorkspaceProject() { } @@ -43,6 +45,8 @@ public class WorkspaceProject{ public WorkspaceProject(String projectName, ProjectsRegistry registry) { setProjectName(projectName); setProjectsRegistry(registry); + setGateway(registry.getGateway()); + setAiravataUser(registry.getAiravataUser()); } public String getProjectName() { @@ -53,11 +57,11 @@ public class WorkspaceProject{ this.projectName = projectName; } - private ProjectsRegistry getProjectsRegistry() { + public ProjectsRegistry getProjectsRegistry() { return projectsRegistry; } - private void setProjectsRegistry(ProjectsRegistry projectsRegistry) { + public void setProjectsRegistry(ProjectsRegistry projectsRegistry) { this.projectsRegistry = projectsRegistry; } @@ -72,4 +76,20 @@ public class WorkspaceProject{ public List getExperiments(Date from, Date to) throws RegistryException{ return getProjectsRegistry().getExperiments(getProjectName(),from, to); } + + public Gateway getGateway() { + return gateway; + } + + public AiravataUser getAiravataUser() { + return airavataUser; + } + + public void setGateway(Gateway gateway) { + this.gateway = gateway; + } + + public void setAiravataUser(AiravataUser airavataUser) { + this.airavataUser = airavataUser; + } }