airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [3/6] airavata git commit: Merge remote-tracking branch 'origin/master'
Date Fri, 25 Sep 2015 19:09:15 GMT
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bb478568
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bb478568
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bb478568

Branch: refs/heads/master
Commit: bb478568c2895701d74d39a89a5e74e6519dfa2d
Parents: 47f161b 28b8457
Author: Suresh Marru <smarru@apache.org>
Authored: Sat Sep 5 09:06:17 2015 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Sat Sep 5 09:06:17 2015 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   3 +-
 .../java/org/apache/airavata/api/Airavata.java  | 141 +++++++-
 .../main/resources/lib/airavata/Airavata.cpp    |  35 +-
 .../src/main/resources/lib/airavata/Airavata.h  |  40 ++-
 .../lib/airavata/Airavata_server.skeleton.cpp   |   4 +-
 .../resources/lib/airavata/job_model_types.cpp  |  70 +++-
 .../resources/lib/airavata/job_model_types.h    |  32 +-
 .../resources/lib/Airavata/API/Airavata.php     |  42 ++-
 .../resources/lib/Airavata/Model/job/Types.php  |  69 ++++
 .../lib/apache/airavata/api/Airavata-remote     |   8 +-
 .../lib/apache/airavata/api/Airavata.py         |  39 ++-
 .../lib/apache/airavata/model/job/ttypes.py     |  41 ++-
 .../client/samples/CreateLaunchBES.java         |   2 +-
 .../client/samples/CreateLaunchExperiment.java  |   2 +-
 .../samples/CreateLaunchExperimentUS3.java      |   2 +-
 .../tools/RegisterOGCEUS3Application.java       |   2 +-
 .../tools/RegisterSampleApplications.java       |   2 +-
 .../client/tools/RegisterUS3Application.java    |   2 +-
 .../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             |   2 +-
 .../computeresource/DataMovementInterface.java  |   2 +-
 .../computeresource/GlobusJobSubmission.java    |   2 +-
 .../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       |   2 +-
 .../computeresource/UnicoreDataMovement.java    |   2 +-
 .../computeresource/UnicoreJobSubmission.java   |   2 +-
 .../ComputeResourcePreference.java              |   2 +-
 .../gatewayprofile/GatewayResourceProfile.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 +-
 .../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 | 321 ++++++++++++++++++-
 .../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 +-
 .../airavata/common/utils/ZkConstants.java      |   9 +
 .../resources/airavata-default-xacml-policy.xml |   6 +-
 .../src/main/resources/client_truststore.jks    | Bin 1307 -> 2423 bytes
 .../apache/airavata/gfac/core/GFacUtils.java    | 150 +--------
 .../gfac/core/cluster/CommandOutput.java        |   7 +
 .../gfac/core/cluster/JobSubmissionOutput.java  |  70 ++++
 .../gfac/core/cluster/RemoteCluster.java        |   2 +-
 .../apache/airavata/gfac/impl/GFacWorker.java   |   3 +-
 .../airavata/gfac/impl/HPCRemoteCluster.java    |  13 +-
 .../airavata/gfac/impl/StandardOutReader.java   |  12 +-
 .../impl/task/SSHForkJobSubmissionTask.java     |  12 +-
 .../gfac/impl/task/SSHJobSubmissionTask.java    |  10 +-
 .../airavata/gfac/server/GfacServerHandler.java |   7 +-
 .../catalog/impl/ExperimentCatalogImpl.java     |   1 +
 .../catalog/impl/ExperimentRegistry.java        |   6 +
 .../core/experiment/catalog/model/Job.java      |  33 ++
 .../catalog/resources/ExperimentResource.java   |   2 -
 .../catalog/resources/GatewayResource.java      |   2 -
 .../catalog/resources/JobResource.java          |  36 ++-
 .../catalog/resources/JobStatusResource.java    |   6 +-
 .../catalog/resources/ProcessErrorResource.java |   6 +-
 .../catalog/resources/ProcessInputResource.java |   4 +-
 .../resources/ProcessOutputResource.java        |   4 +-
 .../catalog/resources/ProcessResource.java      |   2 -
 .../ProcessResourceScheduleResource.java        |   6 +-
 .../resources/ProcessStatusResource.java        |   6 +-
 .../catalog/resources/ProjectResource.java      |   2 +
 .../catalog/resources/TaskResource.java         |   2 -
 .../experiment/catalog/resources/Utils.java     |   7 +
 .../utils/ThriftDataModelConversion.java        |   4 +-
 .../src/main/resources/expcatalog-derby.sql     |   3 +
 .../src/main/resources/expcatalog-mysql.sql     |   5 +-
 .../src/test/resources/expcatalog-derby.sql     |  40 ++-
 .../airavata-api/airavata_api.thrift            |   2 +-
 .../airavata-api/job_model.thrift               |   5 +-
 122 files changed, 1150 insertions(+), 328 deletions(-)
----------------------------------------------------------------------



Mime
View raw message