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/dd7e6c75 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dd7e6c75 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dd7e6c75 Branch: refs/heads/master Commit: dd7e6c750460b4c47cb51f5988db60f1721c944b Parents: 4ae0104 e6126da Author: lahiru <[email protected]> Authored: Wed Jul 23 14:23:07 2014 -0400 Committer: lahiru <[email protected]> Committed: Wed Jul 23 14:23:07 2014 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 5 + .../server/handler/AiravataServerHandler.java | 74 +- .../server/handler/WorkflowServerHandler.java | 69 +- .../util/AiravataExperimentStatusUpdator.java | 117 ++ .../api/server/util/DataModelUtils.java | 56 + .../api/client/AiravataClientFactory.java | 9 +- .../client/samples/CreateLaunchExperiment.java | 8 +- .../tools/RegisterSampleApplications.java | 190 ++- .../airavata/model/util/ExecutionType.java | 28 + .../model/util/ExperimentModelUtil.java | 22 +- .../experimentModel.thrift | 3 +- modules/commons/utils/pom.xml | 7 +- .../common/utils/AbstractActivityListener.java | 27 + .../airavata/common/utils/MonitorPublisher.java | 47 + .../main/resources/airavata-server.properties | 2 +- modules/distribution/server/pom.xml | 10 + .../server/src/main/assembly/bin-assembly.xml | 2 + .../airavata/gfac/server/GfacServerHandler.java | 20 +- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 82 +- .../apache/airavata/gfac/core/cpi/GFacImpl.java | 54 +- .../gfac/core/handler/AbstractHandler.java | 2 +- .../handler/AbstractRecoverableHandler.java | 2 +- .../core/monitor/AbstractActivityListener.java | 54 +- .../AiravataExperimentStatusUpdator.java | 191 ++- .../core/monitor/AiravataJobStatusUpdator.java | 47 +- .../core/monitor/AiravataTaskStatusUpdator.java | 78 +- .../AiravataWorkflowNodeStatusUpdator.java | 83 +- .../core/monitor/GfacInternalStatusUpdator.java | 17 +- .../state/ExperimentStatusChangeRequest.java | 63 - .../state/ExperimentStatusChangedEvent.java | 63 + .../monitor/state/JobStatusChangedEvent.java | 80 + .../monitor/state/TaskStatusChangedEvent.java | 61 + .../state/WorkflowNodeStatusChangeRequest.java | 63 - .../state/WorkflowNodeStatusChangedEvent.java | 63 + .../core/notification/MonitorPublisher.java | 94 +- .../gfac/core/provider/AbstractProvider.java | 3 +- .../provider/AbstractRecoverableProvider.java | 2 +- .../gfac/services/impl/LocalProviderTest.java | 17 +- .../monitor/core/AiravataAbstractMonitor.java | 2 +- .../handlers/GridPushMonitorHandler.java | 13 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 29 +- .../monitor/impl/push/amqp/AMQPMonitor.java | 21 +- .../monitor/impl/push/amqp/BasicConsumer.java | 11 +- .../apache/airavata/job/AMQPMonitorTest.java | 21 +- .../job/QstatMonitorTestWithMyProxyAuth.java | 21 +- .../server/OrchestratorServerHandler.java | 2 +- .../orchestrator/core/ValidatorTest.java | 224 +-- .../registry/jpa/impl/AiravataJPARegistry.java | 94 +- .../registry/jpa/model/WorkflowNodeDetail.java | 2 +- modules/workflow-model/pom.xml | 6 +- modules/workflow-model/workflow-engine/pom.xml | 328 ++++ .../workflow/catalog/WorkflowCatalog.java | 53 + .../catalog/WorkflowCatalogException.java | 17 + .../catalog/WorkflowCatalogFactory.java | 33 + .../workflow/catalog/WorkflowCatalogImpl.java | 167 ++ .../workflow/engine/WorkflowEngine.java | 26 + .../engine/WorkflowEngineException.java | 17 + .../workflow/engine/WorkflowEngineFactory.java | 33 + .../workflow/engine/WorkflowEngineImpl.java | 77 + .../airavata/workflow/engine/WorkflowUtils.java | 56 + .../engine/concurrent/PredicatedExecutable.java | 33 + .../engine/concurrent/PredicatedTaskRunner.java | 153 ++ .../engine/core/amazon/AmazonCredential.java | 79 + .../engine/core/amazon/EC2InstanceResult.java | 95 ++ .../engine/core/generators/XmlBeansFiler.java | 71 + .../core/workflow/ParameterListModel.java | 88 ++ .../engine/datadriven/WorkflowHarvester.java | 191 +++ .../engine/file/XBayaPathConstants.java | 64 + .../engine/gfac/GFacRegistryClient.java | 169 ++ .../workflow/engine/gfac/SimpleWSClient.java | 134 ++ .../engine/globus/FileTransferConstants.java | 38 + .../globus/GridFTPFileTransferClient.java | 239 +++ .../engine/graph/controller/NodeController.java | 200 +++ .../engine/interpretor/DoWhileHandler.java | 249 +++ .../engine/interpretor/ExperimentTemplate.java | 37 + .../engine/interpretor/HeaderConstants.java | 33 + .../SSWorkflowInterpreterInteractorImpl.java | 115 ++ .../interpretor/SystemComponentInvoker.java | 114 ++ .../WorkFlowInterpreterException.java | 37 + .../interpretor/WorkflowExecutionMessage.java | 40 + .../interpretor/WorkflowExecutionTemplate.java | 51 + .../engine/interpretor/WorkflowInterpreter.java | 1457 ++++++++++++++++++ .../WorkflowInterpreterConfiguration.java | 78 + .../WorkflowInterpreterInteractor.java | 94 ++ .../interpretor/WorkflowInterpreterInvoker.java | 66 + .../WorkflowInterpreterSkeleton2.java | 498 ++++++ .../engine/invoker/AsynchronousInvoker.java | 118 ++ .../workflow/engine/invoker/DynamicInvoker.java | 167 ++ .../workflow/engine/invoker/Invoker.java | 105 ++ .../invoker/MsgBoxWsaResponsesCorrelator.java | 140 ++ .../workflow/engine/invoker/SimpleInvoker.java | 260 ++++ .../engine/invoker/WorkflowInputUtil.java | 52 + .../workflow/engine/util/AmazonUtil.java | 150 ++ .../airavata/workflow/engine/util/Data.java | 70 + .../workflow/engine/util/GOConstants.java | 30 + .../workflow/engine/util/GlobusOnlineUtils.java | 246 +++ .../workflow/engine/util/InterpreterUtil.java | 308 ++++ .../engine/util/ProxyMonitorPublisher.java | 62 + .../workflow/engine/util/RegistryConstants.java | 30 + .../workflow/engine/util/TransferFile.java | 170 ++ .../workflow/engine/util/XBayaUtil.java | 218 +++ .../workflow/WorkflowEngineException.java | 42 + .../engine/workflow/proxy/ProxyWSDL.java | 87 ++ .../engine/workflow/proxy/WorkflowClient.java | 35 + .../engine/workflow/proxy/WorkflowContext.java | 42 + .../workflow/proxy/WorkflowProxyException.java | 64 + .../src/main/resources/WorkflowInterpretor.wsdl | 72 + .../src/main/resources/images/airavata-2.png | Bin 0 -> 5582 bytes .../main/resources/images/airavata-config.png | Bin 0 -> 1297 bytes .../src/main/resources/images/airavata-icon.png | Bin 0 -> 584 bytes .../main/resources/images/airavata-icon2.png | Bin 0 -> 981 bytes .../src/main/resources/images/airavata-name.png | Bin 0 -> 8261 bytes .../resources/images/airavata-title-text.png | Bin 0 -> 16438 bytes .../src/main/resources/images/airavata.png | Bin 0 -> 17280 bytes .../src/main/resources/images/application.png | Bin 0 -> 894 bytes .../src/main/resources/images/applications.png | Bin 0 -> 657 bytes .../src/main/resources/images/closed.gif | Bin 0 -> 923 bytes .../src/main/resources/images/cloud.png | Bin 0 -> 573 bytes .../src/main/resources/images/experiment.png | Bin 0 -> 543 bytes .../src/main/resources/images/experiments.png | Bin 0 -> 1142 bytes .../src/main/resources/images/gfac_url.png | Bin 0 -> 739 bytes .../src/main/resources/images/gfac_urls.png | Bin 0 -> 816 bytes .../src/main/resources/images/host.png | Bin 0 -> 652 bytes .../src/main/resources/images/hosts.png | Bin 0 -> 671 bytes .../src/main/resources/images/input_para.png | Bin 0 -> 428 bytes .../src/main/resources/images/jcr-repo.png | Bin 0 -> 1010 bytes .../src/main/resources/images/leaf.gif | Bin 0 -> 906 bytes .../src/main/resources/images/menu/jcr.png | Bin 0 -> 1158 bytes .../src/main/resources/images/menu/new2.png | Bin 0 -> 1175 bytes .../src/main/resources/images/menu/open1.png | Bin 0 -> 925 bytes .../src/main/resources/images/menu/open2.png | Bin 0 -> 964 bytes .../src/main/resources/images/menu/open_dir.png | Bin 0 -> 749 bytes .../src/main/resources/images/menu/pause1.png | Bin 0 -> 1101 bytes .../resources/images/menu/pause_monitor1.png | Bin 0 -> 873 bytes .../src/main/resources/images/menu/play3.png | Bin 0 -> 1192 bytes .../src/main/resources/images/menu/play4.png | Bin 0 -> 765 bytes .../images/menu/resume_monitoring1.png | Bin 0 -> 957 bytes .../src/main/resources/images/menu/save1.png | Bin 0 -> 1200 bytes .../src/main/resources/images/menu/stop.png | Bin 0 -> 316 bytes .../src/main/resources/images/opened.gif | Bin 0 -> 917 bytes .../src/main/resources/images/output_para.png | Bin 0 -> 490 bytes .../src/main/resources/images/parameter.png | Bin 0 -> 544 bytes .../src/main/resources/images/pause.jpeg | Bin 0 -> 458 bytes .../src/main/resources/images/play.jpeg | Bin 0 -> 471 bytes .../src/main/resources/images/registry.png | Bin 0 -> 3419 bytes .../src/main/resources/images/service.png | Bin 0 -> 871 bytes .../src/main/resources/images/services.png | Bin 0 -> 899 bytes .../src/main/resources/images/step.gif | Bin 0 -> 211 bytes .../src/main/resources/images/stop.jpeg | Bin 0 -> 497 bytes .../src/main/resources/images/workflow.png | Bin 0 -> 601 bytes .../resources/images/workflow_templates.png | Bin 0 -> 710 bytes .../src/main/resources/images/workflows.png | Bin 0 -> 778 bytes .../src/main/resources/services.xml | 30 + .../resources/wsdls/TestCMD_Example1_AWSDL.xml | 56 + .../src/main/resources/wsdls/adder-awsdl.xml | 63 + .../src/main/resources/wsdls/eventing.wsdl | 332 ++++ .../interpreter/ComplexForEachWorkflowTest.java | 73 + .../xbaya/interpreter/ComplexMathService.java | 40 + .../interpreter/ComplexMathWorkflowTest.java | 71 + .../interpreter/CrossProductWorkflowTest.java | 71 + .../airavata/xbaya/interpreter/EchoService.java | 28 + .../xbaya/interpreter/ForEachWorkflowTest.java | 73 + .../interpreter/LevenshteinDistanceService.java | 48 + .../airavata/xbaya/interpreter/Listener.java | 31 + .../xbaya/interpreter/NotificationSender.java | 204 +++ .../xbaya/interpreter/RegistryServiceTest.java | 105 ++ .../interpreter/SimpleForEachWorkflowTest.java | 72 + .../interpreter/SimpleMathWorkflowTest.java | 73 + .../xbaya/interpreter/WorkflowTest.java | 74 + .../xbaya/interpreter/WorkflowTrackingTest.java | 105 ++ .../xbaya/interpreter/XBayaClientTest.java | 80 + .../interpreter/XBayaConsolidatedTestSuite.java | 67 + .../xbaya/interpreter/utils/ConfigKeys.java | 34 + .../xbaya/interpreter/utils/TestUtilServer.java | 243 +++ .../interpreter/utils/WorkflowTestUtils.java | 97 ++ .../workflow-engine/src/test/java/test.xwf | 251 +++ .../src/test/resources/axis2_default.xml | 278 ++++ .../workflow-model-component/pom.xml | 104 ++ .../registry/JCRComponentReference.java | 66 + .../registry/JCRComponentRegistry.java | 78 + .../workflow-model/workflow-model-core/pom.xml | 5 + .../component/system/SubWorkflowComponent.java | 2 +- .../component/web/WebComponentRegistry.java | 3 - .../model/component/ws/WSComponent.java | 332 +--- .../component/ws/WSComponentApplication.java | 207 +++ .../ws/WSComponentApplicationParameter.java | 81 + .../model/component/ws/WSComponentFactory.java | 108 +- .../model/component/ws/WSComponentPort.java | 24 +- .../model/component/ws/WSComponentRegistry.java | 5 +- .../model/component/ws/WorkflowComponent.java | 31 +- .../airavata/workflow/model/gpel/DSCUtil.java | 24 +- .../model/gpel/script/WorkflowWSDL.java | 5 +- .../workflow/model/graph/util/GraphUtil.java | 4 +- .../workflow/model/graph/ws/WSNode.java | 95 +- .../airavata/workflow/model/wf/Workflow.java | 146 +- modules/xbaya-gui/pom.xml | 5 + .../airavata/xbaya/XBayaConfiguration.java | 8 +- .../org/apache/airavata/xbaya/ui/XBayaGUI.java | 17 +- .../ui/dialogs/registry/RegistryWindow.java | 15 +- .../dialogs/workflow/WorkflowImportWindow.java | 265 ++++ .../ui/experiment/RegistrySearchResult.java | 17 +- .../RegistryWorkflowPublisherWindow.java | 41 +- .../WorkflowInterpreterLaunchWindow.java | 133 +- .../airavata/xbaya/ui/menues/XBayaMenuItem.java | 54 +- .../apache/airavata/xbaya/util/XBayaUtil.java | 3 +- pom.xml | 3 +- 206 files changed, 12983 insertions(+), 1456 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/dd7e6c75/airavata-api/thrift-interface-descriptions/experimentModel.thrift ----------------------------------------------------------------------
