fixing typos in Airavata API and generate code for AIRAVATA-1471
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a3cef493 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a3cef493 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a3cef493 Branch: refs/heads/gfac_appcatalog_int Commit: a3cef493bd4384309f471255d09a589c941f1730 Parents: a728bf2 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Oct 30 15:11:18 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Oct 30 15:11:18 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 8 +- .../AiravataExperimentStatusUpdator.java | 2 +- .../java/org/apache/airavata/api/Airavata.java | 666 +- .../java/org/apache/airavata/api/Workflow.java | 8191 ++++++++++++++++++ .../main/resources/lib/airavata/Airavata.cpp | 142 +- .../src/main/resources/lib/airavata/Airavata.h | 126 +- .../lib/airavata/Airavata_server.skeleton.cpp | 10 +- .../main/resources/lib/airavata/Workflow.cpp | 36 +- .../src/main/resources/lib/airavata/Workflow.h | 4 +- .../lib/airavata/Workflow_server.skeleton.cpp | 2 +- .../resources/lib/airavata/airavataAPI_types.h | 1 + .../resources/lib/Airavata/API/Airavata.php | 140 +- airavata-api/generate-thrift-files.sh | 6 +- .../airavataAPI.thrift | 3169 +++---- .../appcatalog/cpi/ComputeResource.java | 4 +- .../catalog/data/impl/ComputeResourceImpl.java | 14 +- 16 files changed, 10529 insertions(+), 1992 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 693ff14..9eb9c23 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -2411,10 +2411,10 @@ public class AiravataServerHandler implements Airavata.Iface { * Returns a success/failure of the deletion. */ @Override - public boolean deleteJobSubmissionInterface(String jobSubmissionInterfaceId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException { + public boolean deleteJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException { try { appCatalog = AppCatalogFactory.getAppCatalog(); - appCatalog.getComputeResource().removeJobSubmissionInterface(jobSubmissionInterfaceId); + appCatalog.getComputeResource().removeJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId); return true; } catch (AppCatalogException e) { logger.errorId(jobSubmissionInterfaceId, "Error while deleting job submission interface...", e); @@ -2433,10 +2433,10 @@ public class AiravataServerHandler implements Airavata.Iface { * Returns a success/failure of the deletion. */ @Override - public boolean deleteDataMovementInterface(String dataMovementInterfaceId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException { + public boolean deleteDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException { try { appCatalog = AppCatalogFactory.getAppCatalog(); - appCatalog.getComputeResource().removeDataMovementInterface(dataMovementInterfaceId); + appCatalog.getComputeResource().removeDataMovementInterface(computeResourceId, dataMovementInterfaceId); return true; } catch (AppCatalogException e) { logger.errorId(dataMovementInterfaceId, "Error while deleting data movement interface...", e); http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java index 05f5ddb..31dfb3a 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java @@ -66,7 +66,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener state = ExperimentState.CANCELED; updateExperimentStatus = true; break; case COMPLETED: - state = ExperimentState.EXECUTING; updateExperimentStatus = false; + state = ExperimentState.EXECUTING; updateExperimentStatus = true; break; case INVOKED: state = ExperimentState.LAUNCHED; updateExperimentStatus = false;
