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 A5BB217F72 for ; Mon, 22 Jun 2015 12:01:39 +0000 (UTC) Received: (qmail 37704 invoked by uid 500); 22 Jun 2015 12:01:39 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 37612 invoked by uid 500); 22 Jun 2015 12:01:39 -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 37514 invoked by uid 99); 22 Jun 2015 12:01:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2015 12:01:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5F674E099D; Mon, 22 Jun 2015 12:01:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Mon, 22 Jun 2015 12:01:41 -0000 Message-Id: In-Reply-To: <1a0f868641f84b4c8f1b0d174b583878@git.apache.org> References: <1a0f868641f84b4c8f1b0d174b583878@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] airavata git commit: Fixing get and search CPI methods in the experiment registry class http://git-wip-us.apache.org/repos/asf/airavata/blob/bce94ae9/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java index 034ee77..33d3c73 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java @@ -33,72 +33,42 @@ public class Constants { } public final class ExperimentConstants { - public static final String EXPERIMENT_NAME = "experimentName"; - public static final String USER_NAME = "userName"; - public static final String GATEWAY = "gatewayId"; - public static final String EXPERIMENT_DESC = "experimentDescription"; + public static final String EXPERIMENT_ID = "experimentId"; public static final String PROJECT_ID = "projectId"; + public static final String EXPERIMENT_TYPE = "experimentType"; + public static final String USER_NAME = "userName"; + public static final String EXPERIMENT_NAME = "experimentName"; public static final String CREATION_TIME = "creationTime"; - public static final String APPLICATION_ID = "applicationId"; - public static final String APPLICATION_VERSION = "applicationVersion"; - public static final String WORKFLOW_TEMPLATE_ID = "workflowTemplateId"; - public static final String WORKFLOW_TEMPLATE_VERSION = "worklfowTemplateVersion"; - public static final String USER_CONFIGURATION_DATA = "userConfigurationData"; - public static final String WORKFLOW_EXECUTION_ID = "workflowExecutionInstanceId"; + public static final String DESCRIPTION = "description"; + public static final String EXECUTION_ID = "executionId"; + public static final String GATEWAY_EXECUTION_ID = "gatewayExecutionId"; + public static final String ENABLE_EMAIL_NOTIFICATION = "enableEmailNotification"; + public static final String EMAIL_ADDRESSES = "emailAddresses"; public static final String EXPERIMENT_INPUTS = "experimentInputs"; public static final String EXPERIMENT_OUTPUTS = "experimentOutputs"; public static final String EXPERIMENT_STATUS = "experimentStatus"; - public static final String STATE_CHANGE_LIST = "stateChangeList"; - public static final String WORKFLOW_NODE_LIST = "workflowNodeDetailsList"; - public static final String ERROR_DETAIL_LIST = "errors"; + public static final String EXPERIMENT_ERRORS = "experimentErrors"; + public static final String USER_CONFIGURATION_DATA = "userConfigurationData"; public static final String FROM_DATE = "fromDate"; public static final String TO_DATE = "toDate"; - } - public final class ConfigurationDataConstants { + public final class UserConfigurationDataConstants { public static final String EXPERIMENT_ID = "experimentId"; public static final String AIRAVATA_AUTO_SCHEDULE = "airavataAutoSchedule"; public static final String OVERRIDE_MANUAL_PARAMS = "overrideManualScheduledParams"; public static final String SHARE_EXP = "shareExperimentPublicly"; public static final String COMPUTATIONAL_RESOURCE_SCHEDULING = "computationalResourceScheduling"; - public static final String ADVANCED_INPUT_HANDLING = "advanceInputDataHandling"; - public static final String ADVANCED_OUTPUT_HANDLING = "advanceOutputDataHandling"; - public static final String QOS_PARAMS = "qosParams"; - } - - public final class WorkflowNodeConstants { - public static final String EXPERIMENT_ID = "experimentId"; - public static final String NODE_NAME = "nodeName"; - public static final String NODE_INPUTS = "nodeInputs"; - public static final String NODE_OUTPUTS = "nodeOutputs"; - public static final String WF_NODE_STATUS = "workflowNodeStatus"; - public static final String TASK_LIST = "taskDetailsList"; - public static final String NODE_ERRORS = "errors"; } - public final class TaskDetailConstants { + public final class ProcessConstants { public static final String EXPERIMENT_ID = "experimentId"; - public static final String NODE_ID = "nodeId"; - } - - public final class JobDetaisConstants { - public static final String TASK_ID = "taskId"; + public static final String PROCESS_ID = "processId"; } - public final class DataTransferDetailConstants { - public static final String TASK_ID = "taskId"; - } - - public final class WorkflowNodeStatusConstants { - public static final String EXPERIMENT_ID = "experimentId"; - } - - public final class ErrorDetailsConstants { - public static final String EXPERIMENT_ID = "experimentId"; - public static final String NODE_ID = "nodeId"; + public final class TaskConstants { + public static final String PARENT_PROCESS_ID = "parentProcessId"; public static final String TASK_ID = "taskId"; - public static final String JOB_ID = "jobId"; } } }