This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/server-collapse in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 4119de86f705ddd64d3acf93ba0f7f6827d8791a Author: yasithdev <[email protected]> AuthorDate: Sat Mar 28 00:45:39 2026 -0500 refactor: collapse server modules into airavata-server sub-modules Move airavata-rest-server, airavata-grpc-server, and airavata-thrift-server into airavata-server/{rest,grpc,thrift}/ sub-modules with unified package namespace org.apache.airavata.server.{rest,grpc,thrift}. --- airavata-api/pom.xml | 2 +- .../grpc}/pom.xml | 6 +- .../server/grpc}/AiravataGrpcServerConfig.java | 2 +- .../server/grpc}/config/GrpcAuthInterceptor.java | 2 +- airavata-server/pom.xml | 6 +- .../rest}/pom.xml | 6 +- .../server/rest}/AiravataRestServerConfig.java | 2 +- .../server/rest}/config/OpenApiConfig.java | 2 +- .../server/rest}/config/SecurityConfig.java | 2 +- .../airavata/server/rest}/config/WebMvcConfig.java | 2 +- .../rest}/controller/KafkaProxyController.java | 2 +- .../apache/airavata/server/AiravataServerMain.java | 6 +- airavata-server/{ => thrift}/pom.xml | 58 ++++++--------- .../server/thrift}/AiravataThriftServerConfig.java | 9 +-- .../thrift}/config/BackgroundServicesConfig.java | 2 +- .../thrift}/config/ThriftProcessorConfig.java | 14 ++-- .../thrift}/config/ThriftServerLifecycle.java | 2 +- .../thrift}/handler/AiravataServerHandler.java | 2 +- .../handler}/GroupManagerServiceHandler.java | 2 +- .../thrift/handler}/IamAdminServicesHandler.java | 2 +- .../thrift/handler}/OrchestratorServerHandler.java | 2 +- .../handler}/TenantProfileServiceHandler.java | 2 +- .../server/thrift}/handler/ThriftAdapter.java | 2 +- .../thrift/handler}/UserProfileServiceHandler.java | 2 +- .../server/thrift}/mapper/WorkspaceMapper.java | 2 +- .../airavata/server/thrift}/util/Constants.java | 2 +- .../main/thrift/airavata-apis/airavata_api.thrift | 0 .../thrift/airavata-apis/airavata_commons.thrift | 0 .../thrift/airavata-apis/airavata_errors.thrift | 0 .../thrift/airavata-apis/db_event_model.thrift | 0 .../thrift/airavata-apis/messaging_events.thrift | 0 .../thrift/airavata-apis/security_model.thrift | 0 .../main/thrift/airavata-apis/workflow_api.thrift | 0 .../src/main/thrift/base-api/base_api.thrift | 0 .../data-models/account_provisioning_model.thrift | 0 .../application_deployment_model.thrift | 0 .../data-models/application_interface_model.thrift | 0 .../data-models/application_io_models.thrift | 0 .../data-models/compute_resource_model.thrift | 0 .../data-models/credential_store_models.thrift | 0 .../thrift/data-models/data_movement_models.thrift | 0 .../thrift/data-models/experiment_model.thrift | 0 .../thrift/data-models/gateway_groups_model.thrift | 0 .../gateway_resource_profile_model.thrift | 0 .../thrift/data-models/group_manager_model.thrift | 0 .../group_resource_profile_model.thrift | 0 .../src/main/thrift/data-models/job_model.thrift | 0 .../thrift/data-models/parallelism_model.thrift | 0 .../main/thrift/data-models/parser_model.thrift | 0 .../main/thrift/data-models/process_model.thrift | 0 .../data-models/replica_catalog_models.thrift | 0 .../thrift/data-models/scheduling_model.thrift | 0 .../main/thrift/data-models/sharing_models.thrift | 0 .../main/thrift/data-models/status_models.thrift | 0 .../data-models/storage_resource_model.thrift | 0 .../src/main/thrift/data-models/task_model.thrift | 0 .../thrift/data-models/tenant_profile_model.thrift | 0 .../thrift/data-models/user_profile_model.thrift | 0 .../data-models/user_resource_profile_model.thrift | 0 .../thrift/data-models/workflow_data_model.thrift | 0 .../main/thrift/data-models/workflow_model.thrift | 0 .../main/thrift/data-models/workspace_model.thrift | 0 .../src/main/thrift/generate-thrift-stubs.sh | 0 .../service-cpis/credential-store-cpi.thrift | 0 .../service-cpis/credential_store_errors.thrift | 0 .../thrift/service-cpis/orchestrator-cpi.thrift | 0 .../thrift/service-cpis/profile-service-cpi.thrift | 0 .../group-manager/group-manager-cpi.thrift | 0 .../group-manager/group_manager_cpi_errors.thrift | 0 .../iam-admin-services-cpi.thrift | 0 .../iam_admin_services_cpi_errors.thrift | 0 .../profile-tenant/profile-tenant-cpi.thrift | 0 .../profile_tenant_cpi_errors.thrift | 0 .../profile-user/profile-user-cpi.thrift | 0 .../profile-user/profile_user_cpi_errors.thrift | 0 .../main/thrift/service-cpis/registry-api.thrift | 0 .../thrift/service-cpis/registry_api_errors.thrift | 0 .../main/thrift/service-cpis/sharing_cpi.thrift | 0 .../thrift/service-cpis/user-profile-cpi.thrift | 0 .../service-cpis/user_profile_cpi_errors.thrift | 0 .../thrift}/src/main/thrift/stubs_java.thrift | 0 .../thrift}/src/main/thrift/stubs_php.thrift | 0 .../thrift}/src/main/thrift/stubs_python.thrift | 0 airavata-thrift-server/pom.xml | 83 ---------------------- pom.xml | 6 +- 85 files changed, 65 insertions(+), 167 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index 177e1462e4..0e77d6b06c 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -450,7 +450,7 @@ under the License. <arg value="java:beans,jakarta_annotations=undated" /> <arg value="-out" /> <arg value="${project.build.directory}/generated-sources/thrift" /> - <arg value="${project.basedir}/../airavata-thrift-server/src/main/thrift/stubs_java.thrift" /> + <arg value="${project.basedir}/../airavata-server/thrift/src/main/thrift/stubs_java.thrift" /> </exec> </target> </configuration> diff --git a/airavata-grpc-server/pom.xml b/airavata-server/grpc/pom.xml similarity index 96% rename from airavata-grpc-server/pom.xml rename to airavata-server/grpc/pom.xml index 6852ae093d..f772e1e79c 100644 --- a/airavata-grpc-server/pom.xml +++ b/airavata-server/grpc/pom.xml @@ -25,11 +25,11 @@ under the License. <groupId>org.apache.airavata</groupId> <artifactId>airavata</artifactId> <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>airavata-grpc-server</artifactId> - <name>Airavata gRPC Server</name> + <artifactId>airavata-server-grpc</artifactId> + <name>Airavata Server - gRPC</name> <dependencies> <!-- Project modules --> diff --git a/airavata-grpc-server/src/main/java/org/apache/airavata/grpc/server/AiravataGrpcServerConfig.java b/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/AiravataGrpcServerConfig.java similarity index 96% rename from airavata-grpc-server/src/main/java/org/apache/airavata/grpc/server/AiravataGrpcServerConfig.java rename to airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/AiravataGrpcServerConfig.java index 6bdc8c2fae..d71596341b 100644 --- a/airavata-grpc-server/src/main/java/org/apache/airavata/grpc/server/AiravataGrpcServerConfig.java +++ b/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/AiravataGrpcServerConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.grpc.server; +package org.apache.airavata.server.grpc; import org.apache.airavata.agent.connection.service.config.AgentServiceConfig; import org.apache.airavata.common.config.ConditionalOnServer; diff --git a/airavata-grpc-server/src/main/java/org/apache/airavata/grpc/server/config/GrpcAuthInterceptor.java b/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java similarity index 98% rename from airavata-grpc-server/src/main/java/org/apache/airavata/grpc/server/config/GrpcAuthInterceptor.java rename to airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java index 142a3e78d0..8d9c196027 100644 --- a/airavata-grpc-server/src/main/java/org/apache/airavata/grpc/server/config/GrpcAuthInterceptor.java +++ b/airavata-server/grpc/src/main/java/org/apache/airavata/server/grpc/config/GrpcAuthInterceptor.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.grpc.server.config; +package org.apache.airavata.server.grpc.config; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/airavata-server/pom.xml b/airavata-server/pom.xml index 3c3c88ada8..095af54289 100644 --- a/airavata-server/pom.xml +++ b/airavata-server/pom.xml @@ -36,17 +36,17 @@ under the License. <!-- Server modules --> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-rest-server</artifactId> + <artifactId>airavata-server-rest</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-grpc-server</artifactId> + <artifactId>airavata-server-grpc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-thrift-server</artifactId> + <artifactId>airavata-server-thrift</artifactId> <version>${project.version}</version> </dependency> diff --git a/airavata-rest-server/pom.xml b/airavata-server/rest/pom.xml similarity index 97% rename from airavata-rest-server/pom.xml rename to airavata-server/rest/pom.xml index 433a23fc2c..8c399ebbe6 100644 --- a/airavata-rest-server/pom.xml +++ b/airavata-server/rest/pom.xml @@ -25,11 +25,11 @@ under the License. <groupId>org.apache.airavata</groupId> <artifactId>airavata</artifactId> <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>airavata-rest-server</artifactId> - <name>Airavata REST Server</name> + <artifactId>airavata-server-rest</artifactId> + <name>Airavata Server - REST</name> <dependencies> <!-- Project modules --> diff --git a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/AiravataRestServerConfig.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/AiravataRestServerConfig.java similarity index 97% rename from airavata-rest-server/src/main/java/org/apache/airavata/rest/server/AiravataRestServerConfig.java rename to airavata-server/rest/src/main/java/org/apache/airavata/server/rest/AiravataRestServerConfig.java index eec0f97ca8..89948ccfac 100644 --- a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/AiravataRestServerConfig.java +++ b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/AiravataRestServerConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.rest.server; +package org.apache.airavata.server.rest; import org.apache.airavata.agent.connection.service.config.AgentServiceConfig; import org.apache.airavata.common.config.ConditionalOnServer; diff --git a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/OpenApiConfig.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/OpenApiConfig.java similarity index 98% rename from airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/OpenApiConfig.java rename to airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/OpenApiConfig.java index 207bf18c1f..abe16ad82b 100644 --- a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/OpenApiConfig.java +++ b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/OpenApiConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.rest.server.config; +package org.apache.airavata.server.rest.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/SecurityConfig.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/SecurityConfig.java similarity index 99% rename from airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/SecurityConfig.java rename to airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/SecurityConfig.java index 8caed09b3a..c31d1b279b 100644 --- a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/SecurityConfig.java +++ b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/SecurityConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.rest.server.config; +package org.apache.airavata.server.rest.config; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/WebMvcConfig.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/WebMvcConfig.java similarity index 97% rename from airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/WebMvcConfig.java rename to airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/WebMvcConfig.java index f6bc160386..5d0e0905e0 100644 --- a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/config/WebMvcConfig.java +++ b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/config/WebMvcConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.rest.server.config; +package org.apache.airavata.server.rest.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/controller/KafkaProxyController.java b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/controller/KafkaProxyController.java similarity index 98% rename from airavata-rest-server/src/main/java/org/apache/airavata/rest/server/controller/KafkaProxyController.java rename to airavata-server/rest/src/main/java/org/apache/airavata/server/rest/controller/KafkaProxyController.java index bf117c7d66..36754f9a4f 100644 --- a/airavata-rest-server/src/main/java/org/apache/airavata/rest/server/controller/KafkaProxyController.java +++ b/airavata-server/rest/src/main/java/org/apache/airavata/server/rest/controller/KafkaProxyController.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.rest.server.controller; +package org.apache.airavata.server.rest.controller; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; 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 620730e29f..38dbf06a10 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 @@ -19,9 +19,9 @@ package org.apache.airavata.server; import org.apache.airavata.common.config.AiravataServerProperties; -import org.apache.airavata.grpc.server.AiravataGrpcServerConfig; -import org.apache.airavata.rest.server.AiravataRestServerConfig; -import org.apache.airavata.thrift.server.AiravataThriftServerConfig; +import org.apache.airavata.server.grpc.AiravataGrpcServerConfig; +import org.apache.airavata.server.rest.AiravataRestServerConfig; +import org.apache.airavata.server.thrift.AiravataThriftServerConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/airavata-server/pom.xml b/airavata-server/thrift/pom.xml similarity index 56% copy from airavata-server/pom.xml copy to airavata-server/thrift/pom.xml index 3c3c88ada8..cc01bd4119 100644 --- a/airavata-server/pom.xml +++ b/airavata-server/thrift/pom.xml @@ -25,32 +25,31 @@ under the License. <groupId>org.apache.airavata</groupId> <artifactId>airavata</artifactId> <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>airavata-server</artifactId> - <name>Airavata Server</name> - <description>Unified launcher for all Airavata server modules</description> + <artifactId>airavata-server-thrift</artifactId> + <packaging>jar</packaging> + <name>Airavata Server - Thrift</name> <dependencies> - <!-- Server modules --> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-rest-server</artifactId> + <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-grpc-server</artifactId> - <version>${project.version}</version> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> </dependency> <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-thrift-server</artifactId> - <version>${project.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> </dependency> - - <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> @@ -61,37 +60,22 @@ under the License. </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-log4j2</artifactId> - </dependency> </dependencies> <build> <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> <configuration> - <descriptors> - <descriptor>src/main/assembly/server-bin-assembly.xml</descriptor> - </descriptors> - <finalName>airavata-server-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> + <annotationProcessorPaths> + <path> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>1.6.3</version> + </path> + </annotationProcessorPaths> </configuration> - <executions> - <execution> - <id>create-distribution</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/AiravataThriftServerConfig.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/AiravataThriftServerConfig.java similarity index 81% rename from airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/AiravataThriftServerConfig.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/AiravataThriftServerConfig.java index 81af820223..a1c30a1a0a 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/AiravataThriftServerConfig.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/AiravataThriftServerConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.thrift.server; +package org.apache.airavata.server.thrift; import org.apache.airavata.common.config.ConditionalOnServer; import org.springframework.context.annotation.ComponentScan; @@ -26,13 +26,10 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConditionalOnServer("thrift") @ComponentScan(basePackages = { - "org.apache.airavata.api.server.handler", + "org.apache.airavata.server.thrift", "org.apache.airavata.credential.handler", "org.apache.airavata.execution.handler", - "org.apache.airavata.sharing.handler", - "org.apache.airavata.service.profile.handlers", - "org.apache.airavata.orchestrator.server", - "org.apache.airavata.thrift.server.config" + "org.apache.airavata.sharing.handler" }) public class AiravataThriftServerConfig { } diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/BackgroundServicesConfig.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/BackgroundServicesConfig.java similarity index 98% rename from airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/BackgroundServicesConfig.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/BackgroundServicesConfig.java index 0b24c263a5..243ac1853f 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/BackgroundServicesConfig.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/BackgroundServicesConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.thrift.server.config; +package org.apache.airavata.server.thrift.config; import java.util.Arrays; import java.util.List; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/ThriftProcessorConfig.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/ThriftProcessorConfig.java similarity index 91% rename from airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/ThriftProcessorConfig.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/ThriftProcessorConfig.java index 7b888b1311..1c121162b6 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/ThriftProcessorConfig.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/ThriftProcessorConfig.java @@ -17,22 +17,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.thrift.server.config; +package org.apache.airavata.server.thrift.config; import org.apache.airavata.api.Airavata; -import org.apache.airavata.api.server.handler.AiravataServerHandler; +import org.apache.airavata.server.thrift.handler.AiravataServerHandler; import org.apache.airavata.credential.handler.CredentialStoreServerHandler; import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.execution.handler.RegistryServerHandler; import org.apache.airavata.orchestrator.cpi.OrchestratorService; -import org.apache.airavata.orchestrator.server.OrchestratorServerHandler; +import org.apache.airavata.server.thrift.handler.OrchestratorServerHandler; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService; import org.apache.airavata.service.profile.groupmanager.cpi.group_manager_cpiConstants; -import org.apache.airavata.service.profile.handlers.GroupManagerServiceHandler; -import org.apache.airavata.service.profile.handlers.IamAdminServicesHandler; -import org.apache.airavata.service.profile.handlers.TenantProfileServiceHandler; -import org.apache.airavata.service.profile.handlers.UserProfileServiceHandler; +import org.apache.airavata.server.thrift.handler.GroupManagerServiceHandler; +import org.apache.airavata.server.thrift.handler.IamAdminServicesHandler; +import org.apache.airavata.server.thrift.handler.TenantProfileServiceHandler; +import org.apache.airavata.server.thrift.handler.UserProfileServiceHandler; import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices; import org.apache.airavata.service.profile.iam.admin.services.cpi.iam_admin_services_cpiConstants; import org.apache.airavata.service.profile.tenant.cpi.TenantProfileService; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/ThriftServerLifecycle.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/ThriftServerLifecycle.java similarity index 98% rename from airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/ThriftServerLifecycle.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/ThriftServerLifecycle.java index 9d5b1b429b..2afc68e041 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/thrift/server/config/ThriftServerLifecycle.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/config/ThriftServerLifecycle.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.thrift.server.config; +package org.apache.airavata.server.thrift.config; import java.net.InetSocketAddress; import org.apache.thrift.TMultiplexedProcessor; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/AiravataServerHandler.java similarity index 99% rename from airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/AiravataServerHandler.java index 7489a40328..bc8e316f35 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/AiravataServerHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.api.server.handler; +package org.apache.airavata.server.thrift.handler; import java.util.*; import java.util.function.BiFunction; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/GroupManagerServiceHandler.java similarity index 99% rename from airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/GroupManagerServiceHandler.java index c516376476..fd6c81e09c 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/GroupManagerServiceHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.server.thrift.handler; import java.util.ArrayList; import java.util.List; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/IamAdminServicesHandler.java similarity index 99% rename from airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/IamAdminServicesHandler.java index bc6b42a735..6db594fc86 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/IamAdminServicesHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.server.thrift.handler; import java.util.List; import org.apache.airavata.common.config.Constants; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/OrchestratorServerHandler.java similarity index 99% rename from airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/OrchestratorServerHandler.java index 2f2b753c4d..c86d695c74 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/OrchestratorServerHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.orchestrator.server; +package org.apache.airavata.server.thrift.handler; import java.text.MessageFormat; import java.util.*; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/TenantProfileServiceHandler.java similarity index 99% rename from airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/TenantProfileServiceHandler.java index e107bc323b..928182a2a1 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/TenantProfileServiceHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.server.thrift.handler; import java.util.List; import java.util.UUID; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/ThriftAdapter.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/ThriftAdapter.java similarity index 98% rename from airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/ThriftAdapter.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/ThriftAdapter.java index 8aaba3df95..0c2ec0cfec 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/ThriftAdapter.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/ThriftAdapter.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.api.server.handler; +package org.apache.airavata.server.thrift.handler; import java.util.Map; import org.apache.airavata.common.config.Constants; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/UserProfileServiceHandler.java similarity index 99% rename from airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/UserProfileServiceHandler.java index 510a438fdd..dcbb9a44cb 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/handler/UserProfileServiceHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.server.thrift.handler; import java.util.List; import org.apache.airavata.common.config.Constants; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/mapper/WorkspaceMapper.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/mapper/WorkspaceMapper.java similarity index 98% rename from airavata-thrift-server/src/main/java/org/apache/airavata/api/server/mapper/WorkspaceMapper.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/mapper/WorkspaceMapper.java index aff29a9c30..3564a1de5c 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/mapper/WorkspaceMapper.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/mapper/WorkspaceMapper.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.api.server.mapper; +package org.apache.airavata.server.thrift.mapper; import java.util.List; import org.apache.airavata.model.workspace.proto.Project; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/util/Constants.java b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/util/Constants.java similarity index 95% rename from airavata-thrift-server/src/main/java/org/apache/airavata/api/server/util/Constants.java rename to airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/util/Constants.java index b0e8ef56a7..fc5cda4fd1 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/util/Constants.java +++ b/airavata-server/thrift/src/main/java/org/apache/airavata/server/thrift/util/Constants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.api.server.util; +package org.apache.airavata.server.thrift.util; public class Constants { public static final String API_SERVER_PORT = "apiserver.port"; diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/airavata_api.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/airavata_api.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/airavata_api.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/airavata_api.thrift diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/airavata_commons.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/airavata_commons.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/airavata_commons.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/airavata_commons.thrift diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/airavata_errors.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/airavata_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/airavata_errors.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/airavata_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/db_event_model.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/db_event_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/db_event_model.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/db_event_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/messaging_events.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/messaging_events.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/messaging_events.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/messaging_events.thrift diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/security_model.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/security_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/security_model.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/security_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/airavata-apis/workflow_api.thrift b/airavata-server/thrift/src/main/thrift/airavata-apis/workflow_api.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/airavata-apis/workflow_api.thrift rename to airavata-server/thrift/src/main/thrift/airavata-apis/workflow_api.thrift diff --git a/airavata-thrift-server/src/main/thrift/base-api/base_api.thrift b/airavata-server/thrift/src/main/thrift/base-api/base_api.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/base-api/base_api.thrift rename to airavata-server/thrift/src/main/thrift/base-api/base_api.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/account_provisioning_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/account_provisioning_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/account_provisioning_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/account_provisioning_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/application_deployment_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/application_deployment_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/application_deployment_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/application_deployment_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/application_interface_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/application_interface_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/application_interface_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/application_interface_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/application_io_models.thrift b/airavata-server/thrift/src/main/thrift/data-models/application_io_models.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/application_io_models.thrift rename to airavata-server/thrift/src/main/thrift/data-models/application_io_models.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/compute_resource_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/compute_resource_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/compute_resource_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/compute_resource_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/credential_store_models.thrift b/airavata-server/thrift/src/main/thrift/data-models/credential_store_models.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/credential_store_models.thrift rename to airavata-server/thrift/src/main/thrift/data-models/credential_store_models.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/data_movement_models.thrift b/airavata-server/thrift/src/main/thrift/data-models/data_movement_models.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/data_movement_models.thrift rename to airavata-server/thrift/src/main/thrift/data-models/data_movement_models.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/experiment_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/experiment_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/experiment_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/experiment_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/gateway_groups_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/gateway_groups_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/gateway_groups_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/gateway_groups_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/gateway_resource_profile_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/gateway_resource_profile_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/gateway_resource_profile_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/gateway_resource_profile_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/group_manager_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/group_manager_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/group_manager_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/group_manager_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/group_resource_profile_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/group_resource_profile_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/group_resource_profile_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/group_resource_profile_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/job_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/job_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/job_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/job_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/parallelism_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/parallelism_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/parallelism_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/parallelism_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/parser_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/parser_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/parser_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/parser_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/process_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/process_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/process_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/process_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/replica_catalog_models.thrift b/airavata-server/thrift/src/main/thrift/data-models/replica_catalog_models.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/replica_catalog_models.thrift rename to airavata-server/thrift/src/main/thrift/data-models/replica_catalog_models.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/scheduling_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/scheduling_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/scheduling_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/scheduling_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/sharing_models.thrift b/airavata-server/thrift/src/main/thrift/data-models/sharing_models.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/sharing_models.thrift rename to airavata-server/thrift/src/main/thrift/data-models/sharing_models.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/status_models.thrift b/airavata-server/thrift/src/main/thrift/data-models/status_models.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/status_models.thrift rename to airavata-server/thrift/src/main/thrift/data-models/status_models.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/storage_resource_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/storage_resource_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/storage_resource_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/storage_resource_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/task_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/task_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/task_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/task_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/tenant_profile_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/tenant_profile_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/tenant_profile_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/tenant_profile_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/user_profile_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/user_profile_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/user_profile_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/user_profile_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/user_resource_profile_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/user_resource_profile_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/user_resource_profile_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/user_resource_profile_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/workflow_data_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/workflow_data_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/workflow_data_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/workflow_data_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/workflow_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/workflow_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/workflow_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/workflow_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/data-models/workspace_model.thrift b/airavata-server/thrift/src/main/thrift/data-models/workspace_model.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/data-models/workspace_model.thrift rename to airavata-server/thrift/src/main/thrift/data-models/workspace_model.thrift diff --git a/airavata-thrift-server/src/main/thrift/generate-thrift-stubs.sh b/airavata-server/thrift/src/main/thrift/generate-thrift-stubs.sh similarity index 100% rename from airavata-thrift-server/src/main/thrift/generate-thrift-stubs.sh rename to airavata-server/thrift/src/main/thrift/generate-thrift-stubs.sh diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/credential-store-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/credential-store-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/credential-store-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/credential-store-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/credential_store_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/credential_store_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/credential_store_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/credential_store_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/orchestrator-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/orchestrator-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/orchestrator-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/orchestrator-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/group-manager/group-manager-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/group-manager/group-manager-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/group-manager/group-manager-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/group-manager/group-manager-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/group-manager/group_manager_cpi_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/group-manager/group_manager_cpi_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/group-manager/group_manager_cpi_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/group-manager/group_manager_cpi_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam-admin-services-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam-admin-services-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam-admin-services-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam-admin-services-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam_admin_services_cpi_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam_admin_services_cpi_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam_admin_services_cpi_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/iam-admin-services/iam_admin_services_cpi_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-tenant/profile-tenant-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-tenant/profile-tenant-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-tenant/profile-tenant-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-tenant/profile-tenant-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-tenant/profile_tenant_cpi_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-tenant/profile_tenant_cpi_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-tenant/profile_tenant_cpi_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-tenant/profile_tenant_cpi_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-user/profile-user-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-user/profile-user-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-user/profile-user-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-user/profile-user-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-user/profile_user_cpi_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-user/profile_user_cpi_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/profile-service/profile-user/profile_user_cpi_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/profile-service/profile-user/profile_user_cpi_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/registry-api.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/registry-api.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/registry-api.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/registry-api.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/registry_api_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/registry_api_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/registry_api_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/registry_api_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/sharing_cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/sharing_cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/sharing_cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/sharing_cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/user-profile-cpi.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/user-profile-cpi.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/user-profile-cpi.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/user-profile-cpi.thrift diff --git a/airavata-thrift-server/src/main/thrift/service-cpis/user_profile_cpi_errors.thrift b/airavata-server/thrift/src/main/thrift/service-cpis/user_profile_cpi_errors.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/service-cpis/user_profile_cpi_errors.thrift rename to airavata-server/thrift/src/main/thrift/service-cpis/user_profile_cpi_errors.thrift diff --git a/airavata-thrift-server/src/main/thrift/stubs_java.thrift b/airavata-server/thrift/src/main/thrift/stubs_java.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/stubs_java.thrift rename to airavata-server/thrift/src/main/thrift/stubs_java.thrift diff --git a/airavata-thrift-server/src/main/thrift/stubs_php.thrift b/airavata-server/thrift/src/main/thrift/stubs_php.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/stubs_php.thrift rename to airavata-server/thrift/src/main/thrift/stubs_php.thrift diff --git a/airavata-thrift-server/src/main/thrift/stubs_python.thrift b/airavata-server/thrift/src/main/thrift/stubs_python.thrift similarity index 100% rename from airavata-thrift-server/src/main/thrift/stubs_python.thrift rename to airavata-server/thrift/src/main/thrift/stubs_python.thrift diff --git a/airavata-thrift-server/pom.xml b/airavata-thrift-server/pom.xml deleted file mode 100644 index f04088d66e..0000000000 --- a/airavata-thrift-server/pom.xml +++ /dev/null @@ -1,83 +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>airavata-thrift-server</artifactId> - <packaging>jar</packaging> - <name>Airavata Thrift Server</name> - - <dependencies> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <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/pom.xml b/pom.xml index 1a0dc0d595..0b0c9af810 100644 --- a/pom.xml +++ b/pom.xml @@ -69,13 +69,13 @@ under the License. <modules> <module>airavata-api</module> - <module>airavata-thrift-server</module> + <module>airavata-server/thrift</module> <module>integration-tests</module> <module>airavata-api/file-server</module> <module>airavata-api/agent-service</module> <module>airavata-api/research-service</module> - <module>airavata-rest-server</module> - <module>airavata-grpc-server</module> + <module>airavata-server/rest</module> + <module>airavata-server/grpc</module> <module>airavata-server</module> </modules>
