[airavata-mft] branch master updated (d49cff3 -> 9049a3e)

[di...@apache.org]

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

dimuthuupe pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git


    from d49cff3  Merge pull request #68 from Jayancv/feature/GCS_python_cli_integration
     new 744dc0c  single-service(api-service, resource-service, and secret-service) implementation
     new 2d98cc1  include distribution functionality for single-service
     new 9049a3e  Merge pull request #67 from lahirujayathilake/master

The 334 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../airavata/mft/api/ApiServiceApplication.java    |  4 +-
 .../org/apache/airavata/mft/api/AppConfig.java     |  2 +-
 .../airavata/mft/api/handler/MFTApiHandler.java    |  4 +-
 ...operties => api-service-application.properties} |  0
 ...operties => api-service-application.properties} |  0
 .../apache/airavata/mft/admin/MFTConsulClient.java |  6 +-
 pom.xml                                            |  1 +
 .../assembly/resource-service-bin-assembly.xml     |  2 +-
 .../airavata/mft/resource/server/AppConfig.java    |  2 +-
 .../server/ResourceServiceApplication.java         |  4 +-
 .../mft/resource/server/XmlConfiguration.java      |  4 +-
 .../server/backend/sql/SQLResourceBackend.java     |  2 +
 .../sql/repository/FTPStorageRepository.java       |  2 +
 .../sql/repository/GCSStorageRepository.java       |  2 +
 .../sql/repository/GenericResourceRepository.java  |  8 ++-
 .../sql/repository/LocalStorageRepository.java     |  2 +
 .../sql/repository/ODataStorageRepository.java     |  2 +
 .../sql/repository/ResolveStorageRepository.java   |  8 ++-
 .../sql/repository/S3StorageRepository.java        |  2 +
 .../sql/repository/SCPStorageRepository.java       |  2 +
 .../sql/repository/StorageSecretRepository.java    |  6 +-
 .../sql/repository/SwiftStorageRepository.java     |  2 +
 .../server/handler/AzureServiceHandler.java        |  3 +-
 .../resource/server/handler/BoxServiceHandler.java |  3 +-
 .../server/handler/DropboxServiceHandler.java      |  3 +-
 .../resource/server/handler/FTPServiceHandler.java |  4 +-
 .../resource/server/handler/GCSServiceHandler.java |  3 +-
 .../server/handler/LocalServiceHandler.java        |  4 +-
 .../server/handler/ODataServiceHandler.java        |  2 +
 .../resource/server/handler/S3ServiceHandler.java  |  3 +-
 .../resource/server/handler/SCPServiceHandler.java |  4 +-
 .../handler/StorageCommonServiceHandler.java       |  4 +-
 .../server/handler/SwiftStorageHandler.java        |  2 +
 ...ies => resource-service-application.properties} |  0
 ...ies => resource-service-application.properties} |  0
 .../main/assembly/secret-service-bin-assembly.xml  |  2 +-
 .../airavata/mft/secret/server/AppConfig.java      |  2 +-
 .../secret/server/SecretServiceApplication.java    |  8 ++-
 .../mft/secret/server/XmlConfiguration.java        |  4 +-
 .../server/backend/sql/SQLSecretBackend.java       |  2 +
 .../sql/repository/FTPSecretRepository.java        |  2 +
 .../sql/repository/GCSSecretRepository.java        |  2 +
 .../sql/repository/ODataSecretRepository.java      |  2 +
 .../backend/sql/repository/S3SecretRepository.java |  3 +-
 .../sql/repository/SCPSecretRepository.java        |  2 +
 .../secret/server/handler/AzureServiceHandler.java |  3 +-
 .../secret/server/handler/BoxServiceHandler.java   |  3 +-
 .../server/handler/DropboxServiceHandler.java      |  3 +-
 .../secret/server/handler/FTPServiceHandler.java   |  3 +-
 .../secret/server/handler/GCSServiceHandler.java   |  3 +-
 .../secret/server/handler/ODataServiceHandler.java |  2 +
 .../secret/server/handler/S3ServiceHandler.java    |  3 +-
 .../secret/server/handler/SCPServiceHandler.java   |  3 +-
 .../secret/server/handler/SwiftServiceHandler.java |  2 +
 ...rties => secret-service-application.properties} |  0
 ...rties => secret-service-application.properties} |  0
 .../server => single-service}/pom.xml              | 71 +++++++++++++---------
 .../main/assembly/single-service-bin-assembly.xml  | 14 ++++-
 .../airavata/mft/singleservice}/AppConfig.java     | 15 ++++-
 .../singleservice/SingleServiceApplication.java    | 25 ++++++++
 .../src/main/resources}/application.properties     |  4 +-
 .../distribution/conf/application.properties       |  4 +-
 .../main/resources/distribution/conf/log4j2.xml    |  2 +-
 .../src/main/resources}/log4j2.xml                 |  2 +-
 64 files changed, 207 insertions(+), 86 deletions(-)
 rename api/service/src/main/resources/{application.properties => api-service-application.properties} (100%)
 rename api/service/src/main/resources/distribution/conf/{application.properties => api-service-application.properties} (100%)
 rename services/resource-service/server/src/main/resources/distribution/conf/{application.properties => resource-service-application.properties} (100%)
 rename services/resource-service/server/src/main/resources/{application.properties => resource-service-application.properties} (100%)
 rename services/secret-service/server/src/main/resources/distribution/conf/{application.properties => secret-service-application.properties} (100%)
 rename services/secret-service/server/src/main/resources/{application.properties => secret-service-application.properties} (100%)
 copy {services/resource-service/server => single-service}/pom.xml (71%)
 copy services/resource-service/server/src/main/assembly/resource-service-bin-assembly.xml => single-service/src/main/assembly/single-service-bin-assembly.xml (82%)
 copy {services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server => single-service/src/main/java/org/apache/airavata/mft/singleservice}/AppConfig.java (63%)
 create mode 100644 single-service/src/main/java/org/apache/airavata/mft/singleservice/SingleServiceApplication.java
 copy {controller/src/main/resources/distribution/conf => single-service/src/main/resources}/application.properties (94%)
 copy {controller => single-service}/src/main/resources/distribution/conf/application.properties (94%)
 copy {api/service => single-service}/src/main/resources/distribution/conf/log4j2.xml (94%)
 copy {api/service/src/main/resources/distribution/conf => single-service/src/main/resources}/log4j2.xml (94%)