Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F52417622 for ; Thu, 9 Oct 2014 17:43:46 +0000 (UTC) Received: (qmail 13374 invoked by uid 500); 9 Oct 2014 17:43:46 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 13247 invoked by uid 500); 9 Oct 2014 17:43:46 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 13158 invoked by uid 99); 9 Oct 2014 17:43:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2014 17:43:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7769D890BC9; Thu, 9 Oct 2014 17:43:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Thu, 09 Oct 2014 17:43:47 -0000 Message-Id: <6fe2cc8727474f9189aa8788bd0237e1@git.apache.org> In-Reply-To: <3798f67e2d4f4b9bb0c76e57aa11ceb8@git.apache.org> References: <3798f67e2d4f4b9bb0c76e57aa11ceb8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] git commit: Merge branch 'master' into workflowEngineImprovement Merge branch 'master' into workflowEngineImprovement Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/896d3459 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/896d3459 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/896d3459 Branch: refs/heads/master Commit: 896d34599f35d1269120ef90bc5b71dadeaa19e1 Parents: ede9523 57adb55 Author: shamrath Authored: Wed Oct 8 11:43:07 2014 -0400 Committer: shamrath Committed: Wed Oct 8 11:43:07 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 272 ++-- .../AiravataExperimentStatusUpdator.java | 41 +- .../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 | 30 +- .../tools/RegisterOGCEUS3Application.java | 313 +++++ .../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/logger/AiravataLogger.java | 677 ++++++++++ .../common/logger/AiravataLoggerFactory.java | 34 + .../common/logger/AiravataLoggerImpl.java | 323 +++++ .../airavata/common/utils/AiravataUtils.java | 6 + .../airavata/common/utils/ServerSettings.java | 12 + .../airavata/common/utils/ThriftUtils.java | 37 + .../main/resources/airavata-server.properties | 5 + .../server/src/main/resources/log4j.properties | 2 + modules/distribution/server/pom.xml | 5 + .../server/src/main/assembly/bin-assembly.xml | 1 + .../airavata/gfac/server/GfacServerHandler.java | 39 +- modules/gfac/gfac-core/pom.xml | 5 + .../airavata/gfac/core/cpi/BetterGfacImpl.java | 133 +- .../core/monitor/AiravataJobStatusUpdator.java | 42 +- .../core/monitor/AiravataTaskStatusUpdator.java | 75 +- .../AiravataWorkflowNodeStatusUpdator.java | 46 +- .../gfac/core/monitor/ExperimentIdentity.java | 72 +- .../airavata/gfac/core/monitor/JobIdentity.java | 78 +- .../airavata/gfac/core/monitor/MonitorID.java | 17 +- .../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 +- .../handler/GSISSHDirectorySetupHandler.java | 34 +- .../gfac/gsissh/handler/GSISSHInputHandler.java | 52 +- .../gsissh/handler/GSISSHOutputHandler.java | 31 +- .../gsissh/provider/impl/GSISSHProvider.java | 12 +- .../gfac/gsissh/util/GFACGSISSHUtils.java | 61 +- .../gfac/local/provider/impl/LocalProvider.java | 38 +- .../handlers/GridPullMonitorHandler.java | 9 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 131 +- .../monitor/impl/push/amqp/AMQPMonitor.java | 8 +- .../impl/push/amqp/SimpleJobFinishConsumer.java | 5 +- .../impl/push/amqp/UnRegisterWorker.java | 5 +- .../airavata/gfac/monitor/util/CommonUtils.java | 18 +- .../apache/airavata/job/AMQPMonitorTest.java | 4 +- .../job/QstatMonitorTestWithMyProxyAuth.java | 6 +- .../ssh/handler/AdvancedSCPInputHandler.java | 58 +- .../ssh/handler/AdvancedSCPOutputHandler.java | 27 +- .../ssh/handler/SSHDirectorySetupHandler.java | 8 +- .../gfac/ssh/handler/SSHInputHandler.java | 39 +- .../gfac/ssh/handler/SSHOutputHandler.java | 30 +- .../gfac/ssh/provider/impl/SSHProvider.java | 10 +- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 26 +- 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 + .../server/OrchestratorServerHandler.java | 47 +- .../registry/jpa/impl/ExperimentRegistry.java | 23 +- .../resources/DataTransferDetailResource.java | 2 + .../jpa/resources/ExperimentResource.java | 2 + .../jpa/resources/JobDetailResource.java | 2 + .../jpa/resources/TaskDetailResource.java | 5 +- .../resources/WorkflowNodeDetailResource.java | 2 + .../registry/cpi/CompositeIdentifier.java | 12 + .../engine/interpretor/WorkflowInterpreter.java | 12 +- pom.xml | 1 + .../airavata/gsi/ssh/api/CommandExecutor.java | 18 +- .../gsi/ssh/api/job/SlurmOutputParser.java | 2 +- .../gsi/ssh/impl/GSISSHAbstractCluster.java | 233 +++- .../apache/airavata/gsi/ssh/util/SSHUtils.java | 19 +- 121 files changed, 15236 insertions(+), 1319 deletions(-) ----------------------------------------------------------------------