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/57adb55d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/57adb55d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/57adb55d Branch: refs/heads/master Commit: 57adb55db728c7f871361f97394da877b8f91173 Parents: 00e2420 282362f Author: raminder <[email protected]> Authored: Mon Oct 6 18:15:19 2014 -0400 Committer: raminder <[email protected]> Committed: Mon Oct 6 18:15:19 2014 -0400 ---------------------------------------------------------------------- .../AiravataExperimentStatusUpdator.java | 39 +- .../listener/ExperimentStatusChangedEvent.java | 128 +- .../lib/airavata/airavataDataModel_types.h | 1 + .../lib/airavata/messagingEvents_constants.cpp | 36 + .../lib/airavata/messagingEvents_constants.h | 42 + .../lib/airavata/messagingEvents_types.cpp | 1067 +++++++++++++++ .../lib/airavata/messagingEvents_types.h | 601 +++++++++ .../lib/airavata/workflowDataModel_types.cpp | 86 +- .../lib/airavata/workflowDataModel_types.h | 42 +- .../Airavata/Model/Messaging/Event/Types.php | 1238 ++++++++++++++++++ .../main/resources/lib/Airavata/Model/Types.php | 116 ++ .../client/samples/CreateLaunchExperiment.java | 10 +- .../org/apache/airavata/model/Workflow.java | 429 +++++- .../event/ExperimentStatusChangeEvent.java | 504 +++++++ .../model/messaging/event/JobIdentifier.java | 684 ++++++++++ .../messaging/event/JobStatusChangeEvent.java | 509 +++++++ .../event/JobStatusChangeRequestEvent.java | 509 +++++++ .../airavata/model/messaging/event/Message.java | 828 ++++++++++++ .../model/messaging/event/MessageLevel.java | 68 + .../model/messaging/event/MessageType.java | 68 + .../model/messaging/event/TaskIdentifier.java | 588 +++++++++ .../messaging/event/TaskOutputChangeEvent.java | 551 ++++++++ .../messaging/event/TaskStatusChangeEvent.java | 509 +++++++ .../event/TaskStatusChangeRequestEvent.java | 509 +++++++ .../messaging/event/WorkflowIdentifier.java | 492 +++++++ .../event/WorkflowNodeStatusChangeEvent.java | 509 +++++++ .../event/messagingEventsConstants.java | 56 + .../airavataDataModel.thrift | 1 + .../messagingEvents.thrift | 121 ++ .../workflowDataModel.thrift | 6 +- .../catalog/data/impl/WorkflowCatalogImpl.java | 78 +- .../catalog/data/model/Workflow.java | 13 + .../catalog/data/model/WorkflowInput.java | 127 ++ .../catalog/data/model/WorkflowInput_PK.java | 64 + .../catalog/data/model/WorkflowOutput.java | 87 ++ .../catalog/data/model/WorkflowOutput_PK.java | 64 + .../data/resources/AbstractResource.java | 20 + .../data/resources/WorkflowInputResource.java | 412 ++++++ .../data/resources/WorkflowOutputResource.java | 377 ++++++ .../data/resources/WorkflowResource.java | 12 + .../catalog/data/util/AppCatalogJPAUtils.java | 62 +- .../data/util/AppCatalogResourceType.java | 4 +- .../data/util/AppCatalogThriftConversion.java | 50 +- .../src/main/resources/META-INF/persistence.xml | 2 + .../src/main/resources/appcatalog-derby.sql | 25 + .../src/main/resources/appcatalog-mysql.sql | 27 +- modules/commons/utils/pom.xml | 5 + .../airavata/common/utils/AiravataUtils.java | 6 + .../airavata/common/utils/ServerSettings.java | 12 + .../airavata/common/utils/ThriftUtils.java | 37 + .../main/resources/airavata-server.properties | 5 + modules/distribution/server/pom.xml | 5 + .../server/src/main/assembly/bin-assembly.xml | 1 + modules/gfac/gfac-core/pom.xml | 5 + .../airavata/gfac/core/cpi/BetterGfacImpl.java | 137 +- .../core/monitor/AiravataJobStatusUpdator.java | 42 +- .../core/monitor/AiravataTaskStatusUpdator.java | 73 +- .../AiravataWorkflowNodeStatusUpdator.java | 44 +- .../gfac/core/monitor/ExperimentIdentity.java | 72 +- .../airavata/gfac/core/monitor/JobIdentity.java | 78 +- .../gfac/core/monitor/TaskIdentity.java | 76 +- .../gfac/core/monitor/WorkflowNodeIdentity.java | 74 +- .../state/GfacExperimentStateChangeRequest.java | 16 +- .../monitor/state/JobStatusChangeRequest.java | 162 +-- .../monitor/state/JobStatusChangedEvent.java | 162 +-- .../state/TaskOutputDataChangedEvent.java | 128 +- .../monitor/state/TaskStatusChangeRequest.java | 124 +- .../monitor/state/TaskStatusChangedEvent.java | 124 +- .../state/WorkflowNodeStatusChangedEvent.java | 128 +- .../gfac/core/utils/OutHandlerWorker.java | 8 +- .../gfac/local/provider/impl/LocalProvider.java | 38 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 36 +- .../monitor/impl/push/amqp/AMQPMonitor.java | 8 +- .../impl/push/amqp/UnRegisterWorker.java | 5 +- .../apache/airavata/job/AMQPMonitorTest.java | 4 +- .../job/QstatMonitorTestWithMyProxyAuth.java | 6 +- modules/messaging/core/pom.xml | 69 + .../airavata/messaging/core/MessageContext.java | 61 + .../airavata/messaging/core/Metadata.java | 25 + .../airavata/messaging/core/Publisher.java | 29 + .../messaging/core/PublisherFactory.java | 50 + .../messaging/core/impl/RabbitMQProducer.java | 195 +++ .../messaging/core/impl/RabbitMQPublisher.java | 99 ++ modules/messaging/pom.xml | 41 + .../resources/DataTransferDetailResource.java | 2 + .../jpa/resources/ExperimentResource.java | 2 + .../jpa/resources/JobDetailResource.java | 2 + .../jpa/resources/TaskDetailResource.java | 5 +- .../resources/WorkflowNodeDetailResource.java | 2 + .../engine/interpretor/WorkflowInterpreter.java | 12 +- pom.xml | 1 + .../airavata/gsi/ssh/api/CommandExecutor.java | 18 +- .../gsi/ssh/impl/GSISSHAbstractCluster.java | 2 +- .../apache/airavata/gsi/ssh/util/SSHUtils.java | 19 +- 94 files changed, 13148 insertions(+), 878 deletions(-) ----------------------------------------------------------------------
