fixing compilation isssue, bug in getAvailableAppInterfaceComputeResources(), fixing AIRAVATA-1226, AIRAVATA-1626
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/56efa8e5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/56efa8e5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/56efa8e5 Branch: refs/heads/master Commit: 56efa8e5e7b1bdbc69a8238968ca305c2d8f5ad0 Parents: 7ef8800 Author: Chathuri Wimalasena <[email protected]> Authored: Tue Mar 10 13:30:28 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Mar 10 13:30:28 2015 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 30 +- .../java/org/apache/airavata/api/Airavata.java | 5264 +++++++++++------- .../main/resources/lib/airavata/Airavata.cpp | 381 ++ .../src/main/resources/lib/airavata/Airavata.h | 161 + .../lib/airavata/Airavata_server.skeleton.cpp | 5 + .../resources/lib/Airavata/API/Airavata.php | 296 + .../client/samples/CreateLaunchExperiment.java | 31 +- .../computeresource/AuthenticationMode.java | 70 + .../airavataAPI.thrift | 6 + 9 files changed, 4246 insertions(+), 1998 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/56efa8e5/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 c111a07..f250f37 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 @@ -337,9 +337,9 @@ public class AiravataServerHandler implements Airavata.Iface { } return (Project)registry.get(RegistryModelType.PROJECT, projectId); } catch (RegistryException e) { - logger.error("Error while updating the project", e); + logger.error("Error while retrieving the project", e); ProjectNotFoundException exception = new ProjectNotFoundException(); - exception.setMessage("Error while updating the project. More info : " + e.getMessage()); + exception.setMessage("Error while retrieving the project. More info : " + e.getMessage()); throw exception; } } @@ -1868,8 +1868,10 @@ public class AiravataServerHandler implements Airavata.Iface { List<ApplicationDeploymentDescription> applicationDeployments = applicationDeployment.getApplicationDeployements(filters); for (ApplicationDeploymentDescription deploymentDescription : applicationDeployments) { - availableComputeResources.put(deploymentDescription.getComputeHostId(), - allComputeResources.get(deploymentDescription.getComputeHostId())); + if (allComputeResources.get(deploymentDescription.getComputeHostId()) != null){ + availableComputeResources.put(deploymentDescription.getComputeHostId(), + allComputeResources.get(deploymentDescription.getComputeHostId())); + } } } } @@ -3096,4 +3098,24 @@ public class AiravataServerHandler implements Airavata.Iface { return workflowCatalog; } + @Override + public boolean deleteProject(String projectId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException, TException { + try { + registry = RegistryFactory.getDefaultRegistry(); + if (!registry.isExist(RegistryModelType.PROJECT, projectId)){ + logger.error("Project does not exist in the system. Please provide a valid project ID..."); + ProjectNotFoundException exception = new ProjectNotFoundException(); + exception.setMessage("Project does not exist in the system. Please provide a valid project ID..."); + throw exception; + } + registry.remove(RegistryModelType.PROJECT, projectId); + return true; + } catch (RegistryException e) { + logger.error("Error while removing the project", e); + ProjectNotFoundException exception = new ProjectNotFoundException(); + exception.setMessage("Error while removing the project. More info : " + e.getMessage()); + throw exception; + } + } + }
