This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch fat-airavata-api in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5c70fb63ae66dc5bc461431fb5576679b64831ff Author: yasithdev <[email protected]> AuthorDate: Wed Jun 25 00:04:52 2025 -0500 move profile-service to modules/ --- airavata-services/pom.xml | 60 -------------------- airavata-services/profile-service/pom.xml | 45 --------------- .../profile-service/README | 0 .../iam-admin-services-core/pom.xml | 0 .../core/impl/TenantManagementKeycloakImpl.java | 0 .../core/interfaces/TenantManagementInterface.java | 0 .../admin/services/core/tests/SetupNewGateway.java | 0 modules/profile-service/pom.xml | 66 ++++++++++++++++++++++ .../java-client-samples/pom.xml | 0 .../profile/client/samples/GroupManagerSample.java | 0 .../client/samples/TenantProfileSample.java | 0 .../profile/client/samples/UserProfileSample.java | 0 .../client/util/ProfileServiceClientUtil.java | 0 .../resources/profile-client-sample.properties | 0 .../profile-service-client-sdks/pom.xml | 0 .../profile-service-commons/pom.xml | 0 .../commons/repositories/AbstractRepository.java | 0 .../commons/tenant/entities/GatewayEntity.java | 0 .../user/entities/CustomizedDashboardEntity.java | 0 .../user/entities/NSFDemographicsEntity.java | 0 .../commons/user/entities/UserProfileEntity.java | 0 .../service/profile/commons/utils/Committer.java | 0 .../profile/commons/utils/JPAConstants.java | 0 .../service/profile/commons/utils/JPAUtils.java | 0 .../commons/utils/ObjectMapperSingleton.java | 0 .../commons/utils/ProfileServiceJDBCConfig.java | 0 .../profile/commons/utils/QueryConstants.java | 0 .../service/profile/commons/utils/Utils.java | 0 .../src/main/resources/META-INF/persistence.xml | 0 .../profile-service/profile-service-server/pom.xml | 0 .../handlers/GroupManagerServiceHandler.java | 0 .../profile/handlers/IamAdminServicesHandler.java | 0 .../handlers/TenantProfileServiceHandler.java | 0 .../handlers/UserProfileServiceHandler.java | 0 .../profile/server/ProfileServiceServer.java | 0 .../profile-service/profile-service-stubs/pom.xml | 0 .../client/ProfileServiceClientFactory.java | 0 .../profile-service/profile-tenant-core/pom.xml | 0 .../core/repositories/TenantProfileRepository.java | 0 .../profile-service/profile-user-core/pom.xml | 0 .../exceptions/UserProfileRegistryException.java | 0 .../core/repositories/UserProfileRepository.java | 0 .../core/utils/UserProfileCatalogDBInitConfig.java | 0 .../core/utils/UserProfileCatalogJDBCConfig.java | 0 .../main/resources/user-profile-catalog-derby.sql | 0 .../main/resources/user-profile-catalog-mysql.sql | 0 .../core/repositories/WorkspaceRepositoryTest.java | 0 pom.xml | 2 +- 48 files changed, 67 insertions(+), 106 deletions(-) diff --git a/airavata-services/pom.xml b/airavata-services/pom.xml deleted file mode 100644 index 5c3e35c99e..0000000000 --- a/airavata-services/pom.xml +++ /dev/null @@ -1,60 +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";> - <parent> - <artifactId>airavata</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>airavata-services</artifactId> - <packaging>pom</packaging> - <name>Airavata Services</name> - <url>http://airavata.apache.org/</url> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>${thrift.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-configuration</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <modules> - <module>profile-service</module> - </modules> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> -</project> diff --git a/airavata-services/profile-service/pom.xml b/airavata-services/profile-service/pom.xml deleted file mode 100644 index e8b668a059..0000000000 --- a/airavata-services/profile-service/pom.xml +++ /dev/null @@ -1,45 +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-services</artifactId> - <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <name>Profile Service</name> - <artifactId>profile-service</artifactId> - <packaging>pom</packaging> - <url>http://airavata.apache.org/</url> - - <modules> - <module>profile-service-stubs</module> - <module>profile-service-commons</module> - <module>profile-user-core</module> - <module>profile-tenant-core</module> - <module>profile-service-server</module> - <module>profile-service-client-sdks</module> - <module>iam-admin-services-core</module> - </modules> - -</project> diff --git a/airavata-services/profile-service/README b/modules/profile-service/README similarity index 100% rename from airavata-services/profile-service/README rename to modules/profile-service/README diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/modules/profile-service/iam-admin-services-core/pom.xml similarity index 100% rename from airavata-services/profile-service/iam-admin-services-core/pom.xml rename to modules/profile-service/iam-admin-services-core/pom.xml diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/modules/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java similarity index 100% rename from airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java rename to modules/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java b/modules/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java similarity index 100% rename from airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java rename to modules/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java diff --git a/airavata-services/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java b/modules/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java similarity index 100% rename from airavata-services/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java rename to modules/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java diff --git a/modules/profile-service/pom.xml b/modules/profile-service/pom.xml new file mode 100644 index 0000000000..d9b12d95dd --- /dev/null +++ b/modules/profile-service/pom.xml @@ -0,0 +1,66 @@ +<!-- +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> + + <name>Profile Service</name> + <artifactId>profile-service</artifactId> + <packaging>pom</packaging> + <url>http://airavata.apache.org/</url> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${thrift.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-server-configuration</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <modules> + <module>profile-service-stubs</module> + <module>profile-service-commons</module> + <module>profile-user-core</module> + <module>profile-tenant-core</module> + <module>profile-service-server</module> + <module>profile-service-client-sdks</module> + <module>iam-admin-services-core</module> + </modules> + +</project> \ No newline at end of file diff --git a/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/pom.xml b/modules/profile-service/profile-service-client-sdks/java-client-samples/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/java-client-samples/pom.xml rename to modules/profile-service/profile-service-client-sdks/java-client-samples/pom.xml diff --git a/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java b/modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java rename to modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java diff --git a/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java b/modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java rename to modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java diff --git a/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java b/modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java rename to modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java diff --git a/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java b/modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java rename to modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java diff --git a/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/resources/profile-client-sample.properties b/modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/resources/profile-client-sample.properties similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/resources/profile-client-sample.properties rename to modules/profile-service/profile-service-client-sdks/java-client-samples/src/main/resources/profile-client-sample.properties diff --git a/airavata-services/profile-service/profile-service-client-sdks/pom.xml b/modules/profile-service/profile-service-client-sdks/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-service-client-sdks/pom.xml rename to modules/profile-service/profile-service-client-sdks/pom.xml diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/modules/profile-service/profile-service-commons/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-service-commons/pom.xml rename to modules/profile-service/profile-service-commons/pom.xml diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java b/modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java rename to modules/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java diff --git a/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml b/modules/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml similarity index 100% rename from airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml rename to modules/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml diff --git a/airavata-services/profile-service/profile-service-server/pom.xml b/modules/profile-service/profile-service-server/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-service-server/pom.xml rename to modules/profile-service/profile-service-server/pom.xml diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java similarity index 100% rename from airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java rename to modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java b/modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java similarity index 100% rename from airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java rename to modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java b/modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java similarity index 100% rename from airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java rename to modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java b/modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java similarity index 100% rename from airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java rename to modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java b/modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java similarity index 100% rename from airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java rename to modules/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java diff --git a/airavata-services/profile-service/profile-service-stubs/pom.xml b/modules/profile-service/profile-service-stubs/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-service-stubs/pom.xml rename to modules/profile-service/profile-service-stubs/pom.xml diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java b/modules/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java similarity index 100% rename from airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java rename to modules/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java diff --git a/airavata-services/profile-service/profile-tenant-core/pom.xml b/modules/profile-service/profile-tenant-core/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-tenant-core/pom.xml rename to modules/profile-service/profile-tenant-core/pom.xml diff --git a/airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java b/modules/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java similarity index 100% rename from airavata-services/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java rename to modules/profile-service/profile-tenant-core/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/modules/profile-service/profile-user-core/pom.xml similarity index 100% rename from airavata-services/profile-service/profile-user-core/pom.xml rename to modules/profile-service/profile-user-core/pom.xml diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java b/modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java rename to modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java b/modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java rename to modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java b/modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java rename to modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java b/modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java rename to modules/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java diff --git a/airavata-services/profile-service/profile-user-core/src/main/resources/user-profile-catalog-derby.sql b/modules/profile-service/profile-user-core/src/main/resources/user-profile-catalog-derby.sql similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/main/resources/user-profile-catalog-derby.sql rename to modules/profile-service/profile-user-core/src/main/resources/user-profile-catalog-derby.sql diff --git a/airavata-services/profile-service/profile-user-core/src/main/resources/user-profile-catalog-mysql.sql b/modules/profile-service/profile-user-core/src/main/resources/user-profile-catalog-mysql.sql similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/main/resources/user-profile-catalog-mysql.sql rename to modules/profile-service/profile-user-core/src/main/resources/user-profile-catalog-mysql.sql diff --git a/airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java b/modules/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java similarity index 100% rename from airavata-services/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java rename to modules/profile-service/profile-user-core/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java diff --git a/pom.xml b/pom.xml index 58ece29939..d44b586309 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ under the License. <modules> <module>airavata-api</module> - <module>airavata-services</module> + <module>modules/profile-service</module> <module>modules/configuration</module> <module>modules/registry</module> <module>modules/orchestrator</module>
