merging master with branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e6d68271 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e6d68271 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e6d68271 Branch: refs/heads/master Commit: e6d6827114ce2497df512e26d99346e3f013ff49 Parents: 6718650 55f190c Author: Chathuri Wimalasena <[email protected]> Authored: Wed Feb 24 15:10:48 2016 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Feb 24 15:10:48 2016 -0500 ---------------------------------------------------------------------- .../airavata/api/server/AiravataAPIServer.java | 10 +- .../server/util/CredentialStoreInitUtil.java | 156 +++++++++++++++++++ .../java/org/apache/airavata/api/Airavata.java | 2 +- .../gateway_resource_profile_model_types.cpp | 22 +++ .../gateway_resource_profile_model_types.h | 12 +- .../Model/AppCatalog/GatewayProfile/Types.php | 23 +++ .../model/appcatalog/gatewayprofile/ttypes.py | 15 +- .../apache/airavata/model/ComponentStatus.java | 2 +- .../org/apache/airavata/model/EdgeModel.java | 2 +- .../org/apache/airavata/model/NodeModel.java | 2 +- .../org/apache/airavata/model/PortModel.java | 2 +- .../apache/airavata/model/WorkflowModel.java | 2 +- .../apache/airavata/model/WorkflowStatus.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 116 +++++++++++++- .../gatewayprofile/GatewayResourceProfile.java | 116 +------------- .../gatewayprofile/StoragePreference.java | 2 +- .../StorageResourceDescription.java | 2 +- .../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 +- .../data/movement/DataMovementInterface.java | 2 +- .../data/movement/GridFTPDataMovement.java | 2 +- .../model/data/movement/LOCALDataMovement.java | 2 +- .../model/data/movement/SCPDataMovement.java | 2 +- .../data/movement/UnicoreDataMovement.java | 2 +- .../data/resource/DataReplicaLocationModel.java | 2 +- .../model/data/resource/DataResourceModel.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 +- .../model/task/EnvironmentSetupTaskModel.java | 2 +- .../model/task/JobSubmissionTaskModel.java | 2 +- .../airavata/model/task/MonitorTaskModel.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 +- .../common/utils/ApplicationSettings.java | 16 -- .../airavata/common/utils/ServerSettings.java | 3 +- .../main/resources/airavata-server.properties | 16 +- .../scripts/credential-store-h2.sql | 42 ----- .../scripts/credential-store-mysql.sql | 38 ----- .../store/server/CredentialStoreServer.java | 87 +++++------ .../apache/airavata/gfac/core/GFacUtils.java | 2 + .../impl/task/DefaultJobSubmissionTask.java | 31 +++- .../catalog/impl/GwyResourceProfileImpl.java | 4 +- .../core/app/catalog/model/ComputeResource.java | 33 ++++ .../model/ComputeResourcePreference.java | 10 ++ .../ComputeHostPreferenceResource.java | 11 ++ .../resources/ComputeResourceResource.java | 30 ++++ .../app/catalog/util/AppCatalogJPAUtils.java | 4 + .../util/AppCatalogThriftConversion.java | 7 + .../src/main/resources/appcatalog-derby.sql | 4 + .../src/main/resources/appcatalog-mysql.sql | 4 + .../src/main/resources/credstore-derby.sql | 39 +++++ .../src/main/resources/credstore-mysql.sql | 39 +++++ .../src/main/resources/expcatalog-derby.sql | 21 +-- .../src/main/resources/expcatalog-mysql.sql | 21 +-- .../org/apache/airavata/server/ServerMain.java | 4 +- .../airavata/workflow/core/WorkflowInfo.java | 38 +++-- .../workflow/core/dag/edge/DirectedEdge.java | 12 +- .../workflow/core/dag/nodes/InputNodeImpl.java | 6 +- .../workflow/core/dag/nodes/OutputNodeImpl.java | 12 +- .../core/parser/JsonWorkflowParser.java | 31 +++- .../src/test/resources/TestWorkflow.json | 16 +- .../gateway_resource_profile_model.thrift | 6 +- 118 files changed, 765 insertions(+), 454 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py ----------------------------------------------------------------------
