Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a2823bc6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a2823bc6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a2823bc6 Branch: refs/heads/master Commit: a2823bc6e35bd29090364b352706cc4f26403325 Parents: 7cecac8 d84783d Author: Shameera Rathnayaka Yodage <[email protected]> Authored: Mon Sep 28 18:03:24 2015 -0400 Committer: Shameera Rathnayaka Yodage <[email protected]> Committed: Mon Sep 28 18:03:24 2015 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 127 + .../java/org/apache/airavata/api/Airavata.java | 38423 ++++++++++------- .../main/resources/lib/airavata/Airavata.cpp | 9723 +++-- .../src/main/resources/lib/airavata/Airavata.h | 1319 +- .../lib/airavata/Airavata_server.skeleton.cpp | 25 + .../airavata/compute_resource_model_types.cpp | 420 +- .../lib/airavata/compute_resource_model_types.h | 14 +- .../gateway_resource_profile_model_types.cpp | 291 +- .../gateway_resource_profile_model_types.h | 108 +- .../resources/lib/Airavata/API/Airavata.php | 2190 +- .../Model/AppCatalog/ComputeResource/Types.php | 196 +- .../Model/AppCatalog/GatewayProfile/Types.php | 257 +- .../lib/apache/airavata/api/Airavata-remote | 35 + .../lib/apache/airavata/api/Airavata.py | 5361 ++- .../model/appcatalog/computeresource/ttypes.py | 124 +- .../model/appcatalog/gatewayprofile/ttypes.py | 176 +- .../org/apache/airavata/model/Workflow.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 218 +- .../computeresource/DataMovementInterface.java | 2 +- .../computeresource/GlobusJobSubmission.java | 34 +- .../computeresource/GridFTPDataMovement.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALDataMovement.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SCPDataMovement.java | 2 +- .../computeresource/SSHJobSubmission.java | 172 +- .../computeresource/UnicoreDataMovement.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 120 +- .../gatewayprofile/GatewayResourceProfile.java | 312 +- .../application/io/InputDataObjectType.java | 2 +- .../application/io/OutputDataObjectType.java | 2 +- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.java | 2 +- .../model/error/AiravataClientException.java | 2 +- .../model/error/AiravataSystemException.java | 2 +- .../model/error/AuthenticationException.java | 2 +- .../model/error/AuthorizationException.java | 2 +- .../error/ExperimentNotFoundException.java | 2 +- .../model/error/InvalidRequestException.java | 2 +- .../model/error/LaunchValidationException.java | 2 +- .../model/error/ProjectNotFoundException.java | 2 +- .../airavata/model/error/TimedOutException.java | 2 +- .../airavata/model/error/ValidationResults.java | 2 +- .../airavata/model/error/ValidatorResult.java | 2 +- .../model/experiment/ExperimentModel.java | 2 +- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 2 +- .../org/apache/airavata/model/job/JobModel.java | 2 +- .../event/ExperimentStatusChangeEvent.java | 2 +- .../model/messaging/event/JobIdentifier.java | 2 +- .../messaging/event/JobStatusChangeEvent.java | 2 +- .../event/JobStatusChangeRequestEvent.java | 2 +- .../airavata/model/messaging/event/Message.java | 2 +- .../messaging/event/ProcessIdentifier.java | 2 +- .../event/ProcessStatusChangeEvent.java | 2 +- .../event/ProcessStatusChangeRequestEvent.java | 2 +- .../messaging/event/ProcessSubmitEvent.java | 2 +- .../messaging/event/ProcessTerminateEvent.java | 2 +- .../model/messaging/event/TaskIdentifier.java | 2 +- .../messaging/event/TaskOutputChangeEvent.java | 2 +- .../messaging/event/TaskStatusChangeEvent.java | 2 +- .../event/TaskStatusChangeRequestEvent.java | 2 +- .../airavata/model/process/ProcessModel.java | 2 +- .../ComputationalResourceSchedulingModel.java | 2 +- .../airavata/model/security/AuthzToken.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 2 +- .../airavata/model/status/ProcessStatus.java | 2 +- .../airavata/model/status/TaskStatus.java | 2 +- .../model/task/DataStagingTaskModel.java | 2 +- .../apache/airavata/model/task/TaskModel.java | 2 +- .../airavata/model/workspace/Gateway.java | 2 +- .../apache/airavata/model/workspace/Group.java | 2 +- .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../catalog/impl/GwyResourceProfileImpl.java | 81 +- .../model/ComputeResourcePreference.java | 10 + .../catalog/model/DataStoragePreference.java | 96 + .../catalog/model/DataStoragePreferencePK.java | 64 + .../resources/AppCatAbstractResource.java | 6 + .../ComputeHostPreferenceResource.java | 11 + .../DataStoragePreferenceResource.java | 323 + .../app/catalog/util/AppCatalogJPAUtils.java | 21 + .../catalog/util/AppCatalogResourceType.java | 1 + .../util/AppCatalogThriftConversion.java | 24 +- .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 14 +- .../src/main/resources/appcatalog-mysql.sql | 12 + .../src/test/resources/appcatalog-derby.sql | 17 +- .../registry/cpi/GwyResourceProfile.java | 4 + .../airavata-api/airavata_api.thrift | 37 + .../gateway_resource_profile_model.thrift | 2 +- 102 files changed, 38638 insertions(+), 21859 deletions(-) ----------------------------------------------------------------------
