You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/18 22:51:10 UTC
[03/17] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
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/ce04fb92
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ce04fb92
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ce04fb92
Branch: refs/heads/master
Commit: ce04fb92897c0a2535fcb4746e8ff327e946c19e
Parents: 6b1f4bd 8a6b891
Author: Supun Nakandala <sc...@apache.org>
Authored: Fri Jun 12 22:18:44 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Fri Jun 12 22:18:44 2015 +0530
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 2 +-
.../airavata/api/server/AiravataAPIServer.java | 5 -
.../api/server/handler/utils/ExpCatInit.java | 4 -
.../java/org/apache/airavata/api/Airavata.java | 5732 +++++++--
.../main/resources/lib/airavata/Airavata.cpp | 6263 +++++++---
.../src/main/resources/lib/airavata/Airavata.h | 10426 ++++++++++-------
.../lib/airavata/Airavata_server.skeleton.cpp | 1525 +++
.../resources/lib/Airavata/API/Airavata.php | 4951 +++++++-
.../resources/lib/Airavata/API/Error/Types.php | 122 +-
.../main/resources/lib/Airavata/API/Types.php | 24 +-
.../Model/AppCatalog/AppDeployment/Types.php | 130 +-
.../Model/AppCatalog/AppInterface/Types.php | 157 +-
.../Model/AppCatalog/ComputeResource/Types.php | 441 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 73 +-
.../Airavata/Model/Messaging/Event/Types.php | 136 +-
.../main/resources/lib/Airavata/Model/Types.php | 28 +-
.../Model/Workspace/Experiment/Types.php | 791 +-
.../lib/Airavata/Model/Workspace/Types.php | 47 +-
.../lib/apache/airavata/api/Airavata-remote | 537 +-
.../lib/apache/airavata/api/Airavata.py | 3561 ++++--
.../lib/apache/airavata/api/constants.py | 2 +-
.../lib/apache/airavata/api/error/constants.py | 2 +-
.../lib/apache/airavata/api/error/ttypes.py | 61 +-
.../resources/lib/apache/airavata/api/ttypes.py | 2 +-
.../model/appcatalog/appdeployment/constants.py | 2 +-
.../model/appcatalog/appdeployment/ttypes.py | 32 +-
.../model/appcatalog/appinterface/constants.py | 2 +-
.../model/appcatalog/appinterface/ttypes.py | 40 +-
.../appcatalog/computeresource/constants.py | 2 +-
.../model/appcatalog/computeresource/ttypes.py | 117 +-
.../appcatalog/gatewayprofile/constants.py | 2 +-
.../model/appcatalog/gatewayprofile/ttypes.py | 20 +-
.../lib/apache/airavata/model/constants.py | 2 +-
.../airavata/model/messaging/event/constants.py | 2 +-
.../airavata/model/messaging/event/ttypes.py | 100 +-
.../lib/apache/airavata/model/ttypes.py | 2 +-
.../apache/airavata/model/workflow/constants.py | 2 +-
.../apache/airavata/model/workflow/ttypes.py | 12 +-
.../airavata/model/workspace/constants.py | 2 +-
.../model/workspace/experiment/constants.py | 2 +-
.../model/workspace/experiment/ttypes.py | 405 +-
.../apache/airavata/model/workspace/ttypes.py | 33 +-
.../org/apache/airavata/model/Workflow.java | 92 +-
.../ApplicationDeploymentDescription.java | 187 +-
.../appdeployment/ApplicationModule.java | 35 +-
.../ApplicationParallelismType.java | 4 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 23 +-
.../ApplicationInterfaceDescription.java | 101 +-
.../model/appcatalog/appinterface/DataType.java | 4 +-
.../appinterface/InputDataObjectType.java | 74 +-
.../appinterface/OutputDataObjectType.java | 64 +-
.../appcatalog/computeresource/BatchQueue.java | 50 +-
.../computeresource/CloudJobSubmission.java | 51 +-
.../ComputeResourceDescription.java | 181 +-
.../computeresource/DataMovementInterface.java | 32 +-
.../computeresource/DataMovementProtocol.java | 4 +-
.../appcatalog/computeresource/FileSystems.java | 4 +-
.../computeresource/GlobusJobSubmission.java | 50 +-
.../computeresource/GridFTPDataMovement.java | 48 +-
.../computeresource/JobManagerCommand.java | 4 +-
.../computeresource/JobSubmissionInterface.java | 32 +-
.../computeresource/JobSubmissionProtocol.java | 4 +-
.../computeresource/LOCALDataMovement.java | 18 +-
.../computeresource/LOCALSubmission.java | 23 +-
.../appcatalog/computeresource/MonitorMode.java | 4 +-
.../computeresource/ProviderName.java | 4 +-
.../computeresource/ResourceJobManager.java | 68 +-
.../computeresource/ResourceJobManagerType.java | 4 +-
.../computeresource/SCPDataMovement.java | 39 +-
.../computeresource/SSHJobSubmission.java | 53 +-
.../computeresource/SecurityProtocol.java | 4 +-
.../computeresource/UnicoreDataMovement.java | 32 +-
.../computeresource/UnicoreJobSubmission.java | 32 +-
.../ComputeResourcePreference.java | 55 +-
.../gatewayprofile/GatewayResourceProfile.java | 45 +-
.../model/error/AiravataClientException.java | 29 +-
.../airavata/model/error/AiravataErrorType.java | 4 +-
.../model/error/AiravataSystemException.java | 29 +-
.../model/error/AuthenticationException.java | 18 +-
.../model/error/AuthorizationException.java | 18 +-
.../error/ExperimentNotFoundException.java | 18 +-
.../model/error/InvalidRequestException.java | 18 +-
.../model/error/LaunchValidationException.java | 25 +-
.../model/error/ProjectNotFoundException.java | 18 +-
.../airavata/model/error/TimedOutException.java | 13 +-
.../airavata/model/error/ValidationResults.java | 43 +-
.../airavata/model/error/ValidatorResult.java | 25 +-
.../event/ExperimentStatusChangeEvent.java | 28 +-
.../model/messaging/event/JobIdentifier.java | 38 +-
.../messaging/event/JobStatusChangeEvent.java | 23 +-
.../event/JobStatusChangeRequestEvent.java | 23 +-
.../airavata/model/messaging/event/Message.java | 57 +-
.../model/messaging/event/MessageLevel.java | 4 +-
.../model/messaging/event/MessageType.java | 4 +-
.../messaging/event/ProcessSubmitEvent.java | 23 +-
.../model/messaging/event/TaskIdentifier.java | 33 +-
.../messaging/event/TaskOutputChangeEvent.java | 43 +-
.../messaging/event/TaskStatusChangeEvent.java | 23 +-
.../event/TaskStatusChangeRequestEvent.java | 23 +-
.../model/messaging/event/TaskSubmitEvent.java | 33 +-
.../messaging/event/TaskTerminateEvent.java | 33 +-
.../messaging/event/WorkflowIdentifier.java | 28 +-
.../event/WorkflowNodeStatusChangeEvent.java | 23 +-
.../airavata/model/security/AuthzToken.java | 49 +-
.../airavata/model/workspace/Gateway.java | 35 +-
.../apache/airavata/model/workspace/Group.java | 25 +-
.../airavata/model/workspace/Project.java | 82 +-
.../apache/airavata/model/workspace/User.java | 45 +-
.../workspace/experiment/ActionableGroup.java | 4 +-
.../experiment/AdvancedInputDataHandling.java | 35 +-
.../experiment/AdvancedOutputDataHandling.java | 30 +-
.../workspace/experiment/ApplicationStatus.java | 25 +-
.../ComputationalResourceScheduling.java | 65 +-
.../workspace/experiment/CorrectiveAction.java | 4 +-
.../experiment/DataTransferDetails.java | 35 +-
.../workspace/experiment/ErrorCategory.java | 4 +-
.../workspace/experiment/ErrorDetails.java | 88 +-
.../workspace/experiment/ExecutionUnit.java | 4 +-
.../model/workspace/experiment/Experiment.java | 236 +-
.../experiment/ExperimentSearchFields.java | 4 +-
.../workspace/experiment/ExperimentState.java | 4 +-
.../experiment/ExperimentStatistics.java | 250 +-
.../workspace/experiment/ExperimentStatus.java | 29 +-
.../workspace/experiment/ExperimentSummary.java | 55 +-
.../model/workspace/experiment/JobDetails.java | 80 +-
.../model/workspace/experiment/JobState.java | 4 +-
.../model/workspace/experiment/JobStatus.java | 29 +-
.../experiment/QualityOfServiceParams.java | 30 +-
.../model/workspace/experiment/TaskDetails.java | 211 +-
.../model/workspace/experiment/TaskState.java | 4 +-
.../model/workspace/experiment/TaskStatus.java | 29 +-
.../workspace/experiment/TransferState.java | 4 +-
.../workspace/experiment/TransferStatus.java | 29 +-
.../experiment/UserConfigurationData.java | 65 +-
.../workspace/experiment/ValidationResults.java | 43 +-
.../workspace/experiment/ValidatorResult.java | 25 +-
.../experiment/WorkflowNodeDetails.java | 149 +-
.../workspace/experiment/WorkflowNodeState.java | 4 +-
.../experiment/WorkflowNodeStatus.java | 29 +-
distribution/pom.xml | 4 +-
modules/commons/pom.xml | 122 +-
.../airavata/common/context/RequestContext.java | 56 +
.../common/context/WorkflowContext.java | 86 +
.../AiravataConfigurationException.java | 37 +
.../common/exception/AiravataException.java | 37 +
.../exception/AiravataStratupException.java | 9 +
.../exception/ApplicationSettingsException.java | 35 +
.../airavata/common/logger/AiravataLogger.java | 677 ++
.../common/logger/AiravataLoggerFactory.java | 34 +
.../common/logger/AiravataLoggerImpl.java | 323 +
.../airavata/common/utils/AiravataJobState.java | 117 +
.../airavata/common/utils/AiravataUtils.java | 47 +
.../airavata/common/utils/AiravataZKUtils.java | 205 +
.../common/utils/ApplicationSettings.java | 441 +
.../airavata/common/utils/BrowserLauncher.java | 98 +
.../airavata/common/utils/ClientSettings.java | 27 +
.../apache/airavata/common/utils/Constants.java | 66 +
.../apache/airavata/common/utils/DBUtil.java | 334 +
.../common/utils/DatabaseTestCases.java | 123 +
.../utils/DefaultKeyStorePasswordCallback.java | 55 +
.../apache/airavata/common/utils/DerbyUtil.java | 114 +
.../airavata/common/utils/ExecutionMode.java | 28 +
.../apache/airavata/common/utils/IOUtil.java | 209 +
.../apache/airavata/common/utils/IServer.java | 51 +
.../apache/airavata/common/utils/JSONUtil.java | 158 +
.../common/utils/KeyStorePasswordCallback.java | 50 +
.../airavata/common/utils/MonitorPublisher.java | 47 +
.../airavata/common/utils/NameValidator.java | 70 +
.../org/apache/airavata/common/utils/Pair.java | 79 +
.../airavata/common/utils/SecurityUtil.java | 180 +
.../airavata/common/utils/ServerSettings.java | 270 +
.../airavata/common/utils/ServiceUtils.java | 93 +
.../airavata/common/utils/StringUtil.java | 480 +
.../apache/airavata/common/utils/SwingUtil.java | 358 +
.../airavata/common/utils/ThriftUtils.java | 37 +
.../apache/airavata/common/utils/Version.java | 120 +
.../airavata/common/utils/WSConstants.java | 187 +
.../apache/airavata/common/utils/WSDLUtil.java | 545 +
.../apache/airavata/common/utils/XMLUtil.java | 586 +
.../airavata/common/utils/XmlFormatter.java | 82 +
.../listener/AbstractActivityListener.java | 27 +
.../listener/AbstractStateChangeRequest.java | 27 +
.../common/utils/listener/PublisherMessage.java | 26 +
.../common/utils/ApplicationSettingsTest.java | 43 +
.../airavata/common/utils/SecurityUtilTest.java | 104 +
.../airavata/common/utils/XMLUtilTest.java | 56 +
.../commons/src/test/resources/mykeystore.jks | Bin 0 -> 498 bytes
modules/commons/utils/pom.xml | 150 -
.../airavata/common/context/RequestContext.java | 56 -
.../common/context/WorkflowContext.java | 86 -
.../AiravataConfigurationException.java | 37 -
.../common/exception/AiravataException.java | 37 -
.../exception/ApplicationSettingsException.java | 35 -
.../ApplicationSettingsLoadException.java | 38 -
.../ApplicationSettingsStoreException.java | 34 -
.../exception/LazyLoadedDataException.java | 30 -
...UnspecifiedApplicationSettingsException.java | 30 -
.../common/exception/UtilsException.java | 61 -
.../airavata/common/logger/AiravataLogger.java | 677 --
.../common/logger/AiravataLoggerFactory.java | 34 -
.../common/logger/AiravataLoggerImpl.java | 323 -
.../airavata/common/utils/AiravataJobState.java | 117 -
.../airavata/common/utils/AiravataUtils.java | 47 -
.../airavata/common/utils/AiravataZKUtils.java | 205 -
.../common/utils/ApplicationSettings.java | 444 -
.../airavata/common/utils/BrowserLauncher.java | 98 -
.../airavata/common/utils/ClientSettings.java | 27 -
.../apache/airavata/common/utils/Constants.java | 66 -
.../apache/airavata/common/utils/DBUtil.java | 334 -
.../common/utils/DatabaseTestCases.java | 123 -
.../utils/DefaultKeyStorePasswordCallback.java | 55 -
.../apache/airavata/common/utils/DerbyUtil.java | 114 -
.../airavata/common/utils/ExecutionMode.java | 28 -
.../apache/airavata/common/utils/IOUtil.java | 209 -
.../apache/airavata/common/utils/IServer.java | 51 -
.../apache/airavata/common/utils/JSONUtil.java | 160 -
.../common/utils/KeyStorePasswordCallback.java | 50 -
.../airavata/common/utils/MonitorPublisher.java | 47 -
.../airavata/common/utils/NameValidator.java | 70 -
.../org/apache/airavata/common/utils/Pair.java | 79 -
.../airavata/common/utils/SecurityUtil.java | 181 -
.../airavata/common/utils/ServerSettings.java | 270 -
.../airavata/common/utils/ServiceUtils.java | 93 -
.../airavata/common/utils/StringUtil.java | 480 -
.../apache/airavata/common/utils/SwingUtil.java | 361 -
.../airavata/common/utils/ThriftUtils.java | 37 -
.../apache/airavata/common/utils/Version.java | 120 -
.../airavata/common/utils/WSConstants.java | 187 -
.../apache/airavata/common/utils/WSDLUtil.java | 553 -
.../apache/airavata/common/utils/XMLUtil.java | 586 -
.../airavata/common/utils/XmlFormatter.java | 82 -
.../listener/AbstractActivityListener.java | 27 -
.../listener/AbstractStateChangeRequest.java | 27 -
.../common/utils/listener/PublisherMessage.java | 26 -
.../common/utils/ApplicationSettingsTest.java | 43 -
.../airavata/common/utils/SecurityUtilTest.java | 104 -
.../airavata/common/utils/XMLUtilTest.java | 56 -
.../utils/src/test/resources/mykeystore.jks | Bin 498 -> 0 bytes
.../credential-store-service/pom.xml | 2 +-
.../store/notifier/NotifierBootstrap.java | 1 -
.../store/server/CredentialStoreServer.java | 1 -
.../credential-store-stubs/pom.xml | 2 +-
.../credential-store-webapp/pom.xml | 2 +-
.../cs-thrift-descriptions/generate-cs-stubs.sh | 2 +-
.../apache/airavata/gfac/core/RequestData.java | 1 -
.../apache/airavata/gfac/impl/OutputUtils.java | 1 -
.../gfac/monitor/email/EmailMonitorFactory.java | 2 -
.../gfac/ssh/provider/impl/SSHProvider.java | 1 -
modules/gfac/gfac-service/pom.xml | 2 +-
.../airavata/gfac/server/GfacServerHandler.java | 1 +
modules/messaging/core/pom.xml | 2 +-
.../airavata/messaging/core/Publisher.java | 1 -
.../core/impl/RabbitMQTaskLaunchPublisher.java | 1 -
modules/orchestrator/orchestrator-core/pom.xml | 2 +-
modules/registry/registry-core/pom.xml | 2 +-
modules/registry/registry-cpi/pom.xml | 2 +-
modules/security/pom.xml | 2 +-
.../userstore/SessionDBUserStoreTest.java | 2 -
modules/server/pom.xml | 2 +-
.../org/apache/airavata/server/ServerMain.java | 4 -
.../test-suite/multi-tenanted-airavata/pom.xml | 2 +-
modules/workflow-model/workflow-engine/pom.xml | 2 +-
.../workflow/engine/invoker/SimpleInvoker.java | 3 -
.../workflow/engine/util/InterpreterUtil.java | 10 -
.../workflow/engine/util/XBayaUtil.java | 5 -
.../workflow-model-component/pom.xml | 2 +-
.../workflow-model/workflow-model-core/pom.xml | 2 +-
.../amazon/InstanceComponentDataPort.java | 2 -
.../component/dynamic/DynamicComponentPort.java | 2 -
.../component/url/URLComponentRegistry.java | 1 -
.../component/web/WebComponentRegistry.java | 1 -
.../component/ws/WSComponentApplication.java | 2 -
.../model/component/ws/WSComponentPort.java | 2 -
.../model/component/ws/WSComponentRegistry.java | 2 -
.../exceptions/LazyLoadedDataException.java | 32 +
.../model/exceptions/UtilsException.java | 61 +
.../airavata/workflow/model/gpel/DSCUtil.java | 12 -
.../workflow/model/gpel/script/BPELScript.java | 13 -
.../model/gpel/script/WorkflowWSDL.java | 18 +-
.../workflow/model/graph/impl/EdgeImpl.java | 1 -
.../workflow/model/graph/impl/PortImpl.java | 1 -
.../model/graph/system/ConstantNode.java | 2 -
.../model/graph/system/DifferedInputNode.java | 2 -
.../model/graph/system/EndBlockNode.java | 2 -
.../model/graph/system/EndDoWhileNode.java | 2 -
.../model/graph/system/EndForEachNode.java | 2 -
.../workflow/model/graph/system/EndifNode.java | 2 -
.../model/graph/system/ForEachNode.java | 2 -
.../workflow/model/graph/system/InputNode.java | 2 -
.../model/graph/system/ParameterNode.java | 9 +-
.../model/graph/system/S3InputNode.java | 2 -
.../model/graph/system/SystemDataPort.java | 2 -
.../workflow/model/graph/system/SystemNode.java | 2 -
.../workflow/model/graph/ws/WSGraphFactory.java | 1 -
.../workflow/model/graph/ws/WSPort.java | 2 -
.../workflow/model/wf/TridentTransformer.java | 6 -
.../airavata/workflow/model/wf/Workflow.java | 11 +-
.../workflow/model/wf/WorkflowData.java | 3 +-
modules/xbaya-gui/pom.xml | 2 +-
.../xbaya/core/generators/BPELFiler.java | 6 -
.../xbaya/core/generators/ODEScriptFiler.java | 11 -
.../StandaloneNotificationSender.java | 2 -
.../airavata/xbaya/messaging/EventData.java | 3 -
.../xbaya/modifier/WorkflowModifier.java | 6 -
.../org/apache/airavata/xbaya/ui/XBayaGUI.java | 1 -
.../system/ConstantConfigurationDialog.java | 1 -
.../DifferedInputConfigurationDialog.java | 1 -
.../graph/system/InputConfigurationDialog.java | 2 -
.../graph/system/OutputConfigurationDialog.java | 1 -
.../xbaya/ui/dialogs/graph/ws/WSNodeWindow.java | 2 -
.../dialogs/workflow/WorkflowImportWindow.java | 2 -
.../workflow/WorkflowPropertyWindow.java | 5 -
.../RegistryWorkflowPublisherWindow.java | 7 -
.../WorkflowInterpreterLaunchWindow.java | 1 -
.../airavata/xbaya/ui/graph/GraphCanvas.java | 2 -
.../airavata/xbaya/ui/widgets/XBayaToolBar.java | 4 -
.../apache/airavata/xbaya/util/XBayaUtil.java | 15 -
pom.xml | 2 +-
.../airavata-api/airavata-api.thrift | 2079 ----
.../airavata-api/airavata-data-models.thrift | 38 -
.../airavata-api/airavata-errors.thrift | 172 -
.../airavata-api/airavata_api.thrift | 2079 ++++
.../airavata-api/airavata_data_models.thrift | 38 +
.../airavata-api/airavata_errors.thrift | 172 +
.../airavata-api/app-catalog-models.thrift | 24 -
.../airavata-api/app_catalog_models.thrift | 24 +
.../application-deployment-model.thrift | 132 -
.../application-interface-model.thrift | 146 -
.../application_deployment_model.thrift | 132 +
.../application_interface_model.thrift | 146 +
.../airavata-api/compute-resource-model.thrift | 445 -
.../airavata-api/compute_resource_model.thrift | 445 +
.../airavata-api/experiment-model.thrift | 422 -
.../airavata-api/experiment_model.thrift | 422 +
.../gateway-resource-profile-model.thrift | 83 -
.../gateway_resource_profile_model.thrift | 83 +
.../airavata-api/messaging-events.thrift | 149 -
.../airavata-api/messaging_events.thrift | 149 +
.../airavata-api/security-model.thrift | 35 -
.../airavata-api/security_model.thrift | 35 +
.../airavata-api/workflow-api.thrift | 82 -
.../airavata-api/workflow-data-model.thrift | 43 -
.../airavata-api/workflow_api.thrift | 82 +
.../airavata-api/workflow_data_model.thrift | 43 +
.../airavata-api/workspace-model.thrift | 63 -
.../airavata-api/workspace_model.thrift | 63 +
.../airavata_commons.thrift | 35 +
.../application_io_models.thrift | 118 +
.../airavata-data-models/process_model.thrift | 55 +
.../scheduling_model.thrift | 39 +
.../airavata-data-models/status_models.thrift | 56 +
.../airavata-data-models/task_model.thrift | 75 +
.../generate-thrift-stubs.sh | 30 +-
.../gfac-cpi/generate-gfac-stubs.sh | 2 +-
.../generate-orchestrator-stubs.sh | 2 +-
.../orchestrator.cpi.service.thrift | 4 +-
356 files changed, 42993 insertions(+), 19504 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce04fb92/distribution/pom.xml
----------------------------------------------------------------------