This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch revert-67-master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
commit 6b39b8871d88fcad8c1cff1cefdbda978d9d3904 Author: Dimuthu Wannipurage <[email protected]> AuthorDate: Tue Jan 10 20:38:26 2023 -0500 Revert "single-service Implementation" --- .../airavata/mft/api/ApiServiceApplication.java | 4 +- .../org/apache/airavata/mft/api/AppConfig.java | 2 +- .../airavata/mft/api/handler/MFTApiHandler.java | 4 +- ...plication.properties => application.properties} | 0 ...plication.properties => 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 - ...plication.properties => application.properties} | 0 ...plication.properties => 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 - ...plication.properties => application.properties} | 0 ...plication.properties => application.properties} | 0 single-service/pom.xml | 140 --------------------- .../main/assembly/single-service-bin-assembly.xml | 102 --------------- .../airavata/mft/singleservice/AppConfig.java | 36 ------ .../singleservice/SingleServiceApplication.java | 25 ---- .../src/main/resources/application.properties | 18 --- .../distribution/conf/application.properties | 18 --- .../main/resources/distribution/conf/log4j2.xml | 53 -------- single-service/src/main/resources/log4j2.xml | 53 -------- 64 files changed, 47 insertions(+), 554 deletions(-) diff --git a/api/service/src/main/java/org/apache/airavata/mft/api/ApiServiceApplication.java b/api/service/src/main/java/org/apache/airavata/mft/api/ApiServiceApplication.java index e4ac500..d88a331 100644 --- a/api/service/src/main/java/org/apache/airavata/mft/api/ApiServiceApplication.java +++ b/api/service/src/main/java/org/apache/airavata/mft/api/ApiServiceApplication.java @@ -21,13 +21,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.PropertySource; @SpringBootApplication @ComponentScan(basePackages = {"org.apache.airavata.mft"}) -@PropertySource(value = "classpath:api-service-application.properties") public class ApiServiceApplication { - public static void main(String[] args) { + public static void main(String args[]) { SpringApplication app = new SpringApplication(ApiServiceApplication.class); app.setWebApplicationType(WebApplicationType.NONE); app.run(args); diff --git a/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java b/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java index 2ae199b..934e7fa 100644 --- a/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java +++ b/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java @@ -23,7 +23,7 @@ import org.dozer.DozerBeanMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration("ASAppConfig") +@Configuration public class AppConfig { @org.springframework.beans.factory.annotation.Value("${consul.host}") diff --git a/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java b/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java index f8533a8..7230619 100644 --- a/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java +++ b/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java @@ -72,18 +72,18 @@ import org.apache.airavata.mft.resource.stubs.swift.storage.SwiftStorage; import org.apache.airavata.mft.resource.stubs.swift.storage.SwiftStorageGetRequest; import org.apache.airavata.mft.secret.client.SecretServiceClient; import org.apache.airavata.mft.secret.client.SecretServiceClientBuilder; +import org.apache.commons.lang3.tuple.Pair; import org.dozer.DozerBeanMapper; import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.ComponentScan; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; @GRpcService -@ComponentScan(basePackages = {"org.apache.airavata.mft.admin"}) public class MFTApiHandler extends MFTTransferServiceGrpc.MFTTransferServiceImplBase { private static final Logger logger = LoggerFactory.getLogger(MFTApiHandler.class); diff --git a/api/service/src/main/resources/api-service-application.properties b/api/service/src/main/resources/application.properties similarity index 100% rename from api/service/src/main/resources/api-service-application.properties rename to api/service/src/main/resources/application.properties diff --git a/api/service/src/main/resources/distribution/conf/api-service-application.properties b/api/service/src/main/resources/distribution/conf/application.properties similarity index 100% rename from api/service/src/main/resources/distribution/conf/api-service-application.properties rename to api/service/src/main/resources/distribution/conf/application.properties diff --git a/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java b/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java index 470a554..ef2bd76 100644 --- a/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java +++ b/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java @@ -37,13 +37,13 @@ import org.apache.airavata.mft.agent.stub.EndpointPaths; import org.apache.airavata.mft.api.service.TransferApiRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; import org.springframework.util.DigestUtils; import java.io.IOException; import java.util.*; import java.util.stream.Collectors; +import static com.google.common.net.HostAndPort.*; import static com.google.common.net.HostAndPort.fromParts; /* @@ -53,7 +53,6 @@ import static com.google.common.net.HostAndPort.fromParts; mft/transfer/state/{transfer-id} -> transfer state */ -@Component public class MFTConsulClient { private static final Logger logger = LoggerFactory.getLogger(MFTConsulClient.class); @@ -112,9 +111,6 @@ public class MFTConsulClient { this.sessionClient = client.sessionClient(); } - public MFTConsulClient() { - } - public String submitTransfer(TransferApiRequest transferRequest) throws MFTConsulClientException { try { String transferId = UUID.randomUUID().toString(); diff --git a/pom.xml b/pom.xml index 499dd20..30ae04f 100755 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ <module>agent</module> <module>controller</module> <module>command-line</module> - <module>single-service</module> </modules> <url>http://airavata.apache.org/</url> diff --git a/services/resource-service/server/src/main/assembly/resource-service-bin-assembly.xml b/services/resource-service/server/src/main/assembly/resource-service-bin-assembly.xml index fc3c663..bdc7ccb 100644 --- a/services/resource-service/server/src/main/assembly/resource-service-bin-assembly.xml +++ b/services/resource-service/server/src/main/assembly/resource-service-bin-assembly.xml @@ -56,7 +56,7 @@ <directory>src/main/resources/distribution/conf</directory> <outputDirectory>conf</outputDirectory> <includes> - <include>resource-service-application.properties</include> + <include>application.properties</include> <include>log4j2.xml</include> <include>applicationContext.xml</include> <include>resources.json</include> diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java index 056b752..23bb7db 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java @@ -19,7 +19,7 @@ package org.apache.airavata.mft.resource.server; import org.springframework.context.annotation.Configuration; -@Configuration("RSAppConfig") +@Configuration public class AppConfig { } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/ResourceServiceApplication.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/ResourceServiceApplication.java index b7672b8..40dba21 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/ResourceServiceApplication.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/ResourceServiceApplication.java @@ -20,13 +20,11 @@ package org.apache.airavata.mft.resource.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.PropertySource; @SpringBootApplication @ComponentScan(basePackages = {"org.apache.airavata"}) -@PropertySource(value = "classpath:resource-service-application.properties") public class ResourceServiceApplication { - public static void main(String[] args) { + public static void main(String args[]) { SpringApplication.run(ResourceServiceApplication.class, args); } } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/XmlConfiguration.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/XmlConfiguration.java index b4d16ff..26b98f8 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/XmlConfiguration.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/XmlConfiguration.java @@ -18,7 +18,9 @@ package org.apache.airavata.mft.resource.server; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportResource; -@Configuration("ResourceServiceXmlConfig") +@Configuration +@ImportResource({"applicationContext.xml"}) public class XmlConfiguration { } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java index c6cd703..df5d620 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java @@ -37,12 +37,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Optional; -@Component public class SQLResourceBackend implements ResourceBackend { private static final Logger logger = LoggerFactory.getLogger(SQLResourceBackend.class); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/FTPStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/FTPStorageRepository.java index 6017ac6..c56ccfa 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/FTPStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/FTPStorageRepository.java @@ -20,12 +20,10 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.FTPStorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Optional; -@Repository public interface FTPStorageRepository extends CrudRepository<FTPStorageEntity, String> { Optional<FTPStorageEntity> findByStorageId(String storageId); List<FTPStorageEntity> findAll(Pageable pageable); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GCSStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GCSStorageRepository.java index 39a54f8..6def035 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GCSStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GCSStorageRepository.java @@ -22,9 +22,7 @@ import java.util.List; import org.apache.airavata.mft.resource.server.backend.sql.entity.GCSStorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; -@Repository public interface GCSStorageRepository extends CrudRepository<GCSStorageEntity, String> { List<GCSStorageEntity> findAll( Pageable pageable); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GenericResourceRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GenericResourceRepository.java index c2b2d6f..36da35d 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GenericResourceRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/GenericResourceRepository.java @@ -2,14 +2,12 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.GenericResourceEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Optional; -@Repository public interface GenericResourceRepository extends CrudRepository<GenericResourceEntity, String> { - Optional<GenericResourceEntity> findByResourceId(String resourceId); - List<GenericResourceEntity> findByStorageId(String storageId); - void deleteByStorageIdAndStorageType(String storageId, GenericResourceEntity.StorageType storageType); + public Optional<GenericResourceEntity> findByResourceId(String resourceId); + public List<GenericResourceEntity> findByStorageId(String storageId); + public void deleteByStorageIdAndStorageType(String storageId, GenericResourceEntity.StorageType storageType); } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/LocalStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/LocalStorageRepository.java index 4789e95..a3084c6 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/LocalStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/LocalStorageRepository.java @@ -3,11 +3,9 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.LocalStorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; -@Repository public interface LocalStorageRepository extends CrudRepository<LocalStorageEntity, String> { List<LocalStorageEntity> findAll(Pageable pageable); } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ODataStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ODataStorageRepository.java index 6f4be5d..2a08627 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ODataStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ODataStorageRepository.java @@ -20,12 +20,10 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.ODataStorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Optional; -@Repository public interface ODataStorageRepository extends CrudRepository<ODataStorageEntity, String> { Optional<ODataStorageEntity> findByStorageId(String storageId); List<ODataStorageEntity> findAll(Pageable pageable); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ResolveStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ResolveStorageRepository.java index 4f9e380..59827e6 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ResolveStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/ResolveStorageRepository.java @@ -19,15 +19,13 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.ResolveStorageEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.Collection; import java.util.List; import java.util.Optional; -@Repository public interface ResolveStorageRepository extends CrudRepository<ResolveStorageEntity, String> { - Optional<ResolveStorageEntity> getByStorageId(String storageID); - List<ResolveStorageEntity> getByStorageName(String storageName); - List<ResolveStorageEntity> getByStorageType(ResolveStorageEntity.StorageType storageType); + public Optional<ResolveStorageEntity> getByStorageId(String storageID); + public List<ResolveStorageEntity> getByStorageName(String storageName); + public List<ResolveStorageEntity> getByStorageType(ResolveStorageEntity.StorageType storageType); } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/S3StorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/S3StorageRepository.java index 1467a35..1c37fe5 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/S3StorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/S3StorageRepository.java @@ -3,11 +3,9 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.S3StorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; -@Repository public interface S3StorageRepository extends CrudRepository<S3StorageEntity, String> { List<S3StorageEntity> findAll(Pageable pageable); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SCPStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SCPStorageRepository.java index 65090a2..dbd77cd 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SCPStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SCPStorageRepository.java @@ -20,12 +20,10 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.SCPStorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Optional; -@Repository public interface SCPStorageRepository extends CrudRepository<SCPStorageEntity, String> { Optional<SCPStorageEntity> findByStorageId(String storageId); List<SCPStorageEntity> findAll(Pageable pageable); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/StorageSecretRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/StorageSecretRepository.java index e86c717..d544311 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/StorageSecretRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/StorageSecretRepository.java @@ -2,13 +2,11 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.StorageSecretEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.Optional; -@Repository public interface StorageSecretRepository extends CrudRepository<StorageSecretEntity, String> { - Optional<StorageSecretEntity> findByStorageId(String storageId); - void deleteByStorageId(String resourceId); + public Optional<StorageSecretEntity> findByStorageId(String storageId); + public void deleteByStorageId(String resourceId); } diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SwiftStorageRepository.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SwiftStorageRepository.java index 1cd54e4..fd69c11 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SwiftStorageRepository.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/repository/SwiftStorageRepository.java @@ -20,12 +20,10 @@ package org.apache.airavata.mft.resource.server.backend.sql.repository; import org.apache.airavata.mft.resource.server.backend.sql.entity.SwiftStorageEntity; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Optional; -@Repository public interface SwiftStorageRepository extends CrudRepository<SwiftStorageEntity, String> { Optional<SwiftStorageEntity> findByStorageId(String storageId); List<SwiftStorageEntity> findAll(Pageable pageable); diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/AzureServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/AzureServiceHandler.java index fed9540..e7c17cb 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/AzureServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/AzureServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSAzureServiceHandler") @GRpcService public class AzureServiceHandler extends AzureStorageServiceGrpc.AzureStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/BoxServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/BoxServiceHandler.java index 19c1edc..b284a0d 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/BoxServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/BoxServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSBoxServiceHandler") @GRpcService public class BoxServiceHandler extends BoxStorageServiceGrpc.BoxStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/DropboxServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/DropboxServiceHandler.java index 5189902..dfa1332 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/DropboxServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/DropboxServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSDropboxServiceHandler") @GRpcService public class DropboxServiceHandler extends DropboxStorageServiceGrpc.DropboxStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/FTPServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/FTPServiceHandler.java index a2c24e6..cb9f9a8 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/FTPServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/FTPServiceHandler.java @@ -17,18 +17,18 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; import org.apache.airavata.mft.resource.service.ftp.FTPStorageServiceGrpc; import org.apache.airavata.mft.resource.stubs.ftp.storage.*; +import org.apache.airavata.mft.resource.stubs.s3.storage.S3StorageListResponse; import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSFTPServiceHandler") @GRpcService public class FTPServiceHandler extends FTPStorageServiceGrpc.FTPStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/GCSServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/GCSServiceHandler.java index 182f8ea..5722043 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/GCSServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/GCSServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSGCSServiceHandler") @GRpcService public class GCSServiceHandler extends GCSStorageServiceGrpc.GCSStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/LocalServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/LocalServiceHandler.java index d66303a..9c257d7 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/LocalServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/LocalServiceHandler.java @@ -17,18 +17,18 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; import org.apache.airavata.mft.resource.service.local.LocalStorageServiceGrpc; import org.apache.airavata.mft.resource.stubs.local.storage.*; +import org.apache.airavata.mft.resource.stubs.s3.storage.S3StorageListResponse; import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSLocalServiceHandler") @GRpcService public class LocalServiceHandler extends LocalStorageServiceGrpc.LocalStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/ODataServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/ODataServiceHandler.java index 61b20b1..391a9b2 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/ODataServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/ODataServiceHandler.java @@ -26,9 +26,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSODataServiceHandler") @GRpcService public class ODataServiceHandler extends ODataStorageServiceGrpc.ODataStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/S3ServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/S3ServiceHandler.java index bd9f202..6cc6288 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/S3ServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/S3ServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSS3ServiceHandler") @GRpcService public class S3ServiceHandler extends S3StorageServiceGrpc.S3StorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SCPServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SCPServiceHandler.java index 3df5c2b..acd6f00 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SCPServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SCPServiceHandler.java @@ -17,18 +17,18 @@ package org.apache.airavata.mft.resource.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.resource.server.backend.ResourceBackend; import org.apache.airavata.mft.resource.service.scp.SCPStorageServiceGrpc; +import org.apache.airavata.mft.resource.stubs.s3.storage.S3StorageListResponse; import org.apache.airavata.mft.resource.stubs.scp.storage.*; import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSSCPServiceHandler") @GRpcService public class SCPServiceHandler extends SCPStorageServiceGrpc.SCPStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/StorageCommonServiceHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/StorageCommonServiceHandler.java index 26c77e8..c5de59e 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/StorageCommonServiceHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/StorageCommonServiceHandler.java @@ -25,9 +25,9 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSStorageCommonServiceHandler") +import javax.sound.midi.Track; + @GRpcService public class StorageCommonServiceHandler extends StorageCommonServiceGrpc.StorageCommonServiceImplBase { diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SwiftStorageHandler.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SwiftStorageHandler.java index eaefbda..35b9d33 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SwiftStorageHandler.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/handler/SwiftStorageHandler.java @@ -26,9 +26,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("RSSwiftStorageHandler") @GRpcService public class SwiftStorageHandler extends SwiftStorageServiceGrpc.SwiftStorageServiceImplBase { diff --git a/services/resource-service/server/src/main/resources/resource-service-application.properties b/services/resource-service/server/src/main/resources/application.properties similarity index 100% rename from services/resource-service/server/src/main/resources/resource-service-application.properties rename to services/resource-service/server/src/main/resources/application.properties diff --git a/services/resource-service/server/src/main/resources/distribution/conf/resource-service-application.properties b/services/resource-service/server/src/main/resources/distribution/conf/application.properties similarity index 100% rename from services/resource-service/server/src/main/resources/distribution/conf/resource-service-application.properties rename to services/resource-service/server/src/main/resources/distribution/conf/application.properties diff --git a/services/secret-service/server/src/main/assembly/secret-service-bin-assembly.xml b/services/secret-service/server/src/main/assembly/secret-service-bin-assembly.xml index fbcd8de..8a537e1 100644 --- a/services/secret-service/server/src/main/assembly/secret-service-bin-assembly.xml +++ b/services/secret-service/server/src/main/assembly/secret-service-bin-assembly.xml @@ -56,7 +56,7 @@ <directory>src/main/resources/distribution/conf</directory> <outputDirectory>conf</outputDirectory> <includes> - <include>secret-service-application.properties</include> + <include>application.properties</include> <include>log4j2.xml</include> <include>applicationContext.xml</include> <include>secrets.json</include> diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java index a46600e..501c8ae 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java @@ -19,7 +19,7 @@ package org.apache.airavata.mft.secret.server; import org.springframework.context.annotation.Configuration; -@Configuration("SSAppConfig") +@Configuration public class AppConfig { } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/SecretServiceApplication.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/SecretServiceApplication.java index d5d952c..c9e930d 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/SecretServiceApplication.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/SecretServiceApplication.java @@ -19,16 +19,12 @@ package org.apache.airavata.mft.secret.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.PropertySource; +@ComponentScan(basePackages = {"org.apache.airavata"}) @SpringBootApplication -@ComponentScan(basePackages = {"org.apache.airavata", "org.apache.airavata.mft.secret.server.backend.sql.repository"}) -@EntityScan(basePackages = {"org.apache.airavata.mft.secret.server.backend.sql.entity"}) -@PropertySource(value = "classpath:secret-service-application.properties") public class SecretServiceApplication { - public static void main(String[] args) { + public static void main(String args[]) { SpringApplication.run(SecretServiceApplication.class, args); } } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/XmlConfiguration.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/XmlConfiguration.java index cb20a23..a84b2b7 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/XmlConfiguration.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/XmlConfiguration.java @@ -18,7 +18,9 @@ package org.apache.airavata.mft.secret.server; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportResource; -@Configuration("SecretServiceXmlConfig") +@Configuration +@ImportResource({"classpath*:applicationContext.xml"}) public class XmlConfiguration { } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java index 3b578ff..8c6c356 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java @@ -39,11 +39,9 @@ import org.dozer.DozerBeanMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import java.util.Optional; -@Component public class SQLSecretBackend implements SecretBackend { private static final Logger logger = LoggerFactory.getLogger(SQLSecretBackend.class); diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/FTPSecretRepository.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/FTPSecretRepository.java index 1343aaa..6eea16d 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/FTPSecretRepository.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/FTPSecretRepository.java @@ -19,11 +19,9 @@ package org.apache.airavata.mft.secret.server.backend.sql.repository; import org.apache.airavata.mft.secret.server.backend.sql.entity.FTPSecretEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.Optional; -@Repository public interface FTPSecretRepository extends CrudRepository<FTPSecretEntity, String> { Optional<FTPSecretEntity> findBySecretId(String secretId); } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/GCSSecretRepository.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/GCSSecretRepository.java index 3147774..446d3e3 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/GCSSecretRepository.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/GCSSecretRepository.java @@ -21,9 +21,7 @@ import java.util.Optional; import org.apache.airavata.mft.secret.server.backend.sql.entity.GCSSecretEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; -@Repository public interface GCSSecretRepository extends CrudRepository<GCSSecretEntity, String> { Optional<GCSSecretEntity> findBySecretId( String resourceId); diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/ODataSecretRepository.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/ODataSecretRepository.java index 631b359..566a24c 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/ODataSecretRepository.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/ODataSecretRepository.java @@ -19,11 +19,9 @@ package org.apache.airavata.mft.secret.server.backend.sql.repository; import org.apache.airavata.mft.secret.server.backend.sql.entity.ODataSecretEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.Optional; -@Repository public interface ODataSecretRepository extends CrudRepository<ODataSecretEntity, String> { Optional<ODataSecretEntity> findBySecretId(String secretId); } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/S3SecretRepository.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/S3SecretRepository.java index 56e0ac5..56fbc2b 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/S3SecretRepository.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/S3SecretRepository.java @@ -1,12 +1,11 @@ package org.apache.airavata.mft.secret.server.backend.sql.repository; import org.apache.airavata.mft.secret.server.backend.sql.entity.S3SecretEntity; +import org.apache.airavata.mft.secret.server.backend.sql.entity.SCPSecretEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.Optional; -@Repository public interface S3SecretRepository extends CrudRepository<S3SecretEntity, String> { Optional<S3SecretEntity> findBySecretId(String secretId); } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/SCPSecretRepository.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/SCPSecretRepository.java index 8428816..78530d2 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/SCPSecretRepository.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/repository/SCPSecretRepository.java @@ -19,11 +19,9 @@ package org.apache.airavata.mft.secret.server.backend.sql.repository; import org.apache.airavata.mft.secret.server.backend.sql.entity.SCPSecretEntity; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.Optional; -@Repository public interface SCPSecretRepository extends CrudRepository<SCPSecretEntity, String> { Optional<SCPSecretEntity> findBySecretId(String resourceId); } diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/AzureServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/AzureServiceHandler.java index e1d7c86..8a46b28 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/AzureServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/AzureServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.azure.AzureSecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSAzureServiceHandler") @GRpcService public class AzureServiceHandler extends AzureSecretServiceGrpc.AzureSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/BoxServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/BoxServiceHandler.java index 439e46a..ebfc6b8 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/BoxServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/BoxServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.box.BoxSecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSBoxServiceHandler") @GRpcService public class BoxServiceHandler extends BoxSecretServiceGrpc.BoxSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/DropboxServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/DropboxServiceHandler.java index 867272d..86fa8c9 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/DropboxServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/DropboxServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.dropbox.DropboxSecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSDropboxServiceHandler") @GRpcService public class DropboxServiceHandler extends DropboxSecretServiceGrpc.DropboxSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/FTPServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/FTPServiceHandler.java index c9e56e9..01e5fb1 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/FTPServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/FTPServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.ftp.FTPSecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSFTPServiceHandler") @GRpcService public class FTPServiceHandler extends FTPSecretServiceGrpc.FTPSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/GCSServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/GCSServiceHandler.java index b494e18..f814c3a 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/GCSServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/GCSServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.gcs.GCSSecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSGCSServiceHandler") @GRpcService public class GCSServiceHandler extends GCSSecretServiceGrpc.GCSSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/ODataServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/ODataServiceHandler.java index 84a0fb7..14fcfbe 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/ODataServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/ODataServiceHandler.java @@ -26,9 +26,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSODataServiceHandler") @GRpcService public class ODataServiceHandler extends ODataSecretServiceGrpc.ODataSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/S3ServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/S3ServiceHandler.java index f1ef8d2..a3ee69c 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/S3ServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/S3ServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.s3.S3SecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSS3ServiceHandler") @GRpcService public class S3ServiceHandler extends S3SecretServiceGrpc.S3SecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SCPServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SCPServiceHandler.java index e82f51f..7351393 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SCPServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SCPServiceHandler.java @@ -17,6 +17,7 @@ package org.apache.airavata.mft.secret.server.handler; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.stub.StreamObserver; import org.apache.airavata.mft.credential.service.scp.SCPSecretServiceGrpc; @@ -26,9 +27,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSSCPServiceHandler") @GRpcService public class SCPServiceHandler extends SCPSecretServiceGrpc.SCPSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SwiftServiceHandler.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SwiftServiceHandler.java index c9da19d..1963cc8 100644 --- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SwiftServiceHandler.java +++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/handler/SwiftServiceHandler.java @@ -9,9 +9,7 @@ import org.lognet.springboot.grpc.GRpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service("SSSwiftServiceHandler") @GRpcService public class SwiftServiceHandler extends SwiftSecretServiceGrpc.SwiftSecretServiceImplBase { diff --git a/services/secret-service/server/src/main/resources/secret-service-application.properties b/services/secret-service/server/src/main/resources/application.properties similarity index 100% rename from services/secret-service/server/src/main/resources/secret-service-application.properties rename to services/secret-service/server/src/main/resources/application.properties diff --git a/services/secret-service/server/src/main/resources/distribution/conf/secret-service-application.properties b/services/secret-service/server/src/main/resources/distribution/conf/application.properties similarity index 100% rename from services/secret-service/server/src/main/resources/distribution/conf/secret-service-application.properties rename to services/secret-service/server/src/main/resources/distribution/conf/application.properties diff --git a/single-service/pom.xml b/single-service/pom.xml deleted file mode 100644 index d84b876..0000000 --- a/single-service/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>airavata-mft</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.01-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>mft-single-service</artifactId> - - <dependencies> - <dependency> - <groupId>io.github.lognet</groupId> - <artifactId>grpc-spring-boot-starter</artifactId> - <version>${grpc.spring.boot}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - <version>${spring.boot.data.jpa}</version> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>mft-api-service</artifactId> - <version>0.01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>mft-resource-service-server</artifactId> - <version>0.01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>mft-secret-service-server</artifactId> - <version>0.01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>mft-common-clients</artifactId> - <version>0.01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - </dependency> - <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>${dozer}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven.assembly.plugin}</version> - <executions> - <execution> - <id>mft-single-service-distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <tarLongFileMode>posix</tarLongFileMode> - <finalName>${single.service.dist.name}</finalName> - <descriptors> - <descriptor>src/main/assembly/single-service-bin-assembly.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> - <configuration> - <excludes> - <exclude>**/*.properties</exclude> - <exclude>**/*.xml</exclude> - <exclude>**/*.sh</exclude> - <exclude>**/*.json</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - - <properties> - <single.service.dist.name>Single-Service-0.01</single.service.dist.name> - <maven.assembly.plugin>3.1.1</maven.assembly.plugin> - </properties> - -</project> \ No newline at end of file diff --git a/single-service/src/main/assembly/single-service-bin-assembly.xml b/single-service/src/main/assembly/single-service-bin-assembly.xml deleted file mode 100644 index 3248d43..0000000 --- a/single-service/src/main/assembly/single-service-bin-assembly.xml +++ /dev/null @@ -1,102 +0,0 @@ -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<!DOCTYPE assembly [ - <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*> - <!ELEMENT id (#PCDATA)> - <!ELEMENT includeBaseDirectory (#PCDATA)> - <!ELEMENT baseDirectory (#PCDATA)> - <!ELEMENT formats (format)*> - <!ELEMENT format (#PCDATA)> - <!ELEMENT fileSets (fileSet)*> - <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*> - <!ELEMENT directory (#PCDATA)> - <!ELEMENT outputDirectory (#PCDATA)> - <!ELEMENT includes (include)*> - <!ELEMENT include (#PCDATA)> - <!ELEMENT dependencySets (dependencySet)*> - <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*> - ]> -<assembly> - <id>bin</id> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>${single.service.dist.name}</baseDirectory> - <formats> - <format>tar.gz</format> - <format>zip</format> - </formats> - - <fileSets> - <fileSet> - <directory>src/main/resources/distribution/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>777</fileMode> - <includes> - <include>*.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/resources/distribution/conf</directory> - <outputDirectory>conf</outputDirectory> - <includes> - <include>application.properties</include> - <include>log4j2.xml</include> - <include>applicationContext.xml</include> - <include>resources.json</include> - </includes> - </fileSet> - <fileSet> - <directory>./</directory> - <outputDirectory>logs</outputDirectory> - <excludes> - <exclude>*/**</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target</directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>../services/resource-service/server/src/main/resources/distribution/conf</directory> - <outputDirectory>conf</outputDirectory> - <includes> - <include>resource-service-application.properties</include></includes> - </fileSet> - <fileSet> - <directory>../services/secret-service/server/src/main/resources/distribution/conf</directory> - <outputDirectory>conf</outputDirectory> - <includes> - <include>secret-service-application.properties</include></includes> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <outputDirectory>lib</outputDirectory> - <includes> - <include>*</include> - </includes> - </dependencySet> - </dependencySets> -</assembly> diff --git a/single-service/src/main/java/org/apache/airavata/mft/singleservice/AppConfig.java b/single-service/src/main/java/org/apache/airavata/mft/singleservice/AppConfig.java deleted file mode 100644 index 04e6346..0000000 --- a/single-service/src/main/java/org/apache/airavata/mft/singleservice/AppConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.airavata.mft.singleservice; - -import org.dozer.DozerBeanMapper; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration("SingleServiceAppConfig") -@ComponentScan(basePackages = {"org.apache.airavata.mft.api.handler"}) -@EnableAutoConfiguration -public class AppConfig { - - @Bean(name = "org.dozer.Mapper") - public DozerBeanMapper dozerBeanMapper() { - return new DozerBeanMapper(); - } - -} diff --git a/single-service/src/main/java/org/apache/airavata/mft/singleservice/SingleServiceApplication.java b/single-service/src/main/java/org/apache/airavata/mft/singleservice/SingleServiceApplication.java deleted file mode 100644 index ba3f101..0000000 --- a/single-service/src/main/java/org/apache/airavata/mft/singleservice/SingleServiceApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apache.airavata.mft.singleservice; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@SpringBootApplication() -@ComponentScan(basePackages = {"org.apache.airavata.mft.*", "org.apache.airavata.mft.api.*", "org.apache.airavata.mft.api.handler"}) -@EntityScan(basePackages = {"org.apache.airavata.mft.resource.server.backend.sql.entity"}) -@EnableJpaRepositories(basePackages = {"org.apache.airavata.mft.resource.server.backend.sql.repository", - "org.apache.airavata.mft.secret.server.backend.sql.repository"}) -@PropertySource(value = "classpath:api-service-application.properties") -@PropertySource(value = "classpath:resource-service-application.properties") -@PropertySource(value = "classpath:secret-service-application.properties") -@Import(org.apache.airavata.mft.api.AppConfig.class) -public class SingleServiceApplication { - public static void main(String[] args) { - SpringApplication.run(SingleServiceApplication.class, args); - } - -} diff --git a/single-service/src/main/resources/application.properties b/single-service/src/main/resources/application.properties deleted file mode 100644 index dcb9b6a..0000000 --- a/single-service/src/main/resources/application.properties +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -spring.main.allow-bean-definition-overriding=true \ No newline at end of file diff --git a/single-service/src/main/resources/distribution/conf/application.properties b/single-service/src/main/resources/distribution/conf/application.properties deleted file mode 100644 index dcb9b6a..0000000 --- a/single-service/src/main/resources/distribution/conf/application.properties +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -spring.main.allow-bean-definition-overriding=true \ No newline at end of file diff --git a/single-service/src/main/resources/distribution/conf/log4j2.xml b/single-service/src/main/resources/distribution/conf/log4j2.xml deleted file mode 100644 index 306b541..0000000 --- a/single-service/src/main/resources/distribution/conf/log4j2.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<Configuration status="WARN"> - - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/> - </Console> - <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log" - filePattern="logs/single-service/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz"> - <PatternLayout> - <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern> - </PatternLayout> - <Policies> - <OnStartupTriggeringPolicy /> - <TimeBasedTriggeringPolicy /> - <SizeBasedTriggeringPolicy size="50 MB" /> - </Policies> - <DefaultRolloverStrategy max="20" /> - </RollingFile> - </Appenders> - <Loggers> - <logger name="org.apache.helix" level="WARN"/> - <logger name="org.apache.zookeeper" level="ERROR"/> - <logger name="org.apache.airavata" level="INFO"/> - <logger name="org.hibernate" level="ERROR"/> - <logger name="org.apache.coyote.http11" level="ERROR"/> - <Root level="INFO"> - <AppenderRef ref="Console"/> - <AppenderRef ref="RollingFileAppender"/> - </Root> - </Loggers> -</Configuration> \ No newline at end of file diff --git a/single-service/src/main/resources/log4j2.xml b/single-service/src/main/resources/log4j2.xml deleted file mode 100644 index 306b541..0000000 --- a/single-service/src/main/resources/log4j2.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<Configuration status="WARN"> - - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/> - </Console> - <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log" - filePattern="logs/single-service/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz"> - <PatternLayout> - <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern> - </PatternLayout> - <Policies> - <OnStartupTriggeringPolicy /> - <TimeBasedTriggeringPolicy /> - <SizeBasedTriggeringPolicy size="50 MB" /> - </Policies> - <DefaultRolloverStrategy max="20" /> - </RollingFile> - </Appenders> - <Loggers> - <logger name="org.apache.helix" level="WARN"/> - <logger name="org.apache.zookeeper" level="ERROR"/> - <logger name="org.apache.airavata" level="INFO"/> - <logger name="org.hibernate" level="ERROR"/> - <logger name="org.apache.coyote.http11" level="ERROR"/> - <Root level="INFO"> - <AppenderRef ref="Console"/> - <AppenderRef ref="RollingFileAppender"/> - </Root> - </Loggers> -</Configuration> \ No newline at end of file
