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 514cf87f5c1c96b515ee2f0c07cc91831eb1eafe
Merge: b4ab27e 3ba041d
Author: Eroma Abeysinghe <eroma.abeysin...@gmail.com>
AuthorDate: Wed Oct 31 10:20:57 2018 -0400
Merge branch 'develop' of https://github.com/apache/airavata into develop
.../airavata/model/appcatalog/parser/IOType.java | 62 ++++
.../parser/{ParserInfo.java => Parser.java} | 54 +--
...{ParserDagElement.java => ParserConnector.java} | 202 +++++------
...emplateInput.java => ParserConnectorInput.java} | 383 +++++++++++++--------
...tputMapping.java => ParserDagInputMapping.java} | 283 ++++++++++-----
.../model/appcatalog/parser/ParserInput.java | 326 ++++++++++++------
.../model/appcatalog/parser/ParserOutput.java | 326 ++++++++++++------
.../model/appcatalog/parser/ParsingTemplate.java | 148 ++++----
.../appcatalog/parser/ParsingTemplateInput.java | 229 ++++++++----
.../helix/impl/task/parsing/DataParsingTask.java | 39 +--
.../helix/impl/workflow/ParserWorkflowManager.java | 58 ++--
...ementEntity.java => ParserConnectorEntity.java} | 60 ++--
...Entity.java => ParserConnectorInputEntity.java} | 55 +--
.../{ParserInfoEntity.java => ParserEntity.java} | 10 +-
.../entities/appcatalog/ParserInputEntity.java | 47 ++-
.../entities/appcatalog/ParserOutputEntity.java | 47 ++-
.../entities/appcatalog/ParsingTemplateEntity.java | 12 +-
.../appcatalog/ParsingTemplateInputEntity.java | 23 +-
.../appcatalog/ParserDagElementRepository.java | 11 -
.../ParserDagInputOutputMappingRepository.java | 11 -
.../appcatalog/ParserInfoRepository.java | 11 -
.../appcatalog/ParserInputRepository.java | 11 -
.../appcatalog/ParserOutputRepository.java | 11 -
.../repositories/appcatalog/ParserRepository.java | 11 +
.../appcatalog/ParsingTemplateInputRepository.java | 11 -
.../src/main/resources/META-INF/persistence.xml | 6 +-
.../src/main/resources/appcatalog-derby.sql | 46 +--
.../src/main/resources/appcatalog-mysql.sql | 46 +--
.../api/service/handler/RegistryServerHandler.java | 15 +-
.../airavata/registry/api/RegistryService.java | 76 ++--
.../component-cpis/registry-api.thrift | 4 +-
.../app-catalog-models/parser_model.thrift | 35 +-
32 files changed, 1640 insertions(+), 1029 deletions(-)
