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 9B58AD6C3 for ; Tue, 11 Dec 2012 22:22:26 +0000 (UTC) Received: (qmail 31401 invoked by uid 500); 11 Dec 2012 22:22:26 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 31350 invoked by uid 500); 11 Dec 2012 22:22:26 -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 31343 invoked by uid 99); 11 Dec 2012 22:22:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 22:22:26 +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, 11 Dec 2012 22:22:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 780792388A4A; Tue, 11 Dec 2012 22:22:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1420463 - in /airavata/trunk/modules: registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ registry/registry-api/src... Date: Tue, 11 Dec 2012 22:22:02 -0000 To: commits@airavata.apache.org From: chathuri@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121211222204.780792388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chathuri Date: Tue Dec 11 22:21:58 2012 New Revision: 1420463 URL: http://svn.apache.org/viewvc?rev=1420463&view=rev Log: fixing issues in registry browser view 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/WorkflowInstanceData.java airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java airavata/trunk/modules/rest/webapp/pom.xml airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml 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=1420463&r1=1420462&r2=1420463&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 Tue Dec 11 22:21:58 2012 @@ -104,7 +104,7 @@ public class ExperimentDataRetriever { private void fillWorkflowInstanceData (ExperimentData experimentData, ResultSet rs, List workflowInstances) throws SQLException, ExperimentLazyLoadedException, ParseException { - WorkflowInstanceData workflowInstanceData = experimentData.getWorkflowInstance(rs.getString(5)); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)experimentData.getWorkflowInstance(rs.getString(5)); if (workflowInstanceData == null){ WorkflowInstance workflowInstance = new WorkflowInstance(experimentData.getExperimentId(), rs.getString(5)); workflowInstance.setTemplateName(rs.getString(6)); 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=1420463&r1=1420462&r2=1420463&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 Tue Dec 11 22:21:58 2012 @@ -42,7 +42,7 @@ public class ExperimentDataImpl implemen private String experimentId; private String metadata; private String workflowInstanceName; - private List workflowInstanceDataList=new ArrayList(); + private List workflowInstanceDataList=new ArrayList(); private boolean lazyLoaded=false; public ExperimentDataImpl() { @@ -162,7 +162,7 @@ public class ExperimentDataImpl implemen } @Override - public List getWorkflowInstanceData() throws ExperimentLazyLoadedException{ + public List getWorkflowInstanceData() throws ExperimentLazyLoadedException{ if (isLazyLoaded()){ throw new ExperimentLazyLoadedException(getExperimentId()); } 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=1420463&r1=1420462&r2=1420463&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 Tue Dec 11 22:21:58 2012 @@ -24,6 +24,7 @@ package org.apache.airavata.registry.api import java.util.List; import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException; +import org.apache.airavata.registry.api.impl.WorkflowInstanceDataImpl; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -45,7 +46,7 @@ public interface ExperimentData extends // public WorkflowIOData getOutput(String nodeId); public String getMetadata(); public String getExperimentName(); - public List getWorkflowInstanceData() throws ExperimentLazyLoadedException; + public List getWorkflowInstanceData() throws ExperimentLazyLoadedException; public void setExperimentId(String experimentId); public void setTopic(String topic); 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=1420463&r1=1420462&r2=1420463&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 Tue Dec 11 22:21:58 2012 @@ -22,9 +22,14 @@ package org.apache.airavata.registry.api import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException; import org.apache.airavata.registry.api.impl.ExperimentDataImpl; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; import java.util.Date; import java.util.List; +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) public interface WorkflowInstanceData { public WorkflowInstance getWorkflowInstance() throws ExperimentLazyLoadedException; public List getNodeDataList() throws ExperimentLazyLoadedException; Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1420463&r1=1420462&r2=1420463&view=diff ============================================================================== --- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java (original) +++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java Tue Dec 11 22:21:58 2012 @@ -30,6 +30,7 @@ import com.sun.jersey.api.json.JSONConfi import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.airavata.registry.api.PasswordCallback; import org.apache.airavata.registry.api.impl.ExperimentDataImpl; +import org.apache.airavata.registry.api.impl.WorkflowInstanceDataImpl; import org.apache.airavata.registry.api.workflow.*; import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList; import org.apache.airavata.rest.mappings.resourcemappings.ExperimentIDList; @@ -1282,7 +1283,7 @@ public class ProvenanceResourceClient { } } - WorkflowInstanceData workflowInstanceData = response.getEntity(WorkflowInstanceData.class); + WorkflowInstanceDataImpl workflowInstanceData = response.getEntity(WorkflowInstanceDataImpl.class); return workflowInstanceData; } Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1420463&r1=1420462&r2=1420463&view=diff ============================================================================== --- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java (original) +++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java Tue Dec 11 22:21:58 2012 @@ -25,6 +25,7 @@ import org.apache.airavata.registry.api. import org.apache.airavata.registry.api.exception.RegistryException; import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException; import org.apache.airavata.registry.api.impl.ExperimentDataImpl; +import org.apache.airavata.registry.api.impl.WorkflowInstanceDataImpl; import org.apache.airavata.registry.api.workflow.*; import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList; import org.apache.airavata.rest.mappings.resourcemappings.ExperimentIDList; @@ -459,7 +460,8 @@ public class ProvenanceRegistryResource try { DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date formattedDate = dateFormat.parse(statusUpdateTime); - WorkflowInstance workflowInstance = airavataRegistry.getWorkflowInstanceData(workflowInstanceId).getWorkflowInstance(); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId); + WorkflowInstance workflowInstance = workflowInstanceData.getWorkflowInstance(); WorkflowInstanceStatus.ExecutionStatus status = WorkflowInstanceStatus.ExecutionStatus.valueOf(executionStatus); WorkflowInstanceStatus workflowInstanceStatus = new WorkflowInstanceStatus(workflowInstance, status, formattedDate); airavataRegistry.updateWorkflowInstanceStatus(workflowInstanceStatus); @@ -474,10 +476,6 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); @@ -533,7 +531,7 @@ public class ProvenanceRegistryResource @FormParam("data") String data) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { - WorkflowInstanceData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceID); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID); WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeID).getWorkflowInstanceNode(); airavataRegistry.updateWorkflowNodeInput(workflowInstanceNode, data); Response.ResponseBuilder builder = Response.status(Response.Status.OK); @@ -543,11 +541,7 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); - } finally { + } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); } @@ -571,7 +565,7 @@ public class ProvenanceRegistryResource @FormParam("data") String data) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { - WorkflowInstanceData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceID); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID); WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeID).getWorkflowInstanceNode(); airavataRegistry.updateWorkflowNodeOutput(workflowInstanceNode, data); Response.ResponseBuilder builder = Response.status(Response.Status.OK); @@ -581,10 +575,6 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); @@ -908,7 +898,7 @@ public class ProvenanceRegistryResource @QueryParam("nodeId") String nodeId) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { - WorkflowInstanceData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId); WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode(); WorkflowInstanceNodeStatus workflowNodeStatus = airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode); if (workflowNodeStatus != null) { @@ -923,10 +913,6 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); @@ -948,7 +934,7 @@ public class ProvenanceRegistryResource @QueryParam("nodeId") String nodeId) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { - WorkflowInstanceData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId); WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode(); Date workflowNodeStartTime = airavataRegistry.getWorkflowNodeStartTime(workflowInstanceNode); if (workflowNodeStartTime != null) { @@ -963,10 +949,6 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); @@ -986,7 +968,7 @@ public class ProvenanceRegistryResource public Response getWorkflowStartTime(@QueryParam("workflowInstanceId") String workflowInstanceId) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { - WorkflowInstanceData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId); WorkflowInstance workflowInstance = workflowInstanceData.getWorkflowInstance(); Date workflowStartTime = airavataRegistry.getWorkflowStartTime(workflowInstance); if (workflowStartTime != null) { @@ -1001,10 +983,6 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); @@ -1053,7 +1031,7 @@ public class ProvenanceRegistryResource public Response getWorkflowInstanceData(@QueryParam("workflowInstanceId") String workflowInstanceId) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { - WorkflowInstanceData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId); + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId); if (workflowInstanceData != null) { Response.ResponseBuilder builder = Response.status(Response.Status.OK); builder.entity(workflowInstanceData); @@ -1231,8 +1209,9 @@ public class ProvenanceRegistryResource @FormParam("nodeType") String nodeType) { AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context); try { + WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId); WorkflowInstanceNodeData workflowInstanceNodeData = - airavataRegistry.getWorkflowInstanceData(workflowInstanceId).getNodeData(nodeId); + workflowInstanceData.getNodeData(nodeId); WorkflowInstanceNode workflowInstanceNode = workflowInstanceNodeData.getWorkflowInstanceNode(); WorkflowNodeType workflowNodeType = new WorkflowNodeType(); @@ -1248,10 +1227,6 @@ public class ProvenanceRegistryResource Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); builder.entity(e.getMessage()); return builder.build(); - } catch (ExperimentLazyLoadedException e) { - Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR); - builder.entity(e.getMessage()); - return builder.build(); } finally { if (airavataRegistry != null) { RegPoolUtils.releaseRegistry(context, airavataRegistry); Modified: airavata/trunk/modules/rest/webapp/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1420463&r1=1420462&r2=1420463&view=diff ============================================================================== --- airavata/trunk/modules/rest/webapp/pom.xml (original) +++ airavata/trunk/modules/rest/webapp/pom.xml Tue Dec 11 22:21:58 2012 @@ -204,7 +204,7 @@ 1.13 2.0.0-M3 - UTF-8 + 1.2.1 Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml?rev=1420463&r1=1420462&r2=1420463&view=diff ============================================================================== --- airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml (original) +++ airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml Tue Dec 11 22:21:58 2012 @@ -1,7 +1,10 @@ - + org.apache.airavata.rest.mappings.utils.RegistryListener