airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [02/44] airavata git commit: Changing the thrift model variable names to lower camel case
Date Sun, 07 Jun 2015 17:00:43 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
index eee0001..8442cf2 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
@@ -74,7 +74,7 @@ public class NewOrchestratorTest extends BaseOrchestratorTest {
 //        Registry defaultRegistry = RegistryFactory.getDefaultRegistry();
 //        String experimentId = (String)defaultRegistry.add(ParentDataType.EXPERIMENT, simpleExperiment);
 //
-//        simpleExperiment.setExperimentID(experimentId);
+//        simpleExperiment.setExperimentId(experimentId);
 //        tasks = orchestrator.createTasks(experimentId);
 //          for(TaskDetails details:tasks) {
 //              orchestrator.launchExperiment(simpleExperiment,test, details,null);

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
index 7fa678b..c5263ea 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
@@ -56,7 +56,7 @@ public class OrchestratorTestWithGRAM extends BaseOrchestratorTest {
 ////        basicMetadata.setExperimentName("test-trestles");
 ////        basicMetadata.setUserName("admin");
 ////        basicMetadata.setUserNameIsSet(true);
-////        basicMetadata.setProjectID("default");
+////        basicMetadata.setProjectId("default");
 ////
 ////        AdvancedInputDataHandling advancedInputDataHandling = new AdvancedInputDataHandling();
 ////        AdvancedOutputDataHandling advancedOutputDataHandling = new AdvancedOutputDataHandling();

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java
index dcf1c6e..2f38a39 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ValidatorTest.java
@@ -89,19 +89,19 @@
 //        Registry defaultRegistry = RegistryFactory.getDefaultRegistry();
 //        String experimentId = (String)defaultRegistry.add(ParentDataType.EXPERIMENT, simpleExperiment);
 //
-//        simpleExperiment.setExperimentID(experimentId);
+//        simpleExperiment.setExperimentId(experimentId);
 //        tasks = orchestrator.createTasks(experimentId);
 //
 //        Assert.assertTrue(orchestrator.validateExperiment(simpleExperiment, test, tasks.get(0)).isValidationState());
 //
-//        simpleExperiment.setExperimentID(null);
+//        simpleExperiment.setExperimentId(null);
 //
 //        try {
 //            orchestrator.validateExperiment(simpleExperiment, test, tasks.get(0)).isValidationState();
 //        }catch(LaunchValidationException e){
 //            Assert.assertTrue(true);
 //        }
-//        tasks.get(0).setTaskID(null);
+//        tasks.get(0).setTaskId(null);
 //        try {
 //            orchestrator.validateExperiment(simpleExperiment, test, tasks.get(0));
 //        }catch (LaunchValidationException e){

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/SecondValidator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/SecondValidator.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/SecondValidator.java
index 578aa9c..07001f1 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/SecondValidator.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/SecondValidator.java
@@ -31,7 +31,7 @@ public class SecondValidator implements JobMetadataValidator {
     public ValidationResults validate(Experiment experiment, WorkflowNodeDetails workflowNodeDetail, TaskDetails taskID) {
         ValidationResults validationResults = new ValidationResults();
         validationResults.setValidationState(true);
-        if(taskID.getTaskID() == null) {
+        if(taskID.getTaskId() == null) {
             ValidatorResult validatorResult = new ValidatorResult(false);
             validatorResult.setErrorDetails("No taskID is set, so Validation failed");
             validationResults.addToValidationResultList(validatorResult);

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/TestValidator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/TestValidator.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/TestValidator.java
index dd4310c..3a38ff2 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/TestValidator.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/TestValidator.java
@@ -36,13 +36,13 @@ public class TestValidator implements JobMetadataValidator {
     public ValidationResults validate(Experiment experiment, WorkflowNodeDetails workflowNodeDetail, TaskDetails taskID) {
         ValidationResults validationResults = new ValidationResults();
         validationResults.setValidationState(true);
-        if (experiment.getProjectID() == null) {
+        if (experiment.getProjectId() == null) {
             logger.error("Project ID is not set");
             ValidatorResult validatorResult = new ValidatorResult(false);
             validatorResult.setErrorDetails("Project ID is not set");
             validationResults.addToValidationResultList(validatorResult);
             validationResults.setValidationState(false);
-        } else if (experiment.getExperimentID() == null) {
+        } else if (experiment.getExperimentId() == null) {
             logger.error("This experiment is wrong, no experimentID set");
             ValidatorResult validatorResult = new ValidatorResult(false);
             validatorResult.setErrorDetails("This experiment is wrong, no experimentID set");

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index 536c054..a6909f1 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -64,8 +64,8 @@ public class ExperimentRegistry {
                 ResourceUtils.addUser(experiment.getUserName(), null);
             }
 
-            experimentID = getExperimentID(experiment.getName());
-            experiment.setExperimentID(experimentID);
+            experimentID = getExperimentId(experiment.getName());
+            experiment.setExperimentId(experimentID);
             ExperimentResource experimentResource = new ExperimentResource();
             experimentResource.setExpID(experimentID);
             experimentResource.setExpName(experiment.getName());
@@ -74,11 +74,11 @@ public class ExperimentRegistry {
             experimentResource.setGateway(gateway);
             experimentResource.setGatewayExecutionId(experiment.getGatewayExecutionId());
             experimentResource.setEnableEmailNotifications(experiment.isEnableEmailNotification());
-            if (!workerResource.isProjectExists(experiment.getProjectID())) {
+            if (!workerResource.isProjectExists(experiment.getProjectId())) {
                 logger.error("Project does not exist in the system..");
                 throw new Exception("Project does not exist in the system, Please create the project first...");
             }
-            ProjectResource project = workerResource.getProject(experiment.getProjectID());
+            ProjectResource project = workerResource.getProject(experiment.getProjectId());
             experimentResource.setProject(project);
             experimentResource.setCreationTime(AiravataUtils.getTime(experiment.getCreationTime()));
             experimentResource.setDescription(experiment.getDescription());
@@ -154,7 +154,7 @@ public class ExperimentRegistry {
             configData.setAiravataAutoSchedule(configurationData.isAiravataAutoSchedule());
             configData.setOverrideManualParams(configurationData.isOverrideManualScheduledParams());
             configData.setShareExp(configurationData.isShareExperimentPublicly());
-            configData.setUserDn(configurationData.getUserDN());
+            configData.setUserDn(configurationData.getUserDn());
             configData.setGenerateCert(configurationData.isGenerateCert());
             configData.save();
             ComputationalResourceScheduling resourceScheduling = configurationData.getComputationalResourceScheduling();
@@ -265,7 +265,7 @@ public class ExperimentRegistry {
                 cmsr.setExperimentResource(taskDetailResource.getWorkflowNodeDetailResource().getExperimentResource());
             }
             cmsr.setResourceHostId(resourceScheduling.getResourceHostId());
-            cmsr.setCpuCount(resourceScheduling.getTotalCPUCount());
+            cmsr.setCpuCount(resourceScheduling.getTotalCpuCount());
             cmsr.setNodeCount(resourceScheduling.getNodeCount());
             cmsr.setNumberOfThreads(resourceScheduling.getNumberOfThreads());
             cmsr.setQueueName(resourceScheduling.getQueueName());
@@ -841,7 +841,7 @@ public class ExperimentRegistry {
             List<TaskDetails> taskDetails = nodeDetails.getTaskDetailsList();
             if (taskDetails != null && !taskDetails.isEmpty()) {
                 for (TaskDetails task : taskDetails) {
-                    String taskID = task.getTaskID();
+                    String taskID = task.getTaskId();
                     if (isTaskDetailExist(taskID)) {
                         updateTaskDetails(task, taskID);
                     } else {
@@ -919,7 +919,7 @@ public class ExperimentRegistry {
             experiment = workflowNode.getExperimentResource();
             TaskDetailResource taskDetail = (TaskDetailResource) workflowNode.create(ResourceType.TASK_DETAIL);
             taskDetail.setWorkflowNodeDetailResource(workflowNode);
-            taskDetail.setTaskId(getTaskID(workflowNode.getNodeName()));
+            taskDetail.setTaskId(getTaskId(workflowNode.getNodeName()));
             taskDetail.setApplicationId(taskDetails.getApplicationId());
             taskDetail.setApplicationVersion(taskDetails.getApplicationVersion());
             taskDetail.setCreationTime(AiravataUtils.getTime(taskDetails.getCreationTime()));
@@ -961,7 +961,7 @@ public class ExperimentRegistry {
             List<JobDetails> jobDetailsList = taskDetails.getJobDetailsList();
             if (jobDetailsList != null && !jobDetailsList.isEmpty()) {
                 for (JobDetails job : jobDetailsList) {
-                    CompositeIdentifier ids = new CompositeIdentifier(taskDetail.getTaskId(), job.getJobID());
+                    CompositeIdentifier ids = new CompositeIdentifier(taskDetail.getTaskId(), job.getJobId());
                     addJobDetails(job, ids);
                 }
             }
@@ -1046,7 +1046,7 @@ public class ExperimentRegistry {
             List<JobDetails> jobDetailsList = taskDetails.getJobDetailsList();
             if (jobDetailsList != null && !jobDetailsList.isEmpty()) {
                 for (JobDetails job : jobDetailsList) {
-                    CompositeIdentifier ids = new CompositeIdentifier(taskId, job.getJobID());
+                    CompositeIdentifier ids = new CompositeIdentifier(taskId, job.getJobId());
                     updateJobDetails(job, ids);
                 }
             }
@@ -1054,7 +1054,7 @@ public class ExperimentRegistry {
             List<DataTransferDetails> dataTransferDetailsList = taskDetails.getDataTransferDetailsList();
             if (dataTransferDetailsList != null && !dataTransferDetailsList.isEmpty()) {
                 for (DataTransferDetails transferDetails : dataTransferDetailsList) {
-                    updateDataTransferDetails(transferDetails, transferDetails.getTransferID());
+                    updateDataTransferDetails(transferDetails, transferDetails.getTransferId());
                 }
             }
 
@@ -1350,7 +1350,7 @@ public class ExperimentRegistry {
             }
             schedulingResource.setExperimentResource(experiment);
             schedulingResource.setResourceHostId(scheduling.getResourceHostId());
-            schedulingResource.setCpuCount(scheduling.getTotalCPUCount());
+            schedulingResource.setCpuCount(scheduling.getTotalCpuCount());
             schedulingResource.setNodeCount(scheduling.getNodeCount());
             schedulingResource.setNumberOfThreads(scheduling.getNumberOfThreads());
             schedulingResource.setQueueName(scheduling.getQueueName());
@@ -1464,11 +1464,11 @@ public class ExperimentRegistry {
                     workflowNode = (WorkflowNodeDetailResource) experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
                     taskDetail = workflowNode.getTaskDetail((String) id);
                     errorResource = (ErrorDetailResource) taskDetail.create(ResourceType.ERROR_DETAIL);
-                    if (error.getErrorID() != null && !error.getErrorID().equals(experimentModelConstants.DEFAULT_ID)) {
+                    if (error.getErrorId() != null && !error.getErrorId().equals(experimentModelConstants.DEFAULT_ID)) {
                         List<ErrorDetailResource> errorDetailList = taskDetail.getErrorDetailList();
                         if (errorDetailList != null && !errorDetailList.isEmpty()) {
                             for (ErrorDetailResource errorDetailResource : errorDetailList) {
-                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorID())) {
+                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorId())) {
                                     errorResource = errorDetailResource;
                                 }
                             }
@@ -1488,11 +1488,11 @@ public class ExperimentRegistry {
                     taskDetail = workflowNode.getTaskDetail((String) cid.getTopLevelIdentifier());
                     JobDetailResource jobDetail = taskDetail.getJobDetail((String) cid.getSecondLevelIdentifier());
                     errorResource = (ErrorDetailResource) jobDetail.create(ResourceType.ERROR_DETAIL);
-                    if (error.getErrorID() != null && !error.getErrorID().equals(experimentModelConstants.DEFAULT_ID)) {
+                    if (error.getErrorId() != null && !error.getErrorId().equals(experimentModelConstants.DEFAULT_ID)) {
                         List<ErrorDetailResource> errorDetailList = taskDetail.getErrorDetailList();
                         if (errorDetailList != null && !errorDetailList.isEmpty()) {
                             for (ErrorDetailResource errorDetailResource : errorDetailList) {
-                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorID())) {
+                                if (errorDetailResource.getErrorId() == Integer.parseInt(error.getErrorId())) {
                                     errorResource = errorDetailResource;
                                 }
                             }
@@ -1541,12 +1541,12 @@ public class ExperimentRegistry {
         return node + "_" + UUID.randomUUID();
     }
 
-    public String getExperimentID(String experimentName) {
+    public String getExperimentId(String experimentName) {
         String exp = experimentName.replaceAll("\\s", "");
         return exp + "_" + UUID.randomUUID();
     }
 
-    public String getTaskID(String nodeName) {
+    public String getTaskId(String nodeName) {
         String node = nodeName.replaceAll("\\s", "");
         return node + "_" + UUID.randomUUID();
     }
@@ -1628,11 +1628,11 @@ public class ExperimentRegistry {
             existingExperiment.setExecutionUser(experiment.getUserName());
             existingExperiment.setGateway(gatewayResource);
             existingExperiment.setGatewayExecutionId(experiment.getGatewayExecutionId());
-            if (!workerResource.isProjectExists(experiment.getProjectID())) {
+            if (!workerResource.isProjectExists(experiment.getProjectId())) {
                 logger.error("Project does not exist in the system..");
                 throw new Exception("Project does not exist in the system, Please create the project first...");
             }
-            ProjectResource project = workerResource.getProject(experiment.getProjectID());
+            ProjectResource project = workerResource.getProject(experiment.getProjectId());
             existingExperiment.setProject(project);
             existingExperiment.setCreationTime(AiravataUtils.getTime(experiment.getCreationTime()));
             existingExperiment.setDescription(experiment.getDescription());
@@ -1701,7 +1701,7 @@ public class ExperimentRegistry {
             resource.setAiravataAutoSchedule(configData.isAiravataAutoSchedule());
             resource.setOverrideManualParams(configData.isOverrideManualScheduledParams());
             resource.setShareExp(configData.isShareExperimentPublicly());
-            resource.setUserDn(configData.getUserDN());
+            resource.setUserDn(configData.getUserDn());
             resource.setGenerateCert(configData.isGenerateCert());
             resource.save();
             ComputationalResourceScheduling resourceScheduling = configData.getComputationalResourceScheduling();
@@ -1809,7 +1809,7 @@ public class ExperimentRegistry {
                 cmsr.setExperimentResource(taskDetailResource.getWorkflowNodeDetailResource().getExperimentResource());
             }
             cmsr.setResourceHostId(resourceScheduling.getResourceHostId());
-            cmsr.setCpuCount(resourceScheduling.getTotalCPUCount());
+            cmsr.setCpuCount(resourceScheduling.getTotalCpuCount());
             cmsr.setNodeCount(resourceScheduling.getNodeCount());
             cmsr.setNumberOfThreads(resourceScheduling.getNumberOfThreads());
             cmsr.setQueueName(resourceScheduling.getQueueName());
@@ -1939,7 +1939,7 @@ public class ExperimentRegistry {
                 if (value instanceof List<?>) {
                     return getWFNodeDetails(fieldName, ((List<?>) value).get(0));
                 } else if (value instanceof TaskDetails) {
-                    TaskDetailResource taskDetailResource = getTaskDetailResource(((TaskDetails) value).getTaskID());
+                    TaskDetailResource taskDetailResource = getTaskDetailResource(((TaskDetails) value).getTaskId());
                     if (taskDetailResource != null) {
                         return Arrays.asList(new WorkflowNodeDetails[]{ThriftDataModelConversion
                                 .getWorkflowNodeDetails(taskDetailResource
@@ -2420,7 +2420,7 @@ public class ExperimentRegistry {
         }
     }
 
-    public List<String> getExperimentIDs(String fieldName, Object value) throws RegistryException {
+    public List<String> getExperimentIds(String fieldName, Object value) throws RegistryException {
         List<String> expIDs = new ArrayList<String>();
         try {
             if (fieldName.equals(Constants.FieldConstants.ExperimentConstants.GATEWAY)) {
@@ -2465,7 +2465,7 @@ public class ExperimentRegistry {
         List<String> taskDetailIds = new ArrayList<String>();
         List<TaskDetails> taskDetails = getTaskDetails(fieldName, value);
         for (TaskDetails td : taskDetails) {
-            taskDetailIds.add(td.getTaskID());
+            taskDetailIds.add(td.getTaskId());
         }
         return taskDetailIds;
     }
@@ -2474,7 +2474,7 @@ public class ExperimentRegistry {
         List<String> jobIds = new ArrayList<String>();
         List<JobDetails> jobDetails = getJobDetails(fieldName, value);
         for (JobDetails jd : jobDetails) {
-            jobIds.add(jd.getJobID());
+            jobIds.add(jd.getJobId());
         }
         return jobIds;
     }
@@ -2483,7 +2483,7 @@ public class ExperimentRegistry {
         List<String> transferIds = new ArrayList<String>();
         List<DataTransferDetails> dataTransferDetails = getDataTransferDetails(fieldName, value);
         for (DataTransferDetails dtd : dataTransferDetails) {
-            transferIds.add(dtd.getTransferID());
+            transferIds.add(dtd.getTransferId());
         }
         return transferIds;
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
index e0e2a46..928fe64 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
@@ -63,7 +63,7 @@ public class ProjectRegistry {
             ProjectResource projectResource = new ProjectResource();
             projectId = getProjectId(project.getName());
             projectResource.setId(projectId);
-            project.setProjectID(projectId);
+            project.setProjectId(projectId);
             projectResource.setName(project.getName());
             projectResource.setDescription(project.getDescription());
             projectResource.setCreationTime(AiravataUtils.getTime(project.getCreationTime()));
@@ -74,7 +74,7 @@ public class ProjectRegistry {
             projectResource.save();
             ProjectUserResource resource = (ProjectUserResource)projectResource.create(
                     ResourceType.PROJECT_USER);
-            resource.setProjectId(project.getProjectID());
+            resource.setProjectId(project.getProjectId());
             resource.setUserName(project.getOwner());
             resource.save();
             List<String> sharedGroups = project.getSharedGroups();
@@ -264,7 +264,7 @@ public class ProjectRegistry {
         return null;
     }
 
-    public List<String> getProjectIDs (String fieldName, Object value) throws RegistryException{
+    public List<String> getProjectIds (String fieldName, Object value) throws RegistryException{
         List<String> projectIds = new ArrayList<String>();
         try {
             if (fieldName.equals(Constants.FieldConstants.ProjectConstants.OWNER)){

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
index 953b11e..6aacacc 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
@@ -602,11 +602,11 @@ public class RegistryImpl implements Registry {
         try {
             switch (dataType) {
                 case PROJECT:
-                    return projectRegistry.getProjectIDs(fieldName, value);
+                    return projectRegistry.getProjectIds(fieldName, value);
                 case EXPERIMENT:
-                    return experimentRegistry.getExperimentIDs(fieldName, value);
+                    return experimentRegistry.getExperimentIds(fieldName, value);
                 case EXPERIMENT_CONFIGURATION_DATA:
-                    return experimentRegistry.getExperimentIDs(fieldName, value);
+                    return experimentRegistry.getExperimentIds(fieldName, value);
                 case WORKFLOW_NODE_DETAIL:
                     return experimentRegistry.getWorkflowNodeIds(fieldName, value);
                 case TASK_DETAIL:

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
index 9d1d21e..28d393f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
@@ -74,11 +74,11 @@ public class ErrorDetail implements Serializable {
     @JoinColumn(name = "NODE_INSTANCE_ID")
     private WorkflowNodeDetail nodeDetails;
 
-    public int getErrorID() {
+    public int getErrorId() {
         return errorID;
     }
 
-    public void setErrorID(int errorID) {
+    public void setErrorId(int errorID) {
         this.errorID = errorID;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser.java
index 1509612..5b930d1 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser.java
@@ -47,11 +47,11 @@ public class ProjectUser implements Serializable {
     @JoinColumn(name = "USER_NAME")
     private Users user;
 
-    public String getProjectID() {
+    public String getProjectId() {
         return projectID;
     }
 
-    public void setProjectID(String projectID) {
+    public void setProjectId(String projectID) {
         this.projectID = projectID;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser_PK.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser_PK.java
index 4b1be3e..e3eff9c 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser_PK.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ProjectUser_PK.java
@@ -46,11 +46,11 @@ public class ProjectUser_PK implements Serializable {
         return 1;
     }
 
-    public String getProjectID() {
+    public String getProjectId() {
         return projectID;
     }
 
-    public void setProjectID(String projectID) {
+    public void setProjectId(String projectID) {
         this.projectID = projectID;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
index 9299bad..56a4e57 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
@@ -180,11 +180,11 @@ public class ErrorDetailResource extends AbstractResource {
             ErrorDetail errorDetail;
             if (errorId != 0) {
                 errorDetail = em.find(ErrorDetail.class, errorId);
-                errorDetail.setErrorID(errorId);
+                errorDetail.setErrorId(errorId);
             } else {
                 errorDetail = new ErrorDetail();
             }
-            errorDetail.setErrorID(errorId);
+            errorDetail.setErrorId(errorId);
             Experiment experiment = em.find(Experiment.class, experimentResource.getExpID());
             errorDetail.setExperiment(experiment);
             errorDetail.setExpId(experimentResource.getExpID());
@@ -211,7 +211,7 @@ public class ErrorDetailResource extends AbstractResource {
             errorDetail.setActionableGroup(actionableGroup);
             errorDetail.setJobId(jobId);
             em.persist(errorDetail);
-            errorId = errorDetail.getErrorID();
+            errorId = errorDetail.getErrorId();
             em.getTransaction().commit();
             em.close();
         } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectUserResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectUserResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectUserResource.java
index dd50b7c..336a9ee 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectUserResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectUserResource.java
@@ -89,7 +89,7 @@ public class ProjectUserResource extends AbstractResource {
             em = ResourceUtils.getEntityManager();
             em.getTransaction().begin();
             ProjectUser prUser = new ProjectUser();
-            prUser.setProjectID(projectId);
+            prUser.setProjectId(projectId);
             prUser.setUserName(userName);
             Users user = em.find(Users.class, userName);
             prUser.setUser(user);
@@ -97,7 +97,7 @@ public class ProjectUserResource extends AbstractResource {
             prUser.setProject(project);
 
             if (existingPrUser != null) {
-                existingPrUser.setProjectID(projectId);
+                existingPrUser.setProjectId(projectId);
                 existingPrUser.setUserName(userName);
                 existingPrUser.setUser(user);
                 existingPrUser.setProject(project);

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index 34bd1fd..69ada6d 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -389,7 +389,7 @@ public class Utils {
         ProjectUserResource projectUserResource = new ProjectUserResource();
         if (o != null){
             projectUserResource.setUserName(o.getUser().getUser_name());
-            projectUserResource.setProjectId(o.getProjectID());
+            projectUserResource.setProjectId(o.getProjectId());
         }
         return projectUserResource;
     }
@@ -571,7 +571,7 @@ public class Utils {
                 WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)createWorkflowNodeDetail(o.getNodeDetails());
                 errorDetailResource.setNodeDetail(nodeDetailResource);
             }
-            errorDetailResource.setErrorId(o.getErrorID());
+            errorDetailResource.setErrorId(o.getErrorId());
             errorDetailResource.setJobId(o.getJobId());
             errorDetailResource.setCreationTime(o.getCreationTime());
             if (o.getActualErrorMsg() != null){

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
index d3609b8..8be98c3 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
@@ -418,7 +418,7 @@ public class WorkerResource extends AbstractResource {
 		return project;
 	}
 
-    public String getProjectID(String projectName) {
+    public String getProjectId(String projectName) {
         String pro = projectName.replaceAll("\\s", "");
         return pro + "_" + UUID.randomUUID();
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index 8f385e8..ef3152f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -68,7 +68,7 @@ public class ThriftDataModelConversion {
     public static Project getProject (ProjectResource pr) throws RegistryException {
         if (pr != null) {
             Project project = new Project();
-            project.setProjectID(pr.getId());
+            project.setProjectId(pr.getId());
             project.setName(pr.getName());
             if (pr.getCreationTime()!=null) {
 				project.setCreationTime(pr.getCreationTime().getTime());
@@ -110,9 +110,9 @@ public class ThriftDataModelConversion {
         if (experimentResource != null){
             Experiment experiment = new Experiment();
             if (experimentResource.getProject()!= null){
-                experiment.setProjectID(experimentResource.getProject().getId());
+                experiment.setProjectId(experimentResource.getProject().getId());
             }
-            experiment.setExperimentID(experimentResource.getExpID());
+            experiment.setExperimentId(experimentResource.getExpID());
             experiment.setCreationTime(experimentResource.getCreationTime().getTime());
             experiment.setUserName(experimentResource.getExecutionUser());
             experiment.setName(experimentResource.getExpName());
@@ -163,9 +163,9 @@ public class ThriftDataModelConversion {
         if (experimentResource != null){
             ExperimentSummary experimentSummary = new ExperimentSummary();
             if (experimentResource.getProject()!= null){
-                experimentSummary.setProjectID(experimentResource.getProject().getId());
+                experimentSummary.setProjectId(experimentResource.getProject().getId());
             }
-            experimentSummary.setExperimentID(experimentResource.getExpID());
+            experimentSummary.setExperimentId(experimentResource.getExpID());
             experimentSummary.setCreationTime(experimentResource.getCreationTime().getTime());
             experimentSummary.setUserName(experimentResource.getExecutionUser());
             experimentSummary.setName(experimentResource.getExpName());
@@ -494,7 +494,7 @@ public class ThriftDataModelConversion {
         if (taskDetailResource != null){
             TaskDetails taskDetails = new TaskDetails();
             String taskId = taskDetailResource.getTaskId();
-            taskDetails.setTaskID(taskId);
+            taskDetails.setTaskId(taskId);
             taskDetails.setApplicationId(taskDetailResource.getApplicationId());
             taskDetails.setApplicationVersion(taskDetailResource.getApplicationVersion());
             List<ApplicationInputResource> applicationInputs = taskDetailResource.getApplicationInputs();
@@ -556,7 +556,7 @@ public class ThriftDataModelConversion {
     public static JobDetails getJobDetail(JobDetailResource jobDetailResource) throws RegistryException {
         if (jobDetailResource != null){
             JobDetails jobDetails = new JobDetails();
-            jobDetails.setJobID(jobDetailResource.getJobId());
+            jobDetails.setJobId(jobDetailResource.getJobId());
             jobDetails.setJobDescription(jobDetailResource.getJobDescription());
             jobDetails.setCreationTime(jobDetailResource.getCreationTime().getTime());
             StatusResource jobStatus = jobDetailResource.getJobStatus();
@@ -576,7 +576,7 @@ public class ThriftDataModelConversion {
     public static ErrorDetails getErrorDetails (ErrorDetailResource resource){
         if (resource != null){
             ErrorDetails errorDetails = new ErrorDetails();
-            errorDetails.setErrorID(String.valueOf(resource.getErrorId()));
+            errorDetails.setErrorId(String.valueOf(resource.getErrorId()));
             errorDetails.setCreationTime(resource.getCreationTime().getTime());
             errorDetails.setActualErrorMessage(resource.getActualErrorMsg());
             errorDetails.setUserFriendlyMessage(resource.getUserFriendlyErrorMsg());
@@ -602,7 +602,7 @@ public class ThriftDataModelConversion {
     public static DataTransferDetails getDataTransferDetail (DataTransferDetailResource resource) throws RegistryException {
         if (resource != null){
             DataTransferDetails details = new DataTransferDetails();
-            details.setTransferID(resource.getTransferId());
+            details.setTransferId(resource.getTransferId());
             details.setCreationTime(resource.getCreationTime().getTime());
             details.setTransferDescription(resource.getTransferDescription());
             details.setTransferStatus(getTransferStatus(resource.getDataTransferStatus()));
@@ -628,7 +628,7 @@ public class ThriftDataModelConversion {
             data.setAiravataAutoSchedule(resource.isAiravataAutoSchedule());
             data.setOverrideManualScheduledParams(resource.isOverrideManualParams());
             data.setShareExperimentPublicly(resource.isShareExp());
-            data.setUserDN(resource.getUserDn());
+            data.setUserDn(resource.getUserDn());
             data.setGenerateCert(resource.isGenerateCert());
             ExperimentResource experimentResource = resource.getExperimentResource();
             String expID = experimentResource.getExpID();
@@ -661,7 +661,7 @@ public class ThriftDataModelConversion {
         if (csr != null){
             ComputationalResourceScheduling scheduling = new ComputationalResourceScheduling();
             scheduling.setResourceHostId(csr.getResourceHostId());
-            scheduling.setTotalCPUCount(csr.getCpuCount());
+            scheduling.setTotalCpuCount(csr.getCpuCount());
             scheduling.setNodeCount(csr.getNodeCount());
             scheduling.setNumberOfThreads(csr.getNumberOfThreads());
             scheduling.setQueueName(csr.getQueueName());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExecutionErrorResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExecutionErrorResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExecutionErrorResourceTest.java
index 2d1aeb5..9238ea8 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExecutionErrorResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExecutionErrorResourceTest.java
@@ -54,7 +54,7 @@
 //        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
 //        workflowDataResource.setWorkflowInstanceID("testWFInstance");
 //        workflowDataResource.setTemplateName("testTemplate");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        Timestamp timestamp = getCurrentTimestamp();
 //        workflowDataResource.setLastUpdatedTime(timestamp);
 //        workflowDataResource.save();
@@ -82,9 +82,9 @@
 //        executionErrorResource.setErrorDes("testDes");
 //        executionErrorResource.setErrorMsg("errorMsg");
 //        executionErrorResource.save();
-//        System.out.println(executionErrorResource.getErrorID());
+//        System.out.println(executionErrorResource.getErrorId());
 //
-//        assertTrue("Execution Error saved successfully", workflowDataResource.isExists(ResourceType.EXECUTION_ERROR, executionErrorResource.getErrorID()));
+//        assertTrue("Execution Error saved successfully", workflowDataResource.isExists(ResourceType.EXECUTION_ERROR, executionErrorResource.getErrorId()));
 //
 //    }
 //

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
index 487f977..f3c9023 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
@@ -56,7 +56,7 @@
 //        experimentMetadataResource.setMetadata("testMetadata");
 //        experimentMetadataResource.save();
 //
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        workflowDataResource.setStatus("testStatus");
 //        workflowDataResource.setTemplateName("testWorkflowInstance");
 //

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
index 8d6e22e..d164d79 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
@@ -58,7 +58,7 @@
 //        exConfig.save();
 //
 //        workflowDataResource = experimentResource.createWorkflowInstanceResource("testWFInstance");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        workflowDataResource.setStatus("testStatus");
 //        workflowDataResource.setTemplateName("testWFInstance");
 //        workflowDataResource.setLastUpdatedTime(getCurrentTimestamp());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
index 7c6a191..fb3dc54 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
@@ -47,7 +47,7 @@
 //        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
 //        workflowDataResource.setWorkflowInstanceID("testWFInstance");
 //        workflowDataResource.setTemplateName("testTemplate");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        Calendar calender = Calendar.getInstance();
 //        java.util.Date d = calender.getTime();
 //        Timestamp timestamp = new Timestamp(d.getTime());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobStatusResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobStatusResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobStatusResourceTest.java
index 1254e33..a7b720f 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobStatusResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobStatusResourceTest.java
@@ -47,7 +47,7 @@
 //        WorkflowDataResource workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
 //        workflowDataResource.setWorkflowInstanceID("testWFInstance");
 //        workflowDataResource.setTemplateName("testTemplate");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        Calendar calender = Calendar.getInstance();
 //        java.util.Date d = calender.getTime();
 //        Timestamp timestamp = new Timestamp(d.getTime());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
index 4fd1894..332e055 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
@@ -45,7 +45,7 @@
 //        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
 //        workflowDataResource.setWorkflowInstanceID("testWFInstance");
 //        workflowDataResource.setTemplateName("testTemplate");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        Calendar calender = Calendar.getInstance();
 //        java.util.Date d = calender.getTime();
 //        Timestamp timestamp = new Timestamp(d.getTime());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
index ff5cf7e..b404cfd 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
@@ -45,7 +45,7 @@
 //        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
 //        workflowDataResource.setWorkflowInstanceID("testWFInstance");
 //        workflowDataResource.setTemplateName("testTemplate");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        Calendar calender = Calendar.getInstance();
 //        java.util.Date d = calender.getTime();
 //        Timestamp timestamp = new Timestamp(d.getTime());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
index ad552e5..9af4b24 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
@@ -51,7 +51,7 @@
 //     }
 //
 //	    public void testSave() throws Exception {
-//	        dataResource.setExperimentID("testExpID");
+//	        dataResource.setExperimentId("testExpID");
 //	        dataResource.setStatus(AiravataJobState.State.CREATED.toString());
 //	        dataResource.setApplicationName(applicationName);
 //	        dataResource.save();

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/RegistryUseCaseTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/RegistryUseCaseTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/RegistryUseCaseTest.java
index 125efc6..e0f29dd 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/RegistryUseCaseTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/RegistryUseCaseTest.java
@@ -77,7 +77,7 @@ public class RegistryUseCaseTest {
 
             //testing the update of a project
             Project updatedProject = new Project();
-            updatedProject.setProjectID(projectId1);
+            updatedProject.setProjectId(projectId1);
             updatedProject.setOwner("TestUser"+TAG);
             updatedProject.setName("UpdatedTestProject"+TAG);
             updatedProject.setDescription("This is an updated test project"+TAG);
@@ -85,7 +85,7 @@ public class RegistryUseCaseTest {
 
             //testing project retrieval
             Project retrievedProject = (Project)registry.get(RegistryModelType.PROJECT, projectId1);
-            Assert.assertEquals(updatedProject.getProjectID(), retrievedProject.getProjectID());
+            Assert.assertEquals(updatedProject.getProjectId(), retrievedProject.getProjectId());
             Assert.assertEquals(updatedProject.getOwner(), retrievedProject.getOwner());
             Assert.assertEquals(updatedProject.getName(), retrievedProject.getName());
             Assert.assertEquals(updatedProject.getDescription(), retrievedProject.getDescription());
@@ -187,7 +187,7 @@ public class RegistryUseCaseTest {
             ComputationalResourceScheduling scheduling = new ComputationalResourceScheduling();
             scheduling.setResourceHostId(UUID.randomUUID().toString());
             scheduling.setComputationalProjectAccount("TG-STA110014S");
-            scheduling.setTotalCPUCount(1);
+            scheduling.setTotalCpuCount(1);
             scheduling.setNodeCount(1);
             scheduling.setWallTimeLimit(15);
             scheduling.setQueueName("normal");
@@ -198,7 +198,7 @@ public class RegistryUseCaseTest {
             userConfigurationData.setComputationalResourceScheduling(scheduling);
 
             Experiment experiment = new Experiment();
-            experiment.setProjectID(projectId1);
+            experiment.setProjectId(projectId1);
             experiment.setUserName("TestUser" + TAG);
             experiment.setName("TestExperiment"+TAG);
             experiment.setDescription("Test 1 experiment");
@@ -213,7 +213,7 @@ public class RegistryUseCaseTest {
             Experiment retrievedExperiment = (Experiment)registry.get(RegistryModelType.EXPERIMENT,
                     experimentId1);
             Assert.assertNotNull(retrievedExperiment);
-            Assert.assertEquals(retrievedExperiment.getProjectID(), experiment.getProjectID());
+            Assert.assertEquals(retrievedExperiment.getProjectId(), experiment.getProjectId());
             Assert.assertEquals(retrievedExperiment.getDescription(), experiment.getDescription());
             Assert.assertEquals(retrievedExperiment.getName(), experiment.getName());
             Assert.assertEquals(retrievedExperiment.getApplicationId(), experiment.getApplicationId());
@@ -230,7 +230,7 @@ public class RegistryUseCaseTest {
 
             //creating more experiments
             experiment = new Experiment();
-            experiment.setProjectID(projectId1);
+            experiment.setProjectId(projectId1);
             experiment.setUserName("TestUser" + TAG);
             experiment.setName("TestExperiment2" + TAG);
             experiment.setDescription("Test 2 experiment");
@@ -242,7 +242,7 @@ public class RegistryUseCaseTest {
             Assert.assertNotNull(experimentId2);
 
             experiment = new Experiment();
-            experiment.setProjectID(projectId1);
+            experiment.setProjectId(projectId1);
             experiment.setUserName("TestUser" + TAG);
             experiment.setName("TestExperiment3"+TAG);
             experiment.setDescription("Test 3 experiment");

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
index 9c3b107..392ba01 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
@@ -48,7 +48,7 @@
 //        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
 //        workflowDataResource.setWorkflowInstanceID("testWFInstance");
 //        workflowDataResource.setTemplateName("testTemplate");
-//        workflowDataResource.setExperimentID("testExpID");
+//        workflowDataResource.setExperimentId("testExpID");
 //        Calendar calender = Calendar.getInstance();
 //        java.util.Date d = calender.getTime();
 //        Timestamp timestamp = new Timestamp(d.getTime());

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
index fee8aec..b140660 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/CompositeIdentifier.java
@@ -28,12 +28,20 @@ package org.apache.airavata.registry.cpi;
 public class CompositeIdentifier {
     private Object topLevelIdentifier;
     private Object secondLevelIdentifier;
+    private Object thirdLevelIdentifier;
 
     public CompositeIdentifier(Object topLevelIdentifier, Object secondLevelIdentifier) {
         this.topLevelIdentifier = topLevelIdentifier;
         this.secondLevelIdentifier = secondLevelIdentifier;
     }
 
+    public CompositeIdentifier(Object topLevelIdentifier, Object secondLevelIdentifier,
+                               Object thirdLevelIdentifier) {
+        this.topLevelIdentifier = topLevelIdentifier;
+        this.secondLevelIdentifier = secondLevelIdentifier;
+        this.thirdLevelIdentifier = thirdLevelIdentifier;
+    }
+
     public Object getTopLevelIdentifier() {
         return topLevelIdentifier;
     }
@@ -42,11 +50,18 @@ public class CompositeIdentifier {
         return secondLevelIdentifier;
     }
 
+    public Object getThirdLevelIdentifier() {
+        return thirdLevelIdentifier;
+    }
+
     @Override
     public String toString() {
-        if (topLevelIdentifier instanceof String && secondLevelIdentifier instanceof String) {
-            return topLevelIdentifier + "," + secondLevelIdentifier;
-        }else if (topLevelIdentifier instanceof String ) {
+        if (topLevelIdentifier instanceof String && secondLevelIdentifier instanceof String
+                && thirdLevelIdentifier instanceof  String) {
+            return topLevelIdentifier + "," + secondLevelIdentifier + "," + thirdLevelIdentifier;
+        }else if (topLevelIdentifier instanceof String && secondLevelIdentifier instanceof String) {
+            return topLevelIdentifier.toString() + "," + secondLevelIdentifier;
+        } else if(topLevelIdentifier instanceof  String) {
             return topLevelIdentifier.toString();
         } else {
             return secondLevelIdentifier.toString();

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
index f0cf564..1c881b6 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ExperimentExecution.java
@@ -444,7 +444,7 @@ public class ExperimentExecution {
                         List<Project> projectsPerGateway = projectsMap.get(gatewayId);
                         String projectID = null;
                         if (projectsPerGateway != null && !projectsPerGateway.isEmpty()){
-                            projectID = projectsPerGateway.get(0).getProjectID();
+                            projectID = projectsPerGateway.get(0).getProjectId();
                         }
                         Experiment simpleExperiment =
                                 ExperimentModelUtil.createSimpleExperiment(projectID, testUser, "Amber Experiment", "Amber Experiment run", appId, applicationInputs);
@@ -528,7 +528,7 @@ public class ExperimentExecution {
                             List<Project> projectsPerGateway = projectsMap.get(gatewayId);
                             String projectID = null;
                             if (projectsPerGateway != null && !projectsPerGateway.isEmpty()){
-                                projectID = projectsPerGateway.get(0).getProjectID();
+                                projectID = projectsPerGateway.get(0).getProjectId();
                             }
                             Experiment simpleExperiment =
                                     ExperimentModelUtil.createSimpleExperiment(projectID, testUser, "TestFR_Ultrascan_Experiment", "Ultrascan Experiment run", appId, applicationInputs);
@@ -630,7 +630,7 @@ public class ExperimentExecution {
                                 List<Project> projectsPerGateway = projectsMap.get(gatewayId);
                                 String projectID = null;
                                 if (projectsPerGateway != null && !projectsPerGateway.isEmpty()) {
-                                    projectID = projectsPerGateway.get(0).getProjectID();
+                                    projectID = projectsPerGateway.get(0).getProjectId();
                                 }
                                 Experiment simpleExperiment =
                                         ExperimentModelUtil.createSimpleExperiment(projectID, "admin", "Echo Experiment", "Echo Experiment run", appId, applicationInputs);

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
index 5c604d5..a09d236 100644
--- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
+++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
@@ -201,7 +201,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 				inputDataStrings.put(dataObjectType.getName(), dataObjectType.getValue());
 			}
 			for (Node node : inputNodes) {
-                publishNodeStatusChange(WorkflowNodeState.EXECUTING,node.getID(),experiment.getExperimentID());
+                publishNodeStatusChange(WorkflowNodeState.EXECUTING,node.getID(),experiment.getExperimentId());
 				if (inputDataStrings.containsKey(node.getID())){
 					((InputNode)node).setDefaultValue(inputDataStrings.get(node.getID()));
 				} else {
@@ -212,7 +212,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 				Node node = inputNodes.get(i);
 				invokedNode.add(node);
 				node.setState(NodeExecutionState.FINISHED);
-                publishNodeStatusChange(WorkflowNodeState.INVOKED, node.getID(), experiment.getExperimentID());
+                publishNodeStatusChange(WorkflowNodeState.INVOKED, node.getID(), experiment.getExperimentId());
 				notifyViaInteractor(WorkflowExecutionMessage.NODE_STATE_CHANGED, null);
 				String portId= ((InputNode) node).getID();
 				Object portValue = ((InputNode) node).getDefaultValue();
@@ -226,7 +226,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 				workflowNode.addToNodeInputs(elem);
 				getRegistry().update(RegistryModelType.WORKFLOW_NODE_DETAIL, workflowNode, workflowNode.getNodeInstanceId());
 				updateWorkflowNodeStatus(workflowNode, WorkflowNodeState.COMPLETED);
-                publishNodeStatusChange(WorkflowNodeState.COMPLETED, node.getID(), experiment.getExperimentID());
+                publishNodeStatusChange(WorkflowNodeState.COMPLETED, node.getID(), experiment.getExperimentId());
 			}
 
 			while (this.getWorkflow().getExecutionState() != WorkflowExecutionState.STOPPED) {
@@ -236,7 +236,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
                 }
                 // ok we have paused sleep
                 if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED) {
-                	log.info("Workflow execution "+experiment.getExperimentID()+" is paused.");
+                	log.info("Workflow execution "+experiment.getExperimentId()+" is paused.");
 	                while (this.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED) {
 	                    try {
 	                        Thread.sleep(400);
@@ -247,7 +247,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 	                if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.STOPPED) {
 	                	continue;
 	                }
-	                log.info("Workflow execution "+experiment.getExperimentID()+" is resumed.");
+	                log.info("Workflow execution "+experiment.getExperimentId()+" is resumed.");
                 }
                 // get task list and execute them
                 ArrayList<Node> readyNodes = this.getReadyNodesDynamically();
@@ -279,7 +279,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
                         }
                     };
                 	updateWorkflowNodeStatus(workflowNodeDetails, WorkflowNodeState.INVOKED);
-                    publishNodeStatusChange(WorkflowNodeState.INVOKED, node.getID(), experiment.getExperimentID());
+                    publishNodeStatusChange(WorkflowNodeState.INVOKED, node.getID(), experiment.getExperimentId());
                     threadList.add(th);
                     th.start();
 					if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.STEP) {
@@ -364,7 +364,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 		} finally{
         	cleanup();
 			this.getWorkflow().setExecutionState(WorkflowExecutionState.NONE);
-            ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.COMPLETED, experiment.getExperimentID(), gatewayId);
+            ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.COMPLETED, experiment.getExperimentId(), gatewayId);
             MessageContext msgCtx = new MessageContext(event, MessageType.EXPERIMENT, AiravataUtils.getId("EXPERIMENT"), gatewayId);
             msgCtx.setUpdatedTime(new Timestamp(Calendar.getInstance().getTimeInMillis()));
             publisher.publish(msgCtx);
@@ -397,7 +397,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 		}  
 		workflowNode.setExecutionUnit(executionUnit);
 		workflowNode.setExecutionUnitData(executionData);
-		workflowNode.setNodeInstanceId((String) getRegistry().add(ChildDataType.WORKFLOW_NODE_DETAIL, workflowNode, getExperiment().getExperimentID()));
+		workflowNode.setNodeInstanceId((String) getRegistry().add(ChildDataType.WORKFLOW_NODE_DETAIL, workflowNode, getExperiment().getExperimentId()));
 		nodeInstanceList.put(node, workflowNode);
 		setupNodeDetailsInput(node, workflowNode);
 		return workflowNode;
@@ -435,10 +435,10 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 				// next run
 				// even if the next run runs before the notification arrives
 				WorkflowNodeDetails workflowNodeDetails = createWorkflowNodeDetails(node);
-//				workflowNodeDetails.setNodeInstanceId((String)getRegistry().add(ChildDataType.WORKFLOW_NODE_DETAIL, workflowNodeDetails, getExperiment().getExperimentID()));
+//				workflowNodeDetails.setNodeInstanceId((String)getRegistry().add(ChildDataType.WORKFLOW_NODE_DETAIL, workflowNodeDetails, getExperiment().getExperimentId()));
 				node.setState(NodeExecutionState.EXECUTING);
 				updateWorkflowNodeStatus(workflowNodeDetails, WorkflowNodeState.EXECUTING);
-                publishNodeStatusChange(WorkflowNodeState.EXECUTING, node.getID(), experiment.getExperimentID());
+                publishNodeStatusChange(WorkflowNodeState.EXECUTING, node.getID(), experiment.getExperimentId());
 				// OutputNode node = (OutputNode) outputNode;
 				List<DataPort> inputPorts = node.getInputPorts();
 
@@ -491,7 +491,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 					}
 				}
 				node.setState(NodeExecutionState.FINISHED);
-                publishNodeStatusChange(WorkflowNodeState.COMPLETED, node.getID(), experiment.getExperimentID());
+                publishNodeStatusChange(WorkflowNodeState.COMPLETED, node.getID(), experiment.getExperimentId());
                 updateWorkflowNodeStatus(workflowNodeDetails, WorkflowNodeState.COMPLETED);
 				notifyViaInteractor(WorkflowExecutionMessage.NODE_STATE_CHANGED, null);
 			}
@@ -545,7 +545,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 		node.setState(NodeExecutionState.EXECUTING);
         invokedNode.add(node);
         updateWorkflowNodeStatus(nodeInstanceList.get(node), WorkflowNodeState.EXECUTING);
-        publishNodeStatusChange(WorkflowNodeState.EXECUTING, node.getID(), experiment.getExperimentID());
+        publishNodeStatusChange(WorkflowNodeState.EXECUTING, node.getID(), experiment.getExperimentId());
         Component component = node.getComponent();
 		if (component instanceof SubWorkflowComponent) {
 			handleSubWorkComponent(node);
@@ -645,7 +645,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 	protected void handleWSComponent(Node node) throws WorkflowException, TException, RegistryException {
         TaskDetails taskDetails = createTaskDetails(node);
         log.debug("Launching task , node = " + node.getName() + " node id = " + node.getID());
-        getOrchestratorClient().launchTask(taskDetails.getTaskID(), getCredentialStoreToken());
+        getOrchestratorClient().launchTask(taskDetails.getTaskId(), getCredentialStoreToken());
 	}
 	
 	private void addToAwaitingTaskList(String taskId, Node node){
@@ -995,8 +995,8 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 	
 	private String createInvokerForEachSingleWSNode(Node foreachWSNode, WSComponent wsComponent) throws WorkflowException, RegistryException, TException {
         TaskDetails taskDetails = createTaskDetails(foreachWSNode);
-        getOrchestratorClient().launchTask(taskDetails.getTaskID(), getCredentialStoreToken());
-		return taskDetails.getTaskID();
+        getOrchestratorClient().launchTask(taskDetails.getTaskId(), getCredentialStoreToken());
+		return taskDetails.getTaskId();
 	}
 
 	private void setupNodeDetailsInput(Node node, WorkflowNodeDetails nodeDetails){
@@ -1056,8 +1056,8 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 			throws RegistryException {
 		setupNodeDetailsInput(node, nodeInstanceList.get(node));
 		TaskDetails taskDetails = ExperimentModelUtil.cloneTaskFromWorkflowNodeDetails(experiment, nodeInstanceList.get(node));
-        taskDetails.setTaskID(getRegistry().add(ChildDataType.TASK_DETAIL, taskDetails,nodeInstanceList.get(node).getNodeInstanceId()).toString());
-        addToAwaitingTaskList(taskDetails.getTaskID(), node);
+        taskDetails.setTaskId(getRegistry().add(ChildDataType.TASK_DETAIL, taskDetails,nodeInstanceList.get(node).getNodeInstanceId()).toString());
+        addToAwaitingTaskList(taskDetails.getTaskId(), node);
 		return taskDetails;
 	}
 
@@ -1441,7 +1441,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
 			setupNodeDetailsOutput(node);
 			node.setState(NodeExecutionState.FINISHED);
         	try {
-                publishNodeStatusChange(WorkflowNodeState.COMPLETED, node.getID(), experiment.getExperimentID());
+                publishNodeStatusChange(WorkflowNodeState.COMPLETED, node.getID(), experiment.getExperimentId());
                 updateWorkflowNodeStatus(nodeInstanceList.get(node), state);
 			} catch (RegistryException e) {
                 log.error(e.getMessage(), e);

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
index 778fee2..35872a4 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
@@ -111,7 +111,7 @@ class SimpleWorkflowInterpreter{
      */
     void launchWorkflow() throws Exception {
         WorkflowFactoryImpl wfFactory = WorkflowFactoryImpl.getInstance();
-        WorkflowParser workflowParser = wfFactory.getWorkflowParser(experiment.getExperimentID(), credentialToken);
+        WorkflowParser workflowParser = wfFactory.getWorkflowParser(experiment.getExperimentId(), credentialToken);
         log.debug("Initialized workflow parser");
         setWorkflowInputNodes(workflowParser.parse());
         log.debug("Parsed the workflow and got the workflow input nodes");
@@ -175,8 +175,8 @@ class SimpleWorkflowInterpreter{
     private void publishToProcessQueue(TaskDetails process) throws AiravataException {
         ProcessSubmitEvent processSubmitEvent = new ProcessSubmitEvent();
         processSubmitEvent.setCredentialToken(credentialToken);
-        processSubmitEvent.setTaskId(process.getTaskID());
-        MessageContext messageContext = new MessageContext(processSubmitEvent, MessageType.TASK, process.getTaskID(), null);
+        processSubmitEvent.setTaskId(process.getTaskId());
+        MessageContext messageContext = new MessageContext(processSubmitEvent, MessageType.TASK, process.getTaskId(), null);
         messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
         publisher.publish(messageContext);
     }
@@ -184,7 +184,7 @@ class SimpleWorkflowInterpreter{
     private TaskDetails getProcess(WorkflowNodeDetails wfNodeDetails) throws RegistryException {
         // create workflow taskDetails from workflowNodeDetails
         TaskDetails taskDetails = ExperimentModelUtil.cloneTaskFromWorkflowNodeDetails(getExperiment(), wfNodeDetails);
-        taskDetails.setTaskID(getRegistry()
+        taskDetails.setTaskId(getRegistry()
                 .add(ChildDataType.TASK_DETAIL, taskDetails, wfNodeDetails.getNodeInstanceId()).toString());
         return taskDetails;
     }
@@ -205,7 +205,7 @@ class SimpleWorkflowInterpreter{
         wfNodeDetails.setExecutionUnit(executionUnit);
         wfNodeDetails.setExecutionUnitData(executionData);
         wfNodeDetails.setNodeInstanceId((String) getRegistry()
-                .add(ChildDataType.WORKFLOW_NODE_DETAIL, wfNodeDetails, getExperiment().getExperimentID()));
+                .add(ChildDataType.WORKFLOW_NODE_DETAIL, wfNodeDetails, getExperiment().getExperimentId()));
         return wfNodeDetails;
     }
 
@@ -288,12 +288,12 @@ class SimpleWorkflowInterpreter{
      */
     private synchronized void addToProcessingQueue(ProcessContext processContext) {
         readyList.remove(processContext.getWorkflowNode().getId());
-        processingQueue.put(processContext.getTaskDetails().getTaskID(), processContext);
+        processingQueue.put(processContext.getTaskDetails().getTaskId(), processContext);
     }
 
     private synchronized void addToCompleteQueue(ProcessContext processContext) {
-        processingQueue.remove(processContext.getTaskDetails().getTaskID());
-        completeList.put(processContext.getTaskDetails().getTaskID(), processContext);
+        processingQueue.remove(processContext.getTaskDetails().getTaskId());
+        completeList.put(processContext.getTaskDetails().getTaskId(), processContext);
     }
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
index 96fd117..cef7948 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
@@ -180,12 +180,12 @@
 //        if (type == MonitorUtil.EventType.WORKFLOW_INVOKED) {
 //            workflowStarted(graph, forward);
 //            //todo ideally experimentID and workflowInstanceID has to be different
-//            workflowStatusUpdater.saveWorkflowData(event.getExperimentID(), event.getExperimentID(),
+//            workflowStatusUpdater.saveWorkflowData(event.getExperimentId(), event.getExperimentId(),
 //                    this.workflowInterpreterConfiguration.getWorkflow().getName());
-//            workflowStatusUpdater.workflowStarted(event.getExperimentID());
+//            workflowStatusUpdater.workflowStarted(event.getExperimentId());
 //        } else if (type == MonitorUtil.EventType.WORKFLOW_TERMINATED) {
 //            workflowFinished(graph, forward);
-//            workflowStatusUpdater.workflowFinished(event.getExperimentID());
+//            workflowStatusUpdater.workflowFinished(event.getExperimentId());
 //            try {
 //                this.unsubscribe();
 //            } catch (MonitorException e) {
@@ -198,7 +198,7 @@
 //				}
 //            } else {
 //                nodeStarted(node, forward);
-//                workflowNodeStatusUpdater.workflowNodeStarted(event.getExperimentID(), event.getNodeID()
+//                workflowNodeStatusUpdater.workflowNodeStarted(event.getExperimentId(), event.getNodeID()
 //                        , event.getMessage(), event.getWorkflowID().toASCIIString());
 //            }
 //        } else if (type == MonitorUtil.EventType.RECEIVED_RESULT
@@ -211,7 +211,7 @@
 //				}
 //        	} else {
 //                nodeFinished(node, forward);
-//                workflowNodeStatusUpdater.workflowNodeFinished(event.getExperimentID(), event.getNodeID(), event.getMessage(),
+//                workflowNodeStatusUpdater.workflowNodeFinished(event.getExperimentId(), event.getNodeID(), event.getMessage(),
 //                        event.getWorkflowID().toASCIIString());
 //            }
 //        } else if (type == EventType.RECEIVED_FAULT
@@ -219,9 +219,9 @@
 //            //Constructing NodeExecutionError with required data...
 //            logger.error(event.getMessage());
 //            NodeExecutionError nodeExecutionError = new NodeExecutionError();
-//            nodeExecutionError.setExperimentId(event.getExperimentID());
+//            nodeExecutionError.setExperimentId(event.getExperimentId());
 //            nodeExecutionError.setNodeId(event.getNodeID());
-//            nodeExecutionError.setWorkflowInstanceId(event.getExperimentID());
+//            nodeExecutionError.setWorkflowInstanceId(event.getExperimentId());
 //            nodeExecutionError.setErrorMessage(event.getMessage());
 //            nodeExecutionError.setErrorDescription(event.getMessage());
 //            nodeExecutionError.setErrorTime(event.getTimestamp());
@@ -232,7 +232,7 @@
 //				}
 //            } else {
 //                nodeFailed(node, forward);
-//                workflowNodeStatusUpdater.workflowNodeFailed(event.getExperimentID(), event.getNodeID());
+//                workflowNodeStatusUpdater.workflowNodeFailed(event.getExperimentId(), event.getNodeID());
 //            }
 //            try {
 //                this.unsubscribe();
@@ -246,17 +246,17 @@
 //				}
 //            } else {
 //                // nodeResourceMapped(node, event.getEvent(), forward);
-//                workflowNodeStatusUpdater.workflowNodeRunning(event.getExperimentID(), event.getNodeID());
+//                workflowNodeStatusUpdater.workflowNodeRunning(event.getExperimentId(), event.getNodeID());
 //            }
 //        } else if(type == MonitorUtil.EventType.LOG_INFO){
 //            // This is not very gram specific, if these data is required in other provider they have to send
 //            // the notification in info mode with ending these text, DONE,PENDING and ACTIVE
 //            if(event.getMessage().endsWith("DONE")) {
-//                workflowNodeStatusUpdater.workflowNodeStatusDone(event.getExperimentID(), event.getNodeID());
+//                workflowNodeStatusUpdater.workflowNodeStatusDone(event.getExperimentId(), event.getNodeID());
 //            } else if(event.getMessage().endsWith("PENDING")){
-//                workflowNodeStatusUpdater.workflowNodeStatusPending(event.getExperimentID(), event.getNodeID());
+//                workflowNodeStatusUpdater.workflowNodeStatusPending(event.getExperimentId(), event.getNodeID());
 //            } else if(event.getMessage().endsWith("ACTIVE")){
-//                workflowNodeStatusUpdater.workflowNodeStatusActive(event.getExperimentID(), event.getNodeID());
+//                workflowNodeStatusUpdater.workflowNodeStatusActive(event.getExperimentId(), event.getNodeID());
 //            }
 //        } else {
 //            // Ignore the rest.


Mime
View raw message