You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2018/10/31 15:05:54 UTC

[airavata] 02/04: Merge branch 'develop' of https://github.com/apache/airavata into develop

This is an automated email from the ASF dual-hosted git repository.

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit b4ab27e1ce71538cd561e1c56f677c79fff2d5f1
Merge: f40f462 71518b8
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Tue Oct 30 16:32:16 2018 -0400

    Merge branch 'develop' of https://github.com/apache/airavata into develop

 .../{DagElement.java => ParserDagElement.java}     | 318 +++++++++++++++++----
 ...pping.java => ParserDagInputOutputMapping.java} | 272 +++++++++++++++---
 .../model/appcatalog/parser/ParserInput.java       | 104 ++++++-
 .../model/appcatalog/parser/ParserOutput.java      | 104 ++++++-
 .../model/appcatalog/parser/ParsingTemplate.java   |  40 +--
 .../appcatalog/parser/ParsingTemplateInput.java    | 218 +++++++++++++-
 .../helix/impl/task/parsing/DataParsingTask.java   | 164 ++++++++---
 .../task/parsing/models/ParsingTaskInputs.java     |  16 +-
 .../task/parsing/models/ParsingTaskOutputs.java    |  16 +-
 .../helix/impl/workflow/ParserWorkflowManager.java |  61 ++--
 .../helix/impl/workflow/WorkflowManager.java       |   6 +-
 .../apache/airavata/helix/core/AbstractTask.java   |   2 +-
 .../apache/airavata/helix/core/util/TaskUtil.java  |  13 +-
 .../appcatalog/ParserDagElementEntity.java         | 124 ++++++++
 .../ParserDagInputOutputMappingEntity.java         | 111 +++++++
 .../core/entities/appcatalog/ParserInfoEntity.java | 111 +++++++
 .../entities/appcatalog/ParserInputEntity.java     |  87 ++++++
 .../entities/appcatalog/ParserOutputEntity.java    |  87 ++++++
 .../entities/appcatalog/ParsingTemplateEntity.java |  78 +++++
 .../appcatalog/ParsingTemplateInputEntity.java     |  99 +++++++
 .../appcatalog/ParserDagElementRepository.java     |  11 +
 .../ParserDagInputOutputMappingRepository.java     |  11 +
 .../appcatalog/ParserInfoRepository.java           |  11 +
 .../appcatalog/ParserInputRepository.java          |  11 +
 .../appcatalog/ParserOutputRepository.java         |  11 +
 .../appcatalog/ParsingTemplateInputRepository.java |  11 +
 .../appcatalog/ParsingTemplateRepository.java      |  11 +
 .../src/main/resources/META-INF/persistence.xml    |   7 +
 .../src/main/resources/appcatalog-derby.sql        |  72 +++++
 .../src/main/resources/appcatalog-mysql.sql        |  72 +++++
 .../api/service/handler/RegistryServerHandler.java | 117 +++-----
 .../airavata/registry/api/RegistryService.java     | 146 +++++-----
 .../component-cpis/registry-api.thrift             |   2 +-
 .../app-catalog-models/parser_model.thrift         |  29 +-
 34 files changed, 2200 insertions(+), 353 deletions(-)