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 a88daee254bdadd43c099fd9e77f33d868d8ac75 Author: yasithdev <[email protected]> AuthorDate: Tue Mar 31 19:44:49 2026 -0400 refactor: consolidate server into single airavata-server module Merged grpc/, rest/, and file-server controller into one module. Single Armeria config handles gRPC, REST transcoding, file uploads, CORS, and DocService. --- airavata-server/grpc/pom.xml | 102 --------------------- airavata-server/pom.xml | 74 ++++++++++++++- airavata-server/rest/pom.xml | 90 ------------------ .../server/rest/AiravataRestServerConfig.java | 20 ---- .../airavata/server/rest/config/WebMvcConfig.java | 42 --------- .../apache/airavata/server/AiravataServerMain.java | 3 +- .../airavata/server}/config/SecurityConfig.java | 2 +- .../server/grpc/AiravataArmeriaConfig.java | 9 +- .../airavata/server/grpc/GrpcStatusMapper.java | 0 .../server/grpc/config/GrpcAuthInterceptor.java | 0 .../services/ApplicationCatalogGrpcService.java | 0 .../grpc/services/CredentialGrpcService.java | 0 .../grpc/services/DataProductGrpcService.java | 0 .../grpc/services/ExperimentGrpcService.java | 0 .../server/grpc/services/GatewayGrpcService.java | 0 .../GatewayResourceProfileGrpcService.java | 0 .../grpc/services/GroupManagerGrpcService.java | 0 .../services/GroupResourceProfileGrpcService.java | 0 .../server/grpc/services/GrpcRequestContext.java | 0 .../server/grpc/services/IamAdminGrpcService.java | 0 .../grpc/services/NotificationGrpcService.java | 0 .../server/grpc/services/ParserGrpcService.java | 0 .../server/grpc/services/ProjectGrpcService.java | 0 .../server/grpc/services/ResourceGrpcService.java | 0 .../server/grpc/services/SharingGrpcService.java | 0 .../grpc/services/UserProfileGrpcService.java | 0 .../services/UserResourceProfileGrpcService.java | 0 pom.xml | 2 - 28 files changed, 81 insertions(+), 263 deletions(-) diff --git a/airavata-server/grpc/pom.xml b/airavata-server/grpc/pom.xml deleted file mode 100644 index 2f6899c80e..0000000000 --- a/airavata-server/grpc/pom.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. ---> -<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";> - <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>airavata-server-grpc</artifactId> - <name>Airavata Server - gRPC</name> - - <dependencies> - <!-- Project modules --> - <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> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>agent-service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>research-service</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- Armeria gRPC --> - <dependency> - <groupId>com.linecorp.armeria</groupId> - <artifactId>armeria-spring-boot3-starter</artifactId> - </dependency> - <dependency> - <groupId>com.linecorp.armeria</groupId> - <artifactId>armeria-grpc</artifactId> - </dependency> - - <!-- Mapping --> - <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <release>17</release> - <annotationProcessorPaths> - <path> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct-processor</artifactId> - <version>1.6.3</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/airavata-server/pom.xml b/airavata-server/pom.xml index 66f9a10f6c..a8dedb8cdc 100644 --- a/airavata-server/pom.xml +++ b/airavata-server/pom.xml @@ -33,17 +33,58 @@ under the License. <description>Unified launcher for all Airavata server modules</description> <dependencies> - <!-- Server modules --> + <!-- Project modules --> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-rest</artifactId> + <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> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>agent-service</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>research-service</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-grpc</artifactId> + <artifactId>file-server</artifactId> <version>${project.version}</version> </dependency> + + <!-- Armeria gRPC --> + <dependency> + <groupId>com.linecorp.armeria</groupId> + <artifactId>armeria-spring-boot3-starter</artifactId> + </dependency> + <dependency> + <groupId>com.linecorp.armeria</groupId> + <artifactId>armeria-grpc</artifactId> + </dependency> + + <!-- Mapping --> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + </dependency> + <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> @@ -55,6 +96,16 @@ under the License. </exclusion> </exclusions> </dependency> + <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.springframework.boot</groupId> <artifactId>spring-boot-starter-log4j2</artifactId> @@ -67,6 +118,23 @@ under the License. <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>17</release> + <compilerArgs> + <arg>-parameters</arg> + </compilerArgs> + <annotationProcessorPaths> + <path> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>1.6.3</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> diff --git a/airavata-server/rest/pom.xml b/airavata-server/rest/pom.xml deleted file mode 100644 index 84414c0aa1..0000000000 --- a/airavata-server/rest/pom.xml +++ /dev/null @@ -1,90 +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/xsd/maven-4.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>airavata-server-rest</artifactId> - <name>Airavata Server - REST</name> - - <dependencies> - <!-- Project modules --> - <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> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>research-service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>agent-service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>file-server</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- Armeria --> - <dependency> - <groupId>com.linecorp.armeria</groupId> - <artifactId>armeria-spring-boot3-starter</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <release>17</release> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/AiravataRestServerConfig.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/AiravataRestServerConfig.java deleted file mode 100644 index 592b080513..0000000000 --- a/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/AiravataRestServerConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.apache.airavata.server.rest; - -import com.linecorp.armeria.spring.ArmeriaServerConfigurator; -import org.apache.airavata.common.config.ConditionalOnServer; -import org.apache.airavata.file.server.config.FileServerConfig; -import org.apache.airavata.file.server.controller.FileController; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -@Configuration -@ConditionalOnServer("grpc") -@Import({FileServerConfig.class}) -public class AiravataRestServerConfig { - - @Bean - public ArmeriaServerConfigurator fileServerConfigurator(FileController fileController) { - return builder -> builder.annotatedService("/api/v1/files", fileController); - } -} diff --git a/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/WebMvcConfig.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/WebMvcConfig.java deleted file mode 100644 index 5d0e0905e0..0000000000 --- a/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/WebMvcConfig.java +++ /dev/null @@ -1,42 +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.server.rest.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -public class WebMvcConfig implements WebMvcConfigurer { - - @Value("${airavata.cors.allowed-origins:*}") - private String allowedOrigins; - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/api/**") - .allowedOrigins(allowedOrigins.split(",")) - .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS") - .allowedHeaders("*") - .allowCredentials(true) - .maxAge(3600); - } -} diff --git a/airavata-server/src/main/java/org/apache/airavata/server/AiravataServerMain.java b/airavata-server/src/main/java/org/apache/airavata/server/AiravataServerMain.java index 9f041aaf87..bc6638342e 100644 --- a/airavata-server/src/main/java/org/apache/airavata/server/AiravataServerMain.java +++ b/airavata-server/src/main/java/org/apache/airavata/server/AiravataServerMain.java @@ -21,7 +21,6 @@ package org.apache.airavata.server; import org.apache.airavata.common.config.AiravataServerProperties; import org.apache.airavata.server.grpc.AiravataArmeriaConfig; -import org.apache.airavata.server.rest.AiravataRestServerConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; @@ -31,7 +30,7 @@ import org.springframework.context.annotation.Import; @SpringBootApplication(scanBasePackages = {"org.apache.airavata.server", "org.apache.airavata.common.db"}) @EntityScan("org.apache.airavata") @EnableConfigurationProperties(AiravataServerProperties.class) -@Import({AiravataRestServerConfig.class, AiravataArmeriaConfig.class}) +@Import(AiravataArmeriaConfig.class) public class AiravataServerMain { public static void main(String[] args) { SpringApplication.run(AiravataServerMain.class, args); diff --git a/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/SecurityConfig.java b/airavata-server/src/main/java/org/apache/airavata/server/config/SecurityConfig.java similarity index 99% rename from airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/SecurityConfig.java rename to airavata-server/src/main/java/org/apache/airavata/server/config/SecurityConfig.java index e03d12115d..32d5a5b8af 100644 --- a/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/SecurityConfig.java +++ b/airavata-server/src/main/java/org/apache/airavata/server/config/SecurityConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.server.rest.config; +package org.apache.airavata.server.config; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java similarity index 86% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java index 283087af38..769cee8ac3 100644 --- a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java +++ b/airavata-server/src/main/java/org/apache/airavata/server/grpc/AiravataArmeriaConfig.java @@ -28,6 +28,8 @@ 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.research.service.config.ResearchServiceConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,7 +39,7 @@ import java.util.List; @Configuration @ConditionalOnServer("grpc") -@Import({AgentServiceConfig.class, ResearchServiceConfig.class}) +@Import({AgentServiceConfig.class, ResearchServiceConfig.class, FileServerConfig.class}) public class AiravataArmeriaConfig { @Bean @@ -62,4 +64,9 @@ public class AiravataArmeriaConfig { .newDecorator()); }; } + + @Bean + public ArmeriaServerConfigurator fileServerConfigurator(FileController fileController) { + return builder -> builder.annotatedService("/api/v1/files", fileController); + } } diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/GrpcStatusMapper.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/GrpcStatusMapper.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/GrpcStatusMapper.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/GrpcStatusMapper.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ApplicationCatalogGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ApplicationCatalogGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ApplicationCatalogGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ApplicationCatalogGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/CredentialGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/CredentialGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/CredentialGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/CredentialGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/DataProductGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/DataProductGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/DataProductGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/DataProductGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ExperimentGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ExperimentGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ExperimentGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ExperimentGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GatewayGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GatewayGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GatewayGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GatewayGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GatewayResourceProfileGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GatewayResourceProfileGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GatewayResourceProfileGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GatewayResourceProfileGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GroupManagerGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GroupManagerGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GroupManagerGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GroupManagerGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GroupResourceProfileGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GroupResourceProfileGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GroupResourceProfileGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GroupResourceProfileGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GrpcRequestContext.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GrpcRequestContext.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/GrpcRequestContext.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/GrpcRequestContext.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/IamAdminGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/IamAdminGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/IamAdminGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/IamAdminGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/NotificationGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/NotificationGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/NotificationGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/NotificationGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ParserGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ParserGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ParserGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ParserGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ProjectGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ProjectGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ProjectGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ProjectGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ResourceGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ResourceGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/ResourceGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/ResourceGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/SharingGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/SharingGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/SharingGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/SharingGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java diff --git a/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/UserResourceProfileGrpcService.java b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserResourceProfileGrpcService.java similarity index 100% rename from airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/services/UserResourceProfileGrpcService.java rename to airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserResourceProfileGrpcService.java diff --git a/pom.xml b/pom.xml index 8d80441387..a0278ec8b1 100644 --- a/pom.xml +++ b/pom.xml @@ -72,8 +72,6 @@ under the License. <module>airavata-api/file-server</module> <module>airavata-api/agent-service</module> <module>airavata-api/research-service</module> - <module>airavata-server/rest</module> - <module>airavata-server/grpc</module> <module>airavata-server</module> </modules>
