This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch distribution-improvements in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 2f0ca24c585d4c4f9a7562576e4fb4e173f54915 Author: yasithdev <[email protected]> AuthorDate: Sun Jun 29 11:40:57 2025 -0500 flatten registry-tools inside modules --- modules/agent-framework/agent-service/pom.xml | 330 ++++++++++---------- modules/agent-framework/pom.xml | 50 --- modules/file-server/pom.xml | 2 +- modules/ide-integration/pom.xml | 1 + .../README => registry-db-migrator/README.md} | 4 +- .../registry-tool => registry-db-migrator}/pom.xml | 8 +- .../apache/airavata/registry/tool/DBMigrator.java | 0 .../src/main/resources/db-migrate.sh | 0 .../resources/db-scripts/0.6/migrate_derby.sql | 0 .../resources/db-scripts/0.6/migrate_mysql.sql | 0 .../resources/db-scripts/0.7/migrate_derby.sql | 0 .../resources/db-scripts/0.7/migrate_mysql.sql | 0 .../resources/db-scripts/0.8/migrate_derby.sql | 0 .../resources/db-scripts/0.8/migrate_mysql.sql | 0 .../jpa-gen => registry-jpa-generator}/pom.xml | 4 +- .../computeresource/BatchQueueGenerator.java | 0 .../ComputeResourceDescriptionGenerator.java | 0 .../DataMovementInterfaceGenerator.java | 0 .../computeresource/FileSystemsGenerator.java | 0 .../GridFTPDataMovementGenerator.java | 0 .../computeresource/GridFTPEndpointsGenerator.java | 0 .../JobManagerCommandGenerator.java | 0 .../JobSubmissionInterfaceGenerator.java | 0 .../LocalDataMovementGenerator.java | 0 .../computeresource/LocalSubmissionGenerator.java | 0 .../computeresource/ModuleCMDGenerator.java | 0 .../ResourceJobManagerGenerator.java | 0 .../computeresource/SCPDataMovementGenerator.java | 0 .../computeresource/SSHJobSubmissionGenerator.java | 0 .../main/java/generators/AbstractGenerator.java | 0 .../main/java/generators/JPAClassGenerator.java | 0 .../java/generators/JPAResourceClassGenerator.java | 0 .../src/main/java/generators/SQLGenerator.java | 0 .../src/main/java/model/JPAClassField.java | 0 .../src/main/java/model/JPAClassModel.java | 0 .../src/main/java/model/JPAPKClassModel.java | 0 .../src/main/java/model/JPAResourceClassModel.java | 0 .../src/main/java/model/SQLData.java | 0 .../src/main/java/test/Test.java | 0 modules/registry-tools/pom.xml | 47 --- modules/research-framework/pom.xml | 36 --- .../research-framework/research-service/pom.xml | 343 +++++++++++---------- pom.xml | 7 +- 43 files changed, 360 insertions(+), 472 deletions(-) diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml index 773d55d6ca..ae7cc8b027 100644 --- a/modules/agent-framework/agent-service/pom.xml +++ b/modules/agent-framework/agent-service/pom.xml @@ -17,168 +17,184 @@ 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>agent-framework</artifactId> - <version>0.21-SNAPSHOT</version> - </parent> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata</artifactId> + <version>0.21-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> - <artifactId>agent-service</artifactId> + <artifactId>agent-service</artifactId> + <name>Airavata Agent Service</name> - <properties> - <agent.service.dist.name>apache-airavata-agent-service-${project.version}</agent.service.dist.name> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>3.2.4</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-bom</artifactId> - <version>1.71.0</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> + <properties> + <agent.service.dist.name>apache-airavata-agent-service-${project.version}</agent.service.dist.name> + </properties> + <dependencyManagement> <dependencies> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-stub</artifactId> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-protobuf</artifactId> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </dependency> - <dependency> - <groupId>net.devh</groupId> - <artifactId>grpc-server-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-api</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>3.2.4</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-bom</artifactId> + <version>1.71.0</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> + <groupId>net.devh</groupId> + <artifactId>grpc-server-spring-boot-starter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-api</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <build> - <extensions> - <extension> - <groupId>kr.motd.maven</groupId> - <artifactId>os-maven-plugin</artifactId> - </extension> - </extensions> + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + </extension> + </extensions> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>agent-service-distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <tarLongFileMode>posix</tarLongFileMode> - <finalName>${agent.service.dist.name}</finalName> - <descriptors> - <descriptor>src/main/assembly/agent-service-bin-assembly.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.github.ascopes</groupId> - <artifactId>protobuf-maven-plugin</artifactId> - <configuration> - <protocVersion>4.30.1</protocVersion> - <sourceDirectories> - <sourceDirectory>${project.parent.basedir}/proto</sourceDirectory> - </sourceDirectories> - <binaryMavenPlugins> - <binaryMavenPlugin> - <groupId>io.grpc</groupId> - <artifactId>protoc-gen-grpc-java</artifactId> - <version>1.71.0</version> - <options>@generated=omit</options> - </binaryMavenPlugin> - </binaryMavenPlugins> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <phase>generate-sources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <release>17</release> - </configuration> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>agent-service-distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <tarLongFileMode>posix</tarLongFileMode> + <finalName>${agent.service.dist.name}</finalName> + <descriptors> + <descriptor>src/main/assembly/agent-service-bin-assembly.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.github.ascopes</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <configuration> + <protocVersion>4.30.1</protocVersion> + <sourceDirectories> + <sourceDirectory>${project.basedir}/../proto</sourceDirectory> + </sourceDirectories> + <binaryMavenPlugins> + <binaryMavenPlugin> + <groupId>io.grpc</groupId> + <artifactId>protoc-gen-grpc-java</artifactId> + <version>1.71.0</version> + <options>@generated=omit</options> + </binaryMavenPlugin> + </binaryMavenPlugins> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <phase>generate-sources</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>17</release> + </configuration> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.parent.basedir}/keystores</directory> + <targetPath>keystores</targetPath> + <includes> + <include>*.jks</include> + <include>*.p12</include> + </includes> + </resource> + </resources> + </build> -</project> +</project> \ No newline at end of file diff --git a/modules/agent-framework/pom.xml b/modules/agent-framework/pom.xml deleted file mode 100644 index 07d08e6e0e..0000000000 --- a/modules/agent-framework/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata</artifactId> - <version>0.21-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>agent-framework</artifactId> - <packaging>pom</packaging> - - <build> - <resources> - <resource> - <directory>../../keystores</directory> - <targetPath>keystores</targetPath> - <includes> - <include>*.jks</include> - <include>*.p12</include> - </includes> - </resource> - </resources> - </build> - - <modules> - <module>agent-service</module> - </modules> - -</project> \ No newline at end of file diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml index 9728864006..9e2d80ec31 100644 --- a/modules/file-server/pom.xml +++ b/modules/file-server/pom.xml @@ -26,7 +26,7 @@ under the License. <relativePath>../../pom.xml</relativePath> </parent> <artifactId>file-server</artifactId> - <name>airavata-file-server</name> + <name>Airavata File Server</name> <dependencies> <dependency> diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml index 01108b8191..ace526be96 100644 --- a/modules/ide-integration/pom.xml +++ b/modules/ide-integration/pom.xml @@ -26,6 +26,7 @@ under the License. <modelVersion>4.0.0</modelVersion> <artifactId>ide-integration</artifactId> + <name>Airavata IDE Integration</name> <packaging>pom</packaging> <dependencies> diff --git a/modules/registry-tools/registry-tool/README b/modules/registry-db-migrator/README.md similarity index 52% rename from modules/registry-tools/registry-tool/README rename to modules/registry-db-migrator/README.md index 40a8e65ab5..c2427334b2 100644 --- a/modules/registry-tools/registry-tool/README +++ b/modules/registry-db-migrator/README.md @@ -1,8 +1,8 @@ 0.7 => 0.8 ============== -1. Build registry-tools -2. Copy registry-tool-0.8-SNAPSHOT.jar and commons-cli-1.1.jar (you will find this in your maven repository) to <AIRAVATA_HOME>/lib +1. Build registry-db-migrator +2. Copy registry-db-migrator-0.8-SNAPSHOT.jar and commons-cli-1.1.jar (you will find this in your maven repository) to <AIRAVATA_HOME>/lib 3. Copy db-migrate.sh file to <AIRAVATA_HOME>/bin 4. Make sure previous version of airavata database is up and running 5. Run db-migrate.sh script file diff --git a/modules/registry-tools/registry-tool/pom.xml b/modules/registry-db-migrator/pom.xml similarity index 91% rename from modules/registry-tools/registry-tool/pom.xml rename to modules/registry-db-migrator/pom.xml index 1ebd5b2801..c8615059c6 100644 --- a/modules/registry-tools/registry-tool/pom.xml +++ b/modules/registry-db-migrator/pom.xml @@ -19,15 +19,15 @@ 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";> <parent> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-registry-tools</artifactId> + <artifactId>airavata</artifactId> <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>registry-tool</artifactId> + <artifactId>registry-db-migrator</artifactId> <packaging>jar</packaging> - <name>registry-tool</name> + <name>Airavata Registry Tools - DB Migrator</name> <dependencies> <dependency> diff --git a/modules/registry-tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java b/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java similarity index 100% rename from modules/registry-tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java rename to modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-migrate.sh b/modules/registry-db-migrator/src/main/resources/db-migrate.sh similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-migrate.sh rename to modules/registry-db-migrator/src/main/resources/db-migrate.sh diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_derby.sql similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql rename to modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_derby.sql diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_mysql.sql similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql rename to modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_mysql.sql diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.7/migrate_derby.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_derby.sql similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.7/migrate_derby.sql rename to modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_derby.sql diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.7/migrate_mysql.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_mysql.sql similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.7/migrate_mysql.sql rename to modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_mysql.sql diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_derby.sql similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql rename to modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_derby.sql diff --git a/modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_mysql.sql similarity index 100% rename from modules/registry-tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql rename to modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_mysql.sql diff --git a/modules/registry-tools/jpa-gen/pom.xml b/modules/registry-jpa-generator/pom.xml similarity index 92% rename from modules/registry-tools/jpa-gen/pom.xml rename to modules/registry-jpa-generator/pom.xml index c100926f1b..d6a7b05e1f 100644 --- a/modules/registry-tools/jpa-gen/pom.xml +++ b/modules/registry-jpa-generator/pom.xml @@ -26,9 +26,9 @@ under the License. </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jpa-gen</artifactId> + <artifactId>registry-jpa-generator</artifactId> <packaging>jar</packaging> - <name>JPA Class Data Generator</name> + <name>Airavata Registry Tools - JPA Class Generator</name> <url>http://airavata.apache.org/</url> <dependencies> diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java b/modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java rename to modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/generators/AbstractGenerator.java b/modules/registry-jpa-generator/src/main/java/generators/AbstractGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/generators/AbstractGenerator.java rename to modules/registry-jpa-generator/src/main/java/generators/AbstractGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java b/modules/registry-jpa-generator/src/main/java/generators/JPAClassGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java rename to modules/registry-jpa-generator/src/main/java/generators/JPAClassGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/generators/JPAResourceClassGenerator.java b/modules/registry-jpa-generator/src/main/java/generators/JPAResourceClassGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/generators/JPAResourceClassGenerator.java rename to modules/registry-jpa-generator/src/main/java/generators/JPAResourceClassGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/generators/SQLGenerator.java b/modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/generators/SQLGenerator.java rename to modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/model/JPAClassField.java b/modules/registry-jpa-generator/src/main/java/model/JPAClassField.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/model/JPAClassField.java rename to modules/registry-jpa-generator/src/main/java/model/JPAClassField.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/model/JPAClassModel.java b/modules/registry-jpa-generator/src/main/java/model/JPAClassModel.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/model/JPAClassModel.java rename to modules/registry-jpa-generator/src/main/java/model/JPAClassModel.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/model/JPAPKClassModel.java b/modules/registry-jpa-generator/src/main/java/model/JPAPKClassModel.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/model/JPAPKClassModel.java rename to modules/registry-jpa-generator/src/main/java/model/JPAPKClassModel.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/model/JPAResourceClassModel.java b/modules/registry-jpa-generator/src/main/java/model/JPAResourceClassModel.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/model/JPAResourceClassModel.java rename to modules/registry-jpa-generator/src/main/java/model/JPAResourceClassModel.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/model/SQLData.java b/modules/registry-jpa-generator/src/main/java/model/SQLData.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/model/SQLData.java rename to modules/registry-jpa-generator/src/main/java/model/SQLData.java diff --git a/modules/registry-tools/jpa-gen/src/main/java/test/Test.java b/modules/registry-jpa-generator/src/main/java/test/Test.java similarity index 100% rename from modules/registry-tools/jpa-gen/src/main/java/test/Test.java rename to modules/registry-jpa-generator/src/main/java/test/Test.java diff --git a/modules/registry-tools/pom.xml b/modules/registry-tools/pom.xml deleted file mode 100644 index 0281d0c96e..0000000000 --- a/modules/registry-tools/pom.xml +++ /dev/null @@ -1,47 +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";> - - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata</artifactId> - <version>0.21-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>airavata-registry-tools</artifactId> - <packaging>pom</packaging> - <name>Airavata Registry Tools</name> - <url>http://airavata.apache.org/</url> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>jpa-gen</module> - <module>registry-tool</module> - </modules> - </profile> - </profiles> - -</project> diff --git a/modules/research-framework/pom.xml b/modules/research-framework/pom.xml deleted file mode 100644 index 930d7a85e0..0000000000 --- a/modules/research-framework/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata</artifactId> - <version>0.21-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>research-framework</artifactId> - <packaging>pom</packaging> - <modules> - <module>research-service</module> - </modules> - -</project> \ No newline at end of file diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml index 58b756a7ee..5b1a1833b2 100644 --- a/modules/research-framework/research-service/pom.xml +++ b/modules/research-framework/research-service/pom.xml @@ -17,184 +17,187 @@ 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>research-framework</artifactId> - <version>0.21-SNAPSHOT</version> - </parent> + 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> - <artifactId>research-service</artifactId> + <parent> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata</artifactId> + <version>0.21-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> - <properties> - <research.service.dist.name>apache-airavata-research-service-${project.version}</research.service.dist.name> - </properties> + <artifactId>research-service</artifactId> + <name>Airavata Research Service</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>3.2.4</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-bom</artifactId> - <version>1.71.0</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> + <properties> + <research.service.dist.name>apache-airavata-research-service-${project.version}</research.service.dist.name> + </properties> + <dependencyManagement> <dependencies> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-stub</artifactId> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-protobuf</artifactId> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </dependency> - <dependency> - <groupId>net.devh</groupId> - <artifactId>grpc-server-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - <!-- <dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>3.2.4</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-bom</artifactId> + <version>1.71.0</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springdoc</groupId> + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> + <groupId>net.devh</groupId> + <artifactId>grpc-server-spring-boot-starter</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + <!-- <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> --> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-api</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-api</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <build> - <extensions> - <extension> - <groupId>kr.motd.maven</groupId> - <artifactId>os-maven-plugin</artifactId> - </extension> - </extensions> + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + </extension> + </extensions> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>research-service-distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <tarLongFileMode>posix</tarLongFileMode> - <finalName>${research.service.dist.name}</finalName> - <descriptors> - <descriptor>src/main/assembly/research-service-bin-assembly.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.github.ascopes</groupId> - <artifactId>protobuf-maven-plugin</artifactId> - <configuration> - <protocVersion>4.30.1</protocVersion> - <sourceDirectories> - <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory> - </sourceDirectories> - <binaryMavenPlugins> - <binaryMavenPlugin> - <groupId>io.grpc</groupId> - <artifactId>protoc-gen-grpc-java</artifactId> - <version>1.71.0</version> - <options>@generated=omit</options> - </binaryMavenPlugin> - </binaryMavenPlugins> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <phase>generate-sources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <release>17</release> - </configuration> - </plugin> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>research-service-distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <tarLongFileMode>posix</tarLongFileMode> + <finalName>${research.service.dist.name}</finalName> + <descriptors> + <descriptor>src/main/assembly/research-service-bin-assembly.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.github.ascopes</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <configuration> + <protocVersion>4.30.1</protocVersion> + <sourceDirectories> + <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory> + </sourceDirectories> + <binaryMavenPlugins> + <binaryMavenPlugin> + <groupId>io.grpc</groupId> + <artifactId>protoc-gen-grpc-java</artifactId> + <version>1.71.0</version> + <options>@generated=omit</options> + </binaryMavenPlugin> + </binaryMavenPlugins> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <phase>generate-sources</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>17</release> + </configuration> + </plugin> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index bbbda4741d..651928b756 100644 --- a/pom.xml +++ b/pom.xml @@ -70,9 +70,10 @@ under the License. <modules> <module>airavata-api</module> <module>modules/file-server</module> - <module>modules/agent-framework</module> - <module>modules/research-framework</module> - <module>modules/registry-tools</module> + <module>modules/agent-framework/agent-service</module> + <module>modules/research-framework/research-service</module> + <module>modules/registry-db-migrator</module> + <module>modules/registry-jpa-generator</module> <module>modules/distribution</module> <module>modules/ide-integration</module> </modules>
