This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/grpc-armeria-migration in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 011eadfd53f3e27fefe89d6434320d3db302576d Author: yasithdev <[email protected]> AuthorDate: Wed Apr 1 00:51:11 2026 -0400 refactor: merge file-server into airavata-server, fix POM dependencies --- airavata-api/file-server/pom.xml | 72 ---------------------- .../file/server/config/FileServerConfig.java | 27 -------- .../file-server/src/main/resources/log4j2.xml | 38 ------------ airavata-server/pom.xml | 5 -- .../airavata/server/file}/FileController.java | 2 +- .../server/grpc/AiravataArmeriaConfig.java | 7 ++- pom.xml | 1 - 7 files changed, 5 insertions(+), 147 deletions(-) diff --git a/airavata-api/file-server/pom.xml b/airavata-api/file-server/pom.xml deleted file mode 100644 index 07d8d06268..0000000000 --- a/airavata-api/file-server/pom.xml +++ /dev/null @@ -1,72 +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. ---> -<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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata</artifactId> - <version>0.21-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>file-server</artifactId> - <name>Airavata File Server</name> - - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-api</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/airavata-api/file-server/src/main/java/org/apache/airavata/file/server/config/FileServerConfig.java b/airavata-api/file-server/src/main/java/org/apache/airavata/file/server/config/FileServerConfig.java deleted file mode 100644 index ee58ae02ee..0000000000 --- a/airavata-api/file-server/src/main/java/org/apache/airavata/file/server/config/FileServerConfig.java +++ /dev/null @@ -1,27 +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.file.server.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan(basePackages = {"org.apache.airavata.file.server", "org.apache.airavata.storage.service", "org.apache.airavata.storage.config"}) -public class FileServerConfig {} diff --git a/airavata-api/file-server/src/main/resources/log4j2.xml b/airavata-api/file-server/src/main/resources/log4j2.xml deleted file mode 100644 index a615b97f5c..0000000000 --- a/airavata-api/file-server/src/main/resources/log4j2.xml +++ /dev/null @@ -1,38 +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> - </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" /> - <Root level="INFO"> - <AppenderRef ref="Console" /> - </Root> - </Loggers> -</Configuration> \ No newline at end of file diff --git a/airavata-server/pom.xml b/airavata-server/pom.xml index a8dedb8cdc..327bc80f73 100644 --- a/airavata-server/pom.xml +++ b/airavata-server/pom.xml @@ -63,11 +63,6 @@ under the License. <artifactId>research-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>file-server</artifactId> - <version>${project.version}</version> - </dependency> <!-- Armeria gRPC --> <dependency> diff --git a/airavata-api/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java b/airavata-server/src/main/java/org/apache/airavata/server/file/FileController.java similarity index 98% rename from airavata-api/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java rename to airavata-server/src/main/java/org/apache/airavata/server/file/FileController.java index 8207762179..1ec5c7dd58 100644 --- a/airavata-api/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java +++ b/airavata-server/src/main/java/org/apache/airavata/server/file/FileController.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.file.server.controller; +package org.apache.airavata.server.file; import java.io.File; import java.nio.file.Path; diff --git a/airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java index 769cee8ac3..4f2de45bfa 100644 --- a/airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java +++ b/airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java @@ -28,10 +28,10 @@ import io.grpc.BindableService; import org.apache.airavata.common.config.ConditionalOnServer; import org.apache.airavata.server.grpc.config.GrpcAuthInterceptor; import org.apache.airavata.agent.connection.service.config.AgentServiceConfig; -import org.apache.airavata.file.server.config.FileServerConfig; -import org.apache.airavata.file.server.controller.FileController; +import org.apache.airavata.server.file.FileController; import org.apache.airavata.research.service.config.ResearchServiceConfig; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -39,7 +39,8 @@ import java.util.List; @Configuration @ConditionalOnServer("grpc") -@Import({AgentServiceConfig.class, ResearchServiceConfig.class, FileServerConfig.class}) +@Import({AgentServiceConfig.class, ResearchServiceConfig.class}) +@ComponentScan(basePackages = {"org.apache.airavata.storage.service", "org.apache.airavata.storage.config"}) public class AiravataArmeriaConfig { @Bean diff --git a/pom.xml b/pom.xml index a0278ec8b1..d8d49d231a 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,6 @@ under the License. <modules> <module>airavata-api</module> - <module>airavata-api/file-server</module> <module>airavata-api/agent-service</module> <module>airavata-api/research-service</module> <module>airavata-server</module>
