You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/06/25 05:58:28 UTC
(airavata) 08/09: move compute-account-provisioning into airavata-api
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 5a9ad2f24237ba05651b9ce9e34c1bb1659f523d
Author: yasithdev <ya...@icloud.com>
AuthorDate: Wed Jun 25 00:16:27 2025 -0500
move compute-account-provisioning into airavata-api
---
airavata-api/pom.xml | 13 ++---
.../airavata/accountprovisioning/ConfigParam.java | 0
.../accountprovisioning/InvalidSetupException.java | 0
.../InvalidUsernameException.java | 0
.../accountprovisioning/SSHAccountManager.java | 0
.../accountprovisioning/SSHAccountProvisioner.java | 0
.../SSHAccountProvisionerFactory.java | 0
.../SSHAccountProvisionerProvider.java | 0
.../airavata/accountprovisioning/SSHUtil.java | 0
.../provisioner/IULdapSSHAccountProvisioner.java | 0
.../IULdapSSHAccountProvisionerProvider.java | 0
...countprovisioning.SSHAccountProvisionerProvider | 0
.../SSHAccountProvisionerFactoryTest.java | 0
.../provisioner/TestSSHAccountProvisioner.java | 0
.../TestSSHAccountProvisionerProvider.java | 0
...countprovisioning.SSHAccountProvisionerProvider | 0
modules/compute-account-provisioning/pom.xml | 59 ----------------------
pom.xml | 1 -
18 files changed, 7 insertions(+), 66 deletions(-)
diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index ff23e07f8e..86a5eea090 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -21,12 +21,6 @@
</properties>
<dependencies>
- <!-- Airavata clients & stubs -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>compute-account-provisioning</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Core libraries -->
<dependency>
@@ -296,6 +290,13 @@
<artifactId>simpleclient_pushgateway</artifactId>
<version>0.9.0</version>
</dependency>
+
+ <!-- apache directory ldap api! -->
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/InvalidSetupException.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/InvalidSetupException.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/InvalidSetupException.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/InvalidSetupException.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/InvalidUsernameException.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/InvalidUsernameException.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/InvalidUsernameException.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/InvalidUsernameException.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHUtil.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHUtil.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHUtil.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHUtil.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java b/airavata-api/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
similarity index 100%
rename from modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
rename to airavata-api/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
diff --git a/modules/compute-account-provisioning/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider b/airavata-api/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
similarity index 100%
rename from modules/compute-account-provisioning/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
rename to airavata-api/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
diff --git a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java b/airavata-api/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
similarity index 100%
rename from modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
rename to airavata-api/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
diff --git a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java b/airavata-api/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
similarity index 100%
rename from modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
rename to airavata-api/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
diff --git a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java b/airavata-api/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
similarity index 100%
rename from modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
rename to airavata-api/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
diff --git a/modules/compute-account-provisioning/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider b/airavata-api/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
similarity index 100%
rename from modules/compute-account-provisioning/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
rename to airavata-api/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
diff --git a/modules/compute-account-provisioning/pom.xml b/modules/compute-account-provisioning/pom.xml
deleted file mode 100644
index bd14de8888..0000000000
--- a/modules/compute-account-provisioning/pom.xml
+++ /dev/null
@@ -1,59 +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>compute-account-provisioning</artifactId>
-
- <dependencies>
- <dependency>
- <artifactId>airavata-api</artifactId>
- <groupId>org.apache.airavata</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.54</version>
- </dependency>
- <!-- apache directory ldap api! -->
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-all</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.9</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 55a52136c9..f923998584 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@ under the License.
<module>modules/cluster-monitoring</module>
<module>modules/db-event-manager</module>
<module>modules/airavata-helix</module>
- <module>modules/compute-account-provisioning</module>
<module>modules/job-monitor</module>
<module>modules/distribution</module>
<module>modules/airavata-metascheduler</module>