You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/05 19:29:53 UTC
[05/44] git commit: fixing AIRAVATA-1494
fixing AIRAVATA-1494
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8b82bee9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8b82bee9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8b82bee9
Branch: refs/heads/gfac_appcatalog_int
Commit: 8b82bee96cc6e16b7f9c24b072f9c7cf76738d6c
Parents: b376951
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Oct 30 12:16:59 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Oct 30 12:16:59 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 58 +
.../java/org/apache/airavata/api/Airavata.java | 25217 ++++++++++-------
.../main/resources/lib/airavata/Airavata.cpp | 4008 ++-
.../src/main/resources/lib/airavata/Airavata.h | 612 +
.../lib/airavata/Airavata_server.skeleton.cpp | 20 +
.../resources/lib/Airavata/API/Airavata.php | 1120 +
.../airavataAPI.thrift | 19 +
.../appcatalog/cpi/ComputeResource.java | 7 +
.../catalog/data/impl/ComputeResourceImpl.java | 51 +-
9 files changed, 19622 insertions(+), 11490 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8b82bee9/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 f329cfd..693ff14 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
@@ -2447,6 +2447,64 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
+ @Override
+ public String registerResourceJobManager(ResourceJobManager resourceJobManager) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ appCatalog = AppCatalogFactory.getAppCatalog();
+ return appCatalog.getComputeResource().addResourceJobManager(resourceJobManager);
+ } catch (AppCatalogException e) {
+ logger.errorId(resourceJobManager.getResourceJobManagerId(), "Error while adding resource job manager...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while adding resource job manager. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ public boolean updateResourceJobManager(String resourceJobManagerId, ResourceJobManager updatedResourceJobManager) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ appCatalog = AppCatalogFactory.getAppCatalog();
+ appCatalog.getComputeResource().updateResourceJobManager(resourceJobManagerId, updatedResourceJobManager);
+ return true;
+ } catch (AppCatalogException e) {
+ logger.errorId(resourceJobManagerId, "Error while updating resource job manager...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while updating resource job manager. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ public ResourceJobManager getResourceJobManager(String resourceJobManagerId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ appCatalog = AppCatalogFactory.getAppCatalog();
+ return appCatalog.getComputeResource().getResourceJobManager(resourceJobManagerId);
+ } catch (AppCatalogException e) {
+ logger.errorId(resourceJobManagerId, "Error while retrieving resource job manager...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while retrieving resource job manager. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ public boolean deleteResourceJobManager(String resourceJobManagerId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ appCatalog = AppCatalogFactory.getAppCatalog();
+ appCatalog.getComputeResource().deleteResourceJobManager(resourceJobManagerId);
+ return true;
+ } catch (AppCatalogException e) {
+ logger.errorId(resourceJobManagerId, "Error while deleting resource job manager...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while deleting resource job manager. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
/**
* Register a Gateway Resource Profile.
*