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/05/22 23:30:46 UTC
(airavata) branch cybershuttle-dev updated (d83cfb4e23 -> 89de03740e)
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
discard d83cfb4e23 gather all dependency versions to /pom.xml. fix bugs.
discard dbe10b3f9c update airavata distribution module to match deployment structure
discard 9eabe24a3d fix deprecations, cleanup code. add placeholders for job monitor email/pw in airavata-server.properties
discard 27cf8c0309 fix issues with helix participant and job engine starter
discard 4c2c874b55 get hibernate orm to validate against test db. manually specify catalog for conflicting entities.
discard 582e78a996 migrate openjpa to hibernate, update pool and dbcp deps to pool2 and dbcp2.
discard a22e55cd31 parametrize pom versions. add maven-enforcer rule for dependency convergence and fix version issues.
discard f7ce266948 regenerated thrift stubs with version 0.21.0 and fix issues
discard b6363142d2 bump JDK to v17. create devcontainer setup. bump rabbitmq and proto versions. consolidate maven-compiler plugin versions. migrate openjpa to 4.0.1. update javax to jakarta. regenerate certs. fix bugs.
add 2eb180795d included missing license headers
add 0b5cf3a523 research framework formatting and included missing license headers
add 2eb089f5a2 Merge pull request #500 from apache/cybershuttle-staging
new 0aabc561f8 bump JDK to v17. create devcontainer setup. bump rabbitmq and proto versions. consolidate maven-compiler plugin versions. migrate openjpa to 4.0.1. update javax to jakarta. regenerate certs. fix bugs.
new 6849228a90 regenerated thrift stubs with version 0.21.0 and fix issues
new 1fe9785eba parametrize pom versions. add maven-enforcer rule for dependency convergence and fix version issues.
new 0845d49707 migrate openjpa to hibernate, update pool and dbcp deps to pool2 and dbcp2.
new c22eed23fe get hibernate orm to validate against test db. manually specify catalog for conflicting entities.
new 4adcfa0320 fix issues with helix participant and job engine starter
new d5f575c940 fix deprecations, cleanup code. add placeholders for job monitor email/pw in airavata-server.properties
new d567d3ea27 update airavata distribution module to match deployment structure
new 89de03740e gather all dependency versions to /pom.xml. fix bugs.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d83cfb4e23)
\
N -- N -- N refs/heads/cybershuttle-dev (89de03740e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
modules/agent-framework/agent-service/pom.xml | 19 +++++
.../service/AgentServiceApplication.java | 18 +++++
.../agent/connection/service/UserContext.java | 18 +++++
.../service/config/AuthzTokenFilter.java | 18 +++++
.../service/config/ClusterApplicationConfig.java | 18 +++++
.../service/controllers/AgentController.java | 18 +++++
.../service/controllers/ExperimentController.java | 18 +++++
.../service/controllers/PlanController.java | 18 +++++
.../service/db/entity/AgentDeploymentInfo.java | 18 +++++
.../service/db/entity/AgentExecution.java | 18 +++++
.../service/db/entity/AgentExecutionStatus.java | 18 +++++
.../agent/connection/service/db/entity/Plan.java | 18 +++++
.../service/db/repo/AgentDeploymentInfoRepo.java | 18 +++++
.../service/db/repo/AgentExecutionRepo.java | 18 +++++
.../service/db/repo/AgentExecutionStatusRepo.java | 18 +++++
.../agent/connection/service/db/repo/PlanRepo.java | 18 +++++
.../service/handlers/AgentConnectionHandler.java | 18 +++++
.../service/handlers/AgentManagementHandler.java | 18 +++++
.../connection/service/handlers/FuseFSHandler.java | 18 +++++
.../connection/service/handlers/PlanHandler.java | 18 +++++
.../models/AgentAsyncCommandExecutionRequest.java | 18 +++++
.../models/AgentAsyncCommandExecutionResponse.java | 18 +++++
.../models/AgentAsyncCommandListRequest.java | 18 +++++
.../models/AgentAsyncCommandListResponse.java | 18 +++++
.../models/AgentAsyncCommandTerminateRequest.java | 18 +++++
.../models/AgentAsyncCommandTerminateResponse.java | 18 +++++
.../service/models/AgentCommandExecutionAck.java | 18 +++++
.../models/AgentCommandExecutionRequest.java | 18 +++++
.../models/AgentCommandExecutionResponse.java | 18 +++++
.../service/models/AgentEnvSetupAck.java | 18 +++++
.../service/models/AgentEnvSetupRequest.java | 18 +++++
.../service/models/AgentEnvSetupResponse.java | 18 +++++
.../service/models/AgentInfoResponse.java | 18 +++++
.../service/models/AgentJupyterExecutionAck.java | 18 +++++
.../models/AgentJupyterExecutionRequest.java | 18 +++++
.../models/AgentJupyterExecutionResponse.java | 18 +++++
.../service/models/AgentKernelRestartAck.java | 18 +++++
.../service/models/AgentKernelRestartRequest.java | 18 +++++
.../service/models/AgentKernelRestartResponse.java | 18 +++++
.../service/models/AgentLaunchRequest.java | 18 +++++
.../service/models/AgentLaunchResponse.java | 18 +++++
.../service/models/AgentPythonExecutionAck.java | 18 +++++
.../models/AgentPythonExecutionRequest.java | 18 +++++
.../models/AgentPythonExecutionResponse.java | 18 +++++
.../service/models/AgentTerminateResponse.java | 18 +++++
.../connection/service/models/AgentTunnelAck.java | 18 +++++
.../service/models/AgentTunnelCreateRequest.java | 18 +++++
.../service/models/AgentTunnelCreateResponse.java | 18 +++++
.../models/AgentTunnelTerminateRequest.java | 18 +++++
.../models/AgentTunnelTerminateResponse.java | 18 +++++
.../connection/service/models/AsyncCommand.java | 18 +++++
.../connection/service/models/DirectoryInfo.java | 18 +++++
.../service/models/ExperimentStorageResponse.java | 18 +++++
.../agent/connection/service/models/FileInfo.java | 18 +++++
.../service/services/AiravataFileService.java | 18 +++++
.../service/services/AiravataService.java | 18 +++++
.../src/main/resources/application.yml | 16 +++++
modules/agent-framework/airavata-agent/Dockerfile | 19 +++++
modules/agent-framework/airavata-agent/Makefile | 17 +++++
modules/agent-framework/airavata-agent/README.md | 19 +++++
modules/agent-framework/airavata-agent/agent.go | 17 +++++
modules/agent-framework/airavata-agent/agent.sh | 17 +++++
modules/agent-framework/airavata-agent/kernel.py | 16 +++++
.../agent-framework/airavata-agent/pkg/jupyter.go | 17 +++++
.../agent-framework/airavata-agent/pkg/python.go | 17 +++++
.../agent-framework/airavata-agent/pkg/shell.go | 17 +++++
.../agent-framework/airavata-agent/pkg/tunnel.go | 17 +++++
.../agent-framework/airavata-agent/pkg/types.go | 17 +++++
.../protos/agent-communication.pb.go | 17 +++++
.../protos/agent-communication_grpc.pb.go | 17 +++++
modules/agent-framework/airavata-fuse/Makefile | 17 +++++
modules/agent-framework/airavata-fuse/README.md | 19 +++++
modules/agent-framework/pom.xml | 19 +++++
.../proto/agent-communication.proto | 20 ++++++
.../src/main/resources/conf/application.yml | 16 +++++
.../src/main/resources/conf/application.yml | 16 +++++
.../airavata/file/server/model/AiravataFile.java | 18 +++++
modules/research-framework/pom.xml | 18 +++++
.../research-framework/research-service/README.md | 19 +++++
.../research-framework/research-service/pom.xml | 18 +++++
.../airavata/research/service/AiravataService.java | 18 ++---
.../service/ResearchServiceApplication.java | 18 ++---
.../research/service/config/AuthzTokenFilter.java | 18 ++---
.../service/config/DevDataInitializer.java | 83 +++++++++++-----------
.../research/service/config/OpenApiConfig.java | 21 +++++-
.../research/service/config/WebMvcConfig.java | 7 +-
.../controller/GlobalExceptionController.java | 18 ++---
.../service/controller/ProjectController.java | 18 +++++
.../service/controller/ResearchHubController.java | 18 ++---
.../service/controller/ResourceController.java | 67 ++++++++---------
.../service/controller/SessionController.java | 33 +++++++--
.../research/service/dto/CreateProjectRequest.java | 29 ++++++--
.../service/dto/CreateResourceRequest.java | 21 +++++-
.../service/dto/ModifyResourceRequest.java | 21 +++++-
.../research/service/dto/RedirectResponse.java | 18 +++++
.../research/service/dto/ResourceResponse.java | 19 +++++
.../research/service/enums/PrivacyEnum.java | 18 +++++
.../research/service/enums/ResourceTypeEnum.java | 20 ++++++
.../research/service/enums/SessionStatusEnum.java | 20 ++++++
.../research/service/enums/StatusEnum.java | 18 +++++
.../research/service/exception/ErrorResponse.java | 19 +++++
.../service/exception/GlobalExceptionHandler.java | 18 +++++
.../research/service/handlers/ProjectHandler.java | 20 +++---
.../service/handlers/ResearchHubHandler.java | 18 ++---
.../research/service/handlers/ResourceHandler.java | 18 ++---
.../research/service/handlers/SessionHandler.java | 18 ++---
.../research/service/model/UserContext.java | 18 ++---
.../service/model/entity/DatasetResource.java | 18 ++---
.../service/model/entity/ModelResource.java | 18 ++---
.../service/model/entity/NotebookResource.java | 18 ++---
.../research/service/model/entity/Project.java | 18 ++---
.../service/model/entity/RepositoryResource.java | 18 ++---
.../research/service/model/entity/Resource.java | 18 ++---
.../research/service/model/entity/Session.java | 18 ++---
.../research/service/model/entity/Tag.java | 18 ++---
.../service/model/repo/ProjectRepository.java | 18 ++---
.../service/model/repo/ResourceRepository.java | 18 ++---
.../service/model/repo/SessionRepository.java | 18 ++---
.../research/service/model/repo/TagRepository.java | 18 ++---
.../src/main/proto/research-service.proto | 20 ++++++
.../src/main/resources/application.yml | 16 +++++
sandbox/simstream/README.md | 19 +++++
sandbox/simstream/example/README.md | 19 +++++
.../simstream/example/logfile_checker/README.md | 19 +++++
.../example/logfile_checker/remote_log.slurm | 17 +++++
sandbox/simstream/example/mem_streamer/README.md | 19 +++++
sandbox/simstream/example/openmm_example/README.md | 19 +++++
127 files changed, 2136 insertions(+), 289 deletions(-)
(airavata) 03/09: parametrize pom versions. add maven-enforcer rule for dependency convergence and fix version issues.
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 1fe9785eba9ea117132b0cca49d12f94f13df5bd
Author: yasith <ya...@gatech.edu>
AuthorDate: Thu Mar 20 20:15:11 2025 +0000
parametrize pom versions. add maven-enforcer rule for dependency convergence and fix version issues.
---
airavata-api/airavata-api-server/pom.xml | 6 +-
airavata-api/airavata-base-api/pom.xml | 6 +
.../airavata-client-sdks/airavata-cpp-sdk/pom.xml | 4 +-
.../airavata-client-sdks/airavata-php-sdk/pom.xml | 4 +-
.../java-client-samples/pom.xml | 4 +-
airavata-api/airavata-data-models/pom.xml | 5 +
airavata-services/pom.xml | 2 +-
.../iam-admin-services-core/pom.xml | 4 +-
.../profile-service-commons/pom.xml | 10 +-
airavata-services/services-security/pom.xml | 13 +-
dev-tools/ansible/roles/api-orch/defaults/main.yml | 2 +-
modules/agent-framework/agent-service/pom.xml | 33 +-
.../airavata-helix/agent-impl/ssh-agent/pom.xml | 6 +-
.../airavata-helix/agent-impl/sshj-agent/pom.xml | 3 +-
modules/airavata-helix/helix-spectator/pom.xml | 21 +-
.../metadata-analyzer/pom.xml | 7 +-
.../metascheduler-core/pom.xml | 8 +-
.../process-scheduler/pom.xml | 14 +-
modules/cluster-monitoring/pom.xml | 8 +-
modules/commons/pom.xml | 10 +-
modules/compute-account-provisioning/pom.xml | 6 +-
.../computer-resource-monitoring-service/pom.xml | 9 +-
.../credential-store-service/pom.xml | 18 +-
.../credential-store-stubs/pom.xml | 2 +-
modules/distribution/pom.xml | 58 +--
.../src/main/assembly/api-server-bin-assembly.xml | 2 +-
.../src/main/assembly/controller-bin-assembly.xml | 8 +-
.../main/assembly/email-monitor-bin-assembly.xml | 5 +-
.../src/main/assembly/parser-wm-bin-assembly.xml | 8 +-
.../src/main/assembly/participant-bin-assembly.xml | 14 +-
.../src/main/assembly/post-wm-bin-assembly.xml | 8 +-
.../src/main/assembly/pre-wm-bin-assembly.xml | 8 +-
.../assembly/realtime-monitor-bin-assembly.xml | 2 +-
modules/file-server/pom.xml | 1 +
modules/ide-integration/pom.xml | 2 +-
.../app/tests/selenium/pom.xml | 33 +-
modules/job-monitor/email-monitor/pom.xml | 7 +-
modules/job-monitor/job-monitor-api/pom.xml | 3 +-
modules/job-monitor/pom.xml | 8 +-
modules/messaging/client/pom.xml | 1 +
modules/orchestrator/orchestrator-core/pom.xml | 2 +-
modules/orchestrator/orchestrator-service/pom.xml | 8 -
modules/platform-monitoring/pom.xml | 10 +-
modules/registry/registry-core/pom.xml | 18 +-
.../registry-server/registry-api-service/pom.xml | 1 +
.../registry-server/registry-api-stubs/pom.xml | 1 +
.../registry/registry-tools/registry-tool/pom.xml | 10 +-
modules/security/pom.xml | 6 +-
modules/server/pom.xml | 4 +-
.../sharing-registry/sharing-data-migrator/pom.xml | 9 +-
.../sharing-registry-distribution/pom.xml | 9 +-
.../sharing-registry-server/pom.xml | 20 +-
pom.xml | 390 ++++++++++++++++++---
tools/load-client/pom.xml | 10 +-
54 files changed, 568 insertions(+), 303 deletions(-)
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index cc05814161..c4d1702487 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -121,17 +121,17 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>7.0.0</version>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>1.0</version>
+ <version>${aopalliance.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
- <version>1.0.0</version>
+ <version>${oltu.oauth2.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/airavata-api/airavata-base-api/pom.xml b/airavata-api/airavata-base-api/pom.xml
index 1a7f837845..1884e489cd 100644
--- a/airavata-api/airavata-base-api/pom.xml
+++ b/airavata-api/airavata-base-api/pom.xml
@@ -6,6 +6,7 @@
<artifactId>airavata-api</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,6 +19,11 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
index fe7cffd281..77dd5b2954 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
index 91052cc17b..fef35b610e 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index b749862ee7..5ff4a3dcc5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -75,12 +75,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4</version>
+ <version>${httpcore.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>1.1</version>
+ <version>${json-simple.version}</version>
</dependency>
</dependencies>
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index 7003496de2..8fd5d8c260 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -43,6 +43,11 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
diff --git a/airavata-services/pom.xml b/airavata-services/pom.xml
index 9e6b2e8dda..c3519945db 100644
--- a/airavata-services/pom.xml
+++ b/airavata-services/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml
index 1d02d39acf..9f95c5fa15 100644
--- a/airavata-services/profile-service/iam-admin-services-core/pom.xml
+++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml
@@ -39,13 +39,13 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
- <version>${rest.easy.client.version}</version>
+ <version>${resteasy.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-jackson2-provider -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
- <version>${rest.easy.client.version}</version>
+ <version>${resteasy.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 3394c9aff0..b1217453d5 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -49,6 +49,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -57,8 +61,8 @@
<version>${openjpa.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<dependency>
@@ -90,8 +94,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <!--<source>17</source>-->
- <!--<target>17</target>-->
<release>17</release>
</configuration>
</plugin>
diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml
index 7bddbfb28a..77ce01b352 100644
--- a/airavata-services/services-security/pom.xml
+++ b/airavata-services/services-security/pom.xml
@@ -69,28 +69,23 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>4.0</version>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>1.0</version>
+ <version>${aopalliance.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
- <version>1.0.0</version>
+ <version>${oltu.oauth2.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
@@ -100,7 +95,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20131018</version>
+ <version>${json.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml
index 0f6fa218b5..0719c25c83 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -30,7 +30,7 @@ iam_server_super_admin_username: "admin"
profile_service_host: "localhost"
profile_service_port: 8962
-mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"
+mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-3.5.2/mariadb-java-client-3.5.2.jar"
sharing_registry_tls_enabled: "false"
api_server_bind_host: "{{ ansible_default_ipv4.address }}"
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index 8bfe2020a2..43c6ef67ec 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.airavata</groupId>
<artifactId>agent-framework</artifactId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>agent-service</artifactId>
@@ -34,14 +35,6 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jul-to-slf4j.version>1.7.0</jul-to-slf4j.version>
- <json.version>20240303</json.version>
- <javax.version>2.0.1.Final</javax.version>
- <apache.commons.lang3.version>3.14.0</apache.commons.lang3.version>
- <mysql.connector.java>8.0.31</mysql.connector.java>
- <protoc.version>4.30.1</protoc.version>
- <protobuf-plugin.version>2.12.1</protobuf-plugin.version>
- <grpc.version>1.71.0</grpc.version>
<agent.service.dist.name>Agent-Service-0.01</agent.service.dist.name>
</properties>
@@ -61,7 +54,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>1.5.7</version>
+ <version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -109,20 +102,15 @@
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protoc.version}</version>
- </dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>${grpc-server-spring-boot-starter.version}</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -136,7 +124,7 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.7.0</version>
+ <version>${os-maven-plugin.version}</version>
</extension>
</extensions>
@@ -166,9 +154,9 @@
<plugin>
<groupId>io.github.ascopes</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-plugin.version}</version>
+ <version>${protobuf-maven-plugin.version}</version>
<configuration>
- <protocVersion>${protoc.version}</protocVersion>
+ <protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
<sourceDirectory>${project.basedir}/../proto</sourceDirectory>
</sourceDirectories>
@@ -186,8 +174,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <source>17</source>
- <target>17</target>
+ <release>17</release>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory>
<includes>
<include>${project.build.directory}/generated-sources/**/*.java</include>
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
index dc98654760..ff1d1ed4e8 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
@@ -14,7 +14,7 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.53</version>
+ <version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -24,7 +24,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>${commons-io.version}</version>
</dependency>
</dependencies>
@@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.1</version>
+ <version>${maven.assembly.plugin}</version>
<configuration>
<!-- get all project dependencies -->
<descriptorRefs>
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
index ae604de3f1..aa517ba0a0 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
@@ -25,6 +25,7 @@
<artifactId>agent-impl</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,7 +35,7 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
- <version>0.39.0</version>
+ <version>${sshj.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml
index 44fae2519f..09dfe4909f 100644
--- a/modules/airavata-helix/helix-spectator/pom.xml
+++ b/modules/airavata-helix/helix-spectator/pom.xml
@@ -89,30 +89,19 @@
<artifactId>job-monitor-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>services-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
- <version>3.0.14</version>
+ <version>${docker-java.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
index 7ec6806547..da1db41afc 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml
+++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
@@ -41,18 +41,13 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>metascheduler-core</artifactId>
diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml
index 9969b9982b..8b9a2829f9 100644
--- a/modules/airavata-metascheduler/metascheduler-core/pom.xml
+++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml
@@ -42,19 +42,13 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>0.21-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml
index 71aa94c5e1..e4cb478e20 100644
--- a/modules/airavata-metascheduler/process-scheduler/pom.xml
+++ b/modules/airavata-metascheduler/process-scheduler/pom.xml
@@ -28,11 +28,6 @@
<artifactId>agent-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>agent-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>task-core</artifactId>
@@ -43,20 +38,15 @@
<artifactId>airavata-orchestrator-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>helix-spectator</artifactId>
- <version>0.21-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml
index 6c8dd5cdac..4a3528a851 100644
--- a/modules/cluster-monitoring/pom.xml
+++ b/modules/cluster-monitoring/pom.xml
@@ -55,17 +55,17 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
- <version>2.3.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.50</version>
+ <version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -79,7 +79,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.3.1</version>
+ <version>${google.gson.version}</version>
</dependency>
</dependencies>
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index b5a393bcab..299b0eb097 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -84,12 +84,12 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>7.0.22</version>
+ <version>${tomcat-embed-core.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -105,6 +105,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/modules/compute-account-provisioning/pom.xml b/modules/compute-account-provisioning/pom.xml
index bd3b2cdd94..9332c06e70 100644
--- a/modules/compute-account-provisioning/pom.xml
+++ b/modules/compute-account-provisioning/pom.xml
@@ -45,13 +45,13 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.50</version>
+ <version>${jsch.version}</version>
</dependency>
<!-- apache directory ldap api! -->
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
- <version>1.0.0</version>
+ <version>${directory.api.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.3.1</version>
+ <version>${google.gson.version}</version>
</dependency>
</dependencies>
diff --git a/modules/computer-resource-monitoring-service/pom.xml b/modules/computer-resource-monitoring-service/pom.xml
index 129a93aee5..78b58e66e9 100644
--- a/modules/computer-resource-monitoring-service/pom.xml
+++ b/modules/computer-resource-monitoring-service/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.2</version>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -49,13 +49,6 @@
<artifactId>metascheduler-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>0.21-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
<properties>
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 549f441ca1..062a2bcf16 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -64,8 +64,8 @@
<artifactId>oauth-consumer</artifactId>
</exclusion>
<exclusion>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</exclusion>
<exclusion>
<groupId>postgresql</groupId>
@@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -111,7 +111,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -121,23 +121,23 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.50</version>
+ <version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>1.3.2</version>
+ <version>${commons-email.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <version>${commons-io.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/modules/credential-store/credential-store-stubs/pom.xml b/modules/credential-store/credential-store-stubs/pom.xml
index 4a66dfd5e0..1be3effe02 100644
--- a/modules/credential-store/credential-store-stubs/pom.xml
+++ b/modules/credential-store/credential-store-stubs/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.9</version>
+ <version>${commons-codec.version}</version>
</dependency>
</dependencies>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 788eca2aa7..ec7cef4dcc 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -61,22 +61,22 @@
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
- <version>0.8.0</version>
+ <version>${jets3t.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <version>${commons-collections.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.6</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -171,7 +171,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>${commons-io.version}</version>
</dependency>
<!-- end Cloud module -->
<dependency>
@@ -191,7 +191,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -202,23 +202,23 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.2.1</version>
+ <version>${shiro-core.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>${javax.servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
- <version>7.0.22</version>
+ <version>${tomcat-embed-logging-juli.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>7.0.22</version>
+ <version>${tomcat-embed-core.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -244,7 +244,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>${xerces.version}</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
@@ -255,28 +255,28 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>3.4.4</version>
+ <version>${icu4j.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
+ <version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
+ <version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.7</version>
+ <version>${commons-configuration.version}</version>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
- <version>3.2</version>
+ <version>${jopt-simple.version}</version>
</dependency>
<dependency>
<groupId>org.ebaysf.web</groupId>
@@ -286,10 +286,8 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.53</version>
+ <version>${jsch.version}</version>
</dependency>
- <!-- dependency> <groupId>org.ogce</groupId> <artifactId>bcgss</artifactId>
- <version>146</version> </dependency> -->
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -322,6 +320,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -339,7 +341,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
@@ -351,11 +353,23 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${kafka-clients.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -441,7 +455,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -733,7 +747,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.33.0</version>
+ <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
index 79c64aafae..16480d4656 100644
--- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
@@ -168,7 +168,7 @@
<include>*:*:jar</include>
</includes>
<excludes>
- <exclude>mysql:mysql-connector-java</exclude>
+ <exclude>com.mysql:mysql-connector-j</exclude>
</excludes>
</dependencySet>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index 767d8360e4..ff3919e8af 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -86,8 +86,7 @@
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
<include>asm:asm:jar</include>
- <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
@@ -133,7 +132,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
+ <include>org.eclipse.angus:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
@@ -170,10 +169,9 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
</includes>
<excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>com.mysql:mysql-connector-j:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index 64400e89fb..116dc2245e 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -92,8 +92,7 @@
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
- <include>jakarta.mail:jakarta.mail-api:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
+ <include>org.eclipse.angus:jakarta.mail:jar</include>
<include>javax.activation:activation:jar</include>
<include>org.yaml:snakeyaml:jar</include>
@@ -130,7 +129,7 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
+ <include>commons-lang:commons-lang:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index 3a30e919e5..3374be8b95 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -86,8 +86,7 @@
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
<include>asm:asm:jar</include>
- <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
@@ -138,7 +137,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
+ <include>org.eclipse.angus:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
@@ -168,10 +167,9 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
</includes>
<excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>com.mysql:mysql-connector-j:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index 5ea4d98327..1fd4fa32e9 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -88,8 +88,7 @@
<include>org.apache.airavata:profile-service-stubs:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
<include>asm:asm:jar</include>
- <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
@@ -139,7 +138,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
+ <include>org.eclipse.angus:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
@@ -178,7 +177,7 @@
<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</include>
<include>org.glassfish.jersey.connectors:jersey-apache-connector:jar</include>
<include>org.glassfish.jersey.core:jersey-common:jar</include>
- <include>javax.annotation:javax.annotation-api:jar</include>
+ <include>jakarta.annotation:jakarta.annotation-api:jar</include>
<include>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</include>
<include>org.glassfish.hk2:osgi-resource-locator:jar</include>
<include>org.apache.httpcomponents:httpcore:jar</include>
@@ -193,12 +192,10 @@
<include>com.kohlschutter.junixsocket:junixsocket-native-common:jar</include>
<include>org.scijava:native-lib-loader:jar</include>
<include>org.apache.commons:commons-compress:jar</include>
- <include>commons-lang:commons-lang:jar</include>
<include>commons-io:commons-io:jar</include>
<include>org.slf4j:jcl-over-slf4j:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>io.netty:netty-codec-http:jar</include>
<include>io.netty:netty-codec:jar</include>
<include>io.netty:netty-handler:jar</include>
@@ -219,10 +216,9 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
</includes>
<excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>com.mysql:mysql-connector-j:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 6dab1016dd..5e179aa199 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -86,8 +86,7 @@
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
<include>asm:asm:jar</include>
- <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
@@ -139,7 +138,7 @@
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
+ <include>org.eclipse.angus:jakarta.mail:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
<include>org.apache.airavata:platform-monitor:jar</include>
@@ -174,10 +173,9 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
</includes>
<excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>com.mysql:mysql-connector-j:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index d6b0e9ae5e..8ac2782c03 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -86,8 +86,7 @@
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
<include>asm:asm:jar</include>
- <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
@@ -138,7 +137,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>jakarta.mail:jakarta.mail:jar</include>
+ <include>org.eclipse.angus:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
@@ -173,10 +172,9 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
</includes>
<excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>com.mysql:mysql-connector-j:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
index 80a567b854..0d32b253cd 100644
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -123,7 +123,7 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang3</include>
+ <include>commons-lang:commons-lang:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index 4a3fe4363c..c17589d0dd 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -49,6 +49,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index 1b8162b6d5..67b5c10d39 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.0.2</version>
+ <version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
index b4546339f5..09c5166017 100755
--- a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
+++ b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.apache.airavata.pga.tests</groupId>
<artifactId>PGATest</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<name>PGATest</name>
<build>
<plugins>
@@ -15,15 +15,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <!--<source>17</source>-->
- <!--<target>17</target>-->
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<includes>
<include>**/RunAllTests.java</include>
@@ -58,7 +56,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <version>2.3</version>
+ <version>${selenium-maven-plugin.version}</version>
<!--executions>
<execution>
<phase>pre-integration-test</phase>
@@ -74,23 +72,16 @@
</plugins>
</build>
<dependencies>
- <!--dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency-->
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.1</version>
+ <version>${selenium-java-client-driver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
- <version>2.44.0</version>
+ <version>${selenium-firefox-driver.version}</version>
</dependency>
<dependency>
@@ -101,38 +92,38 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.3.2</version>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.1</version>
+ <version>${commons-exec.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
- <version>2.44.0</version>
+ <version>${selenium-remote-driver.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>2.44.0</version>
+ <version>${selenium-java.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/job-monitor/email-monitor/pom.xml b/modules/job-monitor/email-monitor/pom.xml
index ac66537f89..2d7f8eba98 100644
--- a/modules/job-monitor/email-monitor/pom.xml
+++ b/modules/job-monitor/email-monitor/pom.xml
@@ -24,6 +24,7 @@
<artifactId>job-monitor</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,9 +42,9 @@
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.2</version>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${jakarta.mail.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/job-monitor-api/pom.xml b/modules/job-monitor/job-monitor-api/pom.xml
index 4ba08208fb..28b880aa35 100644
--- a/modules/job-monitor/job-monitor-api/pom.xml
+++ b/modules/job-monitor/job-monitor-api/pom.xml
@@ -24,6 +24,7 @@
<artifactId>job-monitor</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +34,7 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
+ <version>0.21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index 8a62fcc7b2..74ad530e72 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -41,12 +41,12 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.15</version>
+ <version>${snakeyaml.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>2.1.2</version>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${jakarta.mail.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml
index 0c4aed1455..04a54b3ea2 100644
--- a/modules/messaging/client/pom.xml
+++ b/modules/messaging/client/pom.xml
@@ -71,6 +71,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
<configuration>
<archive>
<manifest>
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index 358f4d4e6a..e8d54953f6 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.1.1</version>
+ <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml
index ff15cf3fe9..c8fa5f3f6c 100644
--- a/modules/orchestrator/orchestrator-service/pom.xml
+++ b/modules/orchestrator/orchestrator-service/pom.xml
@@ -97,14 +97,6 @@
<artifactId>computer-resource-monitoring-service</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>metadata-analyzer</artifactId>
- <version>0.21-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
-
</dependencies>
<properties>
diff --git a/modules/platform-monitoring/pom.xml b/modules/platform-monitoring/pom.xml
index 80aa5d6c63..75725ab0b6 100644
--- a/modules/platform-monitoring/pom.xml
+++ b/modules/platform-monitoring/pom.xml
@@ -37,25 +37,25 @@
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
- <version>0.9.0</version>
+ <version>${prometheus.version}</version>
</dependency>
<!-- Hotspot JVM metrics-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
- <version>0.9.0</version>
+ <version>${prometheus.version}</version>
</dependency>
<!-- Exposition HTTPServer-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
- <version>0.9.0</version>
+ <version>${prometheus.version}</version>
</dependency>
<!-- Pushgateway exposition-->
<dependency>
<groupId>io.prometheus</groupId>
- <artifactId>simpleclient_pushgateway</artifactId>
- <version>0.9.0</version>
+ <artifactId>simpleclient_pushgateway</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index 0634e28f6f..558ffc6b4e 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -55,6 +55,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -64,8 +68,8 @@
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<dependency>
@@ -91,7 +95,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -112,13 +116,13 @@
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
- <version>2.3.0</version>
+ <version>${ibatis-sqlmap.version}</version>
</dependency>
<!-- For MariaDB based schema migrations -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.0.2</version>
+ <version>${mariadb-java-client.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -140,7 +144,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${exec-maven-plugin.version}</version>
<configuration>
<executable>java</executable>
<classpathScope>runtime</classpathScope>
@@ -259,7 +263,7 @@
<plugin>
<groupId>com.dkanejs.maven.plugins</groupId>
<artifactId>docker-compose-maven-plugin</artifactId>
- <version>4.0.0</version>
+ <version>${docker-compose-maven-plugin.version}</version>
<executions>
<execution>
<id>mysql-up</id>
diff --git a/modules/registry/registry-server/registry-api-service/pom.xml b/modules/registry/registry-server/registry-api-service/pom.xml
index 4551aeca86..d335027f3d 100644
--- a/modules/registry/registry-server/registry-api-service/pom.xml
+++ b/modules/registry/registry-server/registry-api-service/pom.xml
@@ -25,6 +25,7 @@
<artifactId>registry-server</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/registry/registry-server/registry-api-stubs/pom.xml b/modules/registry/registry-server/registry-api-stubs/pom.xml
index e9ed2bd6b3..ac640759b5 100644
--- a/modules/registry/registry-server/registry-api-stubs/pom.xml
+++ b/modules/registry/registry-server/registry-api-stubs/pom.xml
@@ -25,6 +25,7 @@
<artifactId>registry-server</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/registry/registry-tools/registry-tool/pom.xml b/modules/registry/registry-tools/registry-tool/pom.xml
index 08e923de1d..bd2a982793 100644
--- a/modules/registry/registry-tools/registry-tool/pom.xml
+++ b/modules/registry/registry-tools/registry-tool/pom.xml
@@ -37,22 +37,22 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.9.1.0</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <version>10.9.1.0</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
- <version>10.9.1.0</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>10.9.1.0</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <version>${commons-cli.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/security/pom.xml b/modules/security/pom.xml
index 8df7b7634c..a6f4c968b1 100644
--- a/modules/security/pom.xml
+++ b/modules/security/pom.xml
@@ -42,17 +42,17 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.2.1</version>
+ <version>${shiro-core.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index ad569d05d4..d0869323a3 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -39,8 +39,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <!--<source>17</source>-->
- <!--<target>17</target>-->
<release>17</release>
</configuration>
</plugin>
@@ -50,7 +48,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml
index 69fac6e8ef..e232b46619 100644
--- a/modules/sharing-registry/sharing-data-migrator/pom.xml
+++ b/modules/sharing-registry/sharing-data-migrator/pom.xml
@@ -25,6 +25,7 @@
<artifactId>airavata-sharing-registry</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,15 +40,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <!--<source>17</source>-->
- <!--<target>17</target>-->
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -97,7 +96,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.9.3</version>
+ <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -112,7 +111,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.0.2</version>
+ <version>${mariadb-java-client.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index c588815286..aa5983f12b 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -25,6 +25,7 @@
<artifactId>airavata-sharing-registry</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -48,6 +49,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -56,8 +61,8 @@
<version>${openjpa.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<dependency>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 411552b2c7..b03624c8d9 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -59,6 +59,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -67,8 +71,8 @@
<version>${openjpa.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<dependency>
@@ -79,7 +83,7 @@
<dependency>
<groupId>org.databene</groupId>
<artifactId>contiperf</artifactId>
- <version>2.3.4</version>
+ <version>${contiperf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -89,7 +93,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
+ <version>${commons-lang.version}</version>
</dependency>
@@ -103,18 +107,12 @@
<version>${maven.compiler.plugin.version}</version>
<configuration>
<release>17</release>
- <source>17</source>
- <target>17</target>
- <!--<compilerArgs>-->
- <!--<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>-->
- <!--</compilerArgs>-->
- <!--<fork>true</fork>-->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.openjpa</groupId>
diff --git a/pom.xml b/pom.xml
index a0d5df6dc4..3fdd984a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,6 @@
<modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -111,11 +107,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.13.1.1</derby.version>
<org.slf4j.version>2.0.16</org.slf4j.version>
- <log4j2.slf4j.impl>2.24.0</log4j2.slf4j.impl>
- <log4j2.version>2.24.0</log4j2.version>
+ <log4j2.version>2.24.3</log4j2.version>
+ <log4j2.slf4j.impl>2.24.3</log4j2.slf4j.impl>
<surefire.version>3.0.0-M4</surefire.version>
- <junit.version>4.12</junit.version>
- <curator.version>5.7.0</curator.version>
+ <junit.version>4.13.1</junit.version>
+ <curator.version>5.6.0</curator.version>
<groovy.version>3.0.23</groovy.version>
<xpp3.version>1.1.6</xpp3.version>
<xpp5.version>1.2.8</xpp5.version>
@@ -126,47 +122,116 @@
<jakarta.activation.api.version>2.1.2</jakarta.activation.api.version>
<jersey.version>1.13</jersey.version>
<cargo.version>1.3.1</cargo.version>
- <oa4mp.version>1.1.3</oa4mp.version>
+ <oa4mp.version>4.3</oa4mp.version>
<antrun.version>1.8</antrun.version>
- <bouncy.castle.version>1.70</bouncy.castle.version>
+ <bouncy.castle.version>1.78</bouncy.castle.version>
<ebay.cors.filter>1.0.0</ebay.cors.filter>
- <thrift.version>0.18.1</thrift.version>
- <mysql.connector.version>8.0.31</mysql.connector.version>
+ <thrift.version>0.21.0</thrift.version>
+ <mysql.connector.version>8.2.0</mysql.connector.version>
<skipTests>false</skipTests>
<google.gson.version>2.10.1</google.gson.version>
<zk.version>3.9.2</zk.version>
- <amqp.client.version>3.5.1</amqp.client.version>
- <snakeyaml.version>1.15</snakeyaml.version>
+ <amqp.client.version>4.12.0</amqp.client.version>
+ <snakeyaml.version>2.2</snakeyaml.version>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
<maven.assembly.plugin>3.3.0</maven.assembly.plugin>
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
- <kafka-clients.version>1.0.0</kafka-clients.version>
- <json.version>20160212</json.version>
- <commons.io.version>2.11.0</commons.io.version>
+ <kafka-clients.version>3.7.1</kafka-clients.version>
+ <json.version>20250107</json.version>
<google.guava.version>33.2.1-jre</google.guava.version>
<jacoco.version>0.8.1</jacoco.version>
<openjpa.maven.plugin.version>4.0.1</openjpa.maven.plugin.version>
<openjpa.version>4.0.1</openjpa.version>
<dozer.version>5.4.0</dozer.version>
+ <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
+ <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
+ <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+ <angus-activation.version>2.0.2</angus-activation.version>
<jaxb.version>2.4.0-b180830.0359</jaxb.version>
<jmockit.version>1.44</jmockit.version>
- <commons.lang.version>2.6</commons.lang.version>
- <org.apache.commons.pool2.version>2.7.0</org.apache.commons.pool2.version>
- <helix.version>0.9.7</helix.version>
+ <helix.version>1.4.3</helix.version>
<keycloak.admin.client.version>24.0.4</keycloak.admin.client.version>
- <rest.easy.client.version>6.2.12.Final</rest.easy.client.version>
+ <resteasy.version>6.2.12.Final</resteasy.version>
<httpclient.version>4.5.14</httpclient.version>
+ <httpcore.version>4.4.16</httpcore.version>
+ <httpcore.version>4.4.16</httpcore.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<spring.boot.version>3.2.4</spring.boot.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <oltu.oauth2.client.version>1.0.0</oltu.oauth2.client.version>
+ <jsch.version>0.1.54</jsch.version>
+ <sshj.version>0.39.0</sshj.version>
+ <quartz.version>2.4.0</quartz.version>
+ <directory.api.version>1.0.0</directory.api.version>
+ <mariadb-java-client.version>3.5.2</mariadb-java-client.version>
+ <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <grpc-server-spring-boot-starter.version>3.1.0.RELEASE</grpc-server-spring-boot-starter.version>
+ <commons-beanutils.version>1.9.2</commons-beanutils.version>
+ <commons-io.version>2.18.0</commons-io.version>
+ <commons-pool2.version>2.12.1</commons-pool2.version>
+ <commons-pool.version>1.6</commons-pool.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
+ <commons-cli.version>1.9.0</commons-cli.version>
+ <commons-email.version>1.5</commons-email.version>
+ <commons-codec.version>1.18.0</commons-codec.version>
+ <commons-collections.version>3.2.2</commons-collections.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <commons-lang3.version>3.12.0</commons-lang3.version>
+ <commons-configuration.version>1.10</commons-configuration.version>
+ <commons-exec.version>1.4.0</commons-exec.version>
+ <commons-logging.version>1.3.5</commons-logging.version>
+ <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+ <docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
+ <ibatis-sqlmap.version>2.3.0</ibatis-sqlmap.version>
+ <testng.version>7.7.0</testng.version>
+ <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
+ <shiro-core.version>2.0.2</shiro-core.version>
+ <tomcat-embed-core.version>11.0.3</tomcat-embed-core.version>
+ <tomcat-embed-logging-juli.version>8.5.2</tomcat-embed-logging-juli.version>
+ <keycloak.authz.client.version>24.0.4</keycloak.authz.client.version>
+ <guice.version>7.0.0</guice.version>
+ <templating.maven.version>1.0.0</templating.maven.version>
+ <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
+ <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+ <contiperf.version>2.3.4</contiperf.version>
+ <docker-java.version>3.4.2</docker-java.version>
+ <prometheus.version>0.9.0</prometheus.version>
+ <jakarta.mail.version>2.0.2</jakarta.mail.version>
+ <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <jets3t.version>0.8.0</jets3t.version>
+ <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+ <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
+ <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
+ <maven-surefire-plugin.version>2.12.4</maven-surefire-plugin.version>
+ <json-simple.version>1.1</json-simple.version>
+ <xerces.version>2.12.2</xerces.version>
+ <icu4j.version>3.4.4</icu4j.version>
+ <hamcrest.version>1.1</hamcrest.version>
+ <mockito.version>1.8.5</mockito.version>
+ <jopt-simple.version>3.2</jopt-simple.version>
+ <selenium-maven-plugin.version>2.3</selenium-maven-plugin.version>
+ <selenium-java-client-driver.version>1.0.1</selenium-java-client-driver.version>
+ <selenium-firefox-driver.version>2.44.0</selenium-firefox-driver.version>
+ <selenium-remote-driver.version>2.44.0</selenium-remote-driver.version>
+ <selenium-java.version>2.44.0</selenium-java.version>
+ <jackson-core-asl.version>1.9.13</jackson-core-asl.version>
+ <snappy-java.version>1.1.10.7</snappy-java.version>
+ <netty.version>4.1.113.Final</netty.version>
+ <logback.version>1.4.14</logback.version>
+ <!-- From Agent Service -->
+ <protobuf-java.version>3.25.5</protobuf-java.version>
+ <protobuf-maven-plugin.version>2.12.1</protobuf-maven-plugin.version>
+ <grpc.version>1.63.0</grpc.version>
+ <j2objc-annotations.version>2.8</j2objc-annotations.version>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -188,6 +253,51 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core-spi</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@@ -223,14 +333,24 @@
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${bouncy.castle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncy.castle.version}</version>
</dependency>
<dependency>
@@ -268,10 +388,90 @@
<artifactId>guava</artifactId>
<version>${google.guava.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>${org.apache.commons.pool2.version}</version>
+ <version>${commons-pool2.version}</version>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
@@ -279,6 +479,126 @@
<version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-core-asl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${os.detected.classifier}:${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta.activation-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java</artifactId>
+ <version>${docker-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>${mysql.connector.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <version>${angus-activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${j2objc-annotations.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -287,7 +607,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>${templating.maven.version}</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -348,16 +668,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <source>17</source>
- <target>17</target>
- <!--</configuration>-->
- <!--<!–<version>3.8.0</version>–>-->
- <!--<configuration>-->
-
- <!--<compilerArgs>-->
- <!--<arg>--add-exports=java.base/sun.security=ALL-UNNAMED</arg>-->
- <!--</compilerArgs>-->
- <!--<release>17</release>-->
+ <release>17</release>
<fork>true</fork>
</configuration>
@@ -395,7 +706,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -404,9 +715,8 @@
</goals>
<configuration>
<rules>
- <requireMavenVersion>
- <version>3.0</version>
- </requireMavenVersion>
+<!-- <requireUpperBoundDeps/>-->
+ <dependencyConvergence/>
</rules>
</configuration>
</execution>
diff --git a/tools/load-client/pom.xml b/tools/load-client/pom.xml
index 3d880b001a..2eca594a3d 100644
--- a/tools/load-client/pom.xml
+++ b/tools/load-client/pom.xml
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
- <version>${rest.easy.client.version}</version>
+ <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -43,17 +43,17 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.15</version>
+ <version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-authz-client</artifactId>
- <version>2.5.4.Final</version>
+ <version>${keycloak.authz.client.version}</version>
</dependency>
</dependencies>
<build>
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${maven.assembly.plugin}</version>
<executions>
<execution>
<id>load-client-distribution-package</id>
(airavata) 01/09: bump JDK to v17. create devcontainer setup. bump rabbitmq and proto versions. consolidate maven-compiler plugin versions. migrate openjpa to 4.0.1. update javax to jakarta. regenerate certs. fix bugs.
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 0aabc561f8d8579619ec1c073517edce55736ee3
Author: yasith <ya...@gatech.edu>
AuthorDate: Fri Mar 14 02:35:05 2025 -0400
bump JDK to v17. create devcontainer setup. bump rabbitmq and proto versions. consolidate maven-compiler plugin versions. migrate openjpa to 4.0.1. update javax to jakarta. regenerate certs. fix bugs.
---
.devcontainer/Dockerfile | 8 +
.devcontainer/devcontainer.json | 27 +
.devcontainer/docker-compose.yml | 142 ++
.gitignore | 1 +
.vscode/launch.json | 26 +
.../airavata-client-sdks/airavata-cpp-sdk/pom.xml | 2 +-
.../airavata-client-sdks/airavata-php-sdk/pom.xml | 2 +-
.../iam-admin-services-core/pom.xml | 6 +
.../profile-service-commons/pom.xml | 12 +-
.../commons/repositories/AbstractRepository.java | 2 +-
.../commons/tenant/entities/GatewayEntity.java | 2 +-
.../user/entities/CustomizedDashboardEntity.java | 2 +-
.../user/entities/NSFDemographicsEntity.java | 2 +-
.../commons/user/entities/UserProfileEntity.java | 2 +-
.../service/profile/commons/utils/JPAUtils.java | 4 +-
.../profile/user/cpi/UserProfileService.java | 1 +
.../profile-service/profile-tenant-core/pom.xml | 2 +-
.../profile-service/profile-user-core/pom.xml | 8 +-
.../resources/keystores => keystores}/airavata.jks | Bin
keystores/client_truststore.jks | Bin 0 -> 2351 bytes
keystores/generate_keystore.sh | 14 +
modules/agent-framework/agent-service/pom.xml | 69 +-
.../service/controllers/AgentController.java | 24 +-
.../service/controllers/ExperimentController.java | 8 +-
.../agent-framework/agent-service/src/main/proto | 1 -
.../src/main/resources/application.yml | 2 +-
.../resources/distribution/conf/application.yml | 2 +-
modules/agent-framework/pom.xml | 17 +-
modules/airavata-helix/agent-api/pom.xml | 2 +-
modules/airavata-helix/task-api/pom.xml | 2 +-
modules/airavata-helix/task-core/pom.xml | 2 +-
modules/airavata-helix/workflow-impl/pom.xml | 2 +-
.../metadata-analyzer/pom.xml | 6 +-
.../metascheduler-core/pom.xml | 12 +-
modules/airavata-metascheduler/pom.xml | 4 +-
.../process-scheduler/pom.xml | 12 +-
modules/cluster-monitoring/pom.xml | 4 +-
.../airavata/common/utils/ApplicationSettings.java | 3 +
.../org/apache/airavata/common/utils/JPAUtils.java | 4 +-
modules/commons/src/test/resources/mykeystore.jks | Bin 498 -> 0 bytes
.../computer-resource-monitoring-service/pom.xml | 6 +-
.../credential-store-service/pom.xml | 8 +
.../src/test/resources/keystore.jks | Bin 2230 -> 0 bytes
.../src/test/resources/mykeystore.jks | Bin 498 -> 0 bytes
modules/distribution/pom.xml | 2 +-
.../src/main/assembly/controller-bin-assembly.xml | 2 +-
.../main/assembly/email-monitor-bin-assembly.xml | 4 +-
.../src/main/assembly/parser-wm-bin-assembly.xml | 2 +-
.../src/main/assembly/participant-bin-assembly.xml | 2 +-
.../src/main/assembly/post-wm-bin-assembly.xml | 2 +-
.../src/main/assembly/pre-wm-bin-assembly.xml | 2 +-
.../src/main/docker/docker-compose.yml | 2 +-
modules/file-server/pom.xml | 2 +-
.../{src/main/containers => }/.gitignore | 0
modules/ide-integration/README.md | 43 +-
modules/ide-integration/pom.xml | 8 +
.../src/main/containers/docker-compose.yml | 60 -
.../main/containers/keycloak/Default-export.json | 1990 ---------------
.../containers/keycloak/Default-export.json.bk | 1507 -----------
.../src/main/containers/keycloak/keycloak.conf | 43 +-
.../main/containers/keycloak/realm-default.json | 2649 ++++++++++++++++++++
.../src/main/containers/keycloak/standalone.xml | 521 ----
.../airavata-php-gateway/app/config/pga_config.php | 4 +-
.../app/tests/selenium/pom.xml | 8 +-
.../src/main/resources/airavata-server.properties | 22 +-
.../src/main/resources/keystores/airavata_sym.jks | Bin 501 -> 0 bytes
.../main/resources/keystores/client_truststore.jks | Bin 2282 -> 0 bytes
.../ide-integration/src/main/resources/log4j2.xml | 4 +-
modules/job-monitor/email-monitor/pom.xml | 9 +-
.../airavata/monitor/email/EmailBasedMonitor.java | 25 +-
.../email/parser/AiravataCustomMailParser.java | 4 +-
.../airavata/monitor/email/parser/EmailParser.java | 4 +-
.../monitor/email/parser/HTCondorEmailParser.java | 4 +-
.../monitor/email/parser/LSFEmailParser.java | 4 +-
.../monitor/email/parser/PBSEmailParser.java | 4 +-
.../monitor/email/parser/SLURMEmailParser.java | 4 +-
.../monitor/email/parser/UGEEmailParser.java | 4 +-
modules/job-monitor/pom.xml | 11 +-
modules/registry/registry-core/pom.xml | 8 +-
.../AiravataWorkflowEntity.java | 2 +-
.../AiravataWorkflowErrorEntity.java | 2 +-
.../AiravataWorkflowStatusEntity.java | 2 +-
.../ApplicationErrorEntity.java | 2 +-
.../ApplicationStatusEntity.java | 2 +-
.../HandlerErrorEntity.java | 2 +-
.../HandlerInputEntity.java | 2 +-
.../HandlerOutputEntity.java | 2 +-
.../HandlerStatusEntity.java | 2 +-
.../WorkflowApplicationEntity.java | 2 +-
.../WorkflowConnectionEntity.java | 2 +-
.../WorkflowDataBlockEntity.java | 2 +-
.../WorkflowHandlerEntity.java | 2 +-
.../entities/appcatalog/AppEnvironmentEntity.java | 2 +-
.../appcatalog/AppModuleMappingEntity.java | 2 +-
.../appcatalog/ApplicationDeploymentEntity.java | 2 +-
.../appcatalog/ApplicationInputEntity.java | 2 +-
.../appcatalog/ApplicationInterfaceEntity.java | 2 +-
.../appcatalog/ApplicationModuleEntity.java | 8 +-
.../appcatalog/ApplicationOutputEntity.java | 2 +-
.../core/entities/appcatalog/BatchQueueEntity.java | 2 +-
.../appcatalog/BatchQueueResourcePolicyEntity.java | 12 +-
.../appcatalog/CloudJobSubmissionEntity.java | 2 +-
.../entities/appcatalog/ComputeResourceEntity.java | 2 +-
.../ComputeResourceFileSystemEntity.java | 2 +-
.../appcatalog/ComputeResourcePolicyEntity.java | 18 +-
.../ComputeResourcePreferenceEntity.java | 2 +-
.../ComputeResourceReservationEntity.java | 22 +-
.../appcatalog/DataMovementInterfaceEntity.java | 2 +-
.../entities/appcatalog/GatewayGroupsEntity.java | 8 +-
.../entities/appcatalog/GatewayProfileEntity.java | 2 +-
.../appcatalog/GlobusGkEndpointEntity.java | 2 +-
.../appcatalog/GlobusSubmissionEntity.java | 2 +-
.../appcatalog/GridftpDataMovementEntity.java | 2 +-
.../entities/appcatalog/GridftpEndpointEntity.java | 2 +-
.../appcatalog/GroupComputeResourcePrefEntity.java | 26 +-
.../appcatalog/GroupResourceProfileEntity.java | 14 +-
.../GroupSSHAccountProvisionerConfig.java | 18 +-
.../entities/appcatalog/GsisshExportEntity.java | 2 +-
.../appcatalog/GsisshPostjobcommandEntity.java | 2 +-
.../appcatalog/GsisshPrejobcommandEntity.java | 2 +-
.../appcatalog/GsisshSubmissionEntity.java | 8 +-
.../appcatalog/JobManagerCommandEntity.java | 2 +-
.../appcatalog/JobSubmissionInterfaceEntity.java | 2 +-
.../appcatalog/LibraryApendPathEntity.java | 2 +-
.../appcatalog/LibraryPrependPathEntity.java | 2 +-
.../appcatalog/LocalDataMovementEntity.java | 8 +-
.../entities/appcatalog/LocalSubmissionEntity.java | 2 +-
.../entities/appcatalog/ModuleLoadCmdEntity.java | 2 +-
.../appcatalog/ParallelismCommandEntity.java | 2 +-
.../entities/appcatalog/ParserConnectorEntity.java | 2 +-
.../appcatalog/ParserConnectorInputEntity.java | 2 +-
.../core/entities/appcatalog/ParserEntity.java | 2 +-
.../entities/appcatalog/ParserInputEntity.java | 2 +-
.../entities/appcatalog/ParserOutputEntity.java | 2 +-
.../entities/appcatalog/ParsingTemplateEntity.java | 2 +-
.../appcatalog/ParsingTemplateInputEntity.java | 2 +-
.../entities/appcatalog/PostjobCommandEntity.java | 2 +-
.../entities/appcatalog/PrejobCommandEntity.java | 2 +-
.../appcatalog/ResourceJobManagerEntity.java | 2 +-
.../SSHAccountProvisionerConfiguration.java | 2 +-
.../entities/appcatalog/ScpDataMovementEntity.java | 2 +-
.../appcatalog/SshJobSubmissionEntity.java | 2 +-
.../appcatalog/StorageInterfaceEntity.java | 2 +-
.../appcatalog/StoragePreferenceEntity.java | 2 +-
.../entities/appcatalog/StorageResourceEntity.java | 2 +-
.../appcatalog/UnicoreDatamovementEntity.java | 12 +-
.../appcatalog/UnicoreSubmissionEntity.java | 2 +-
.../UserComputeResourcePreferenceEntity.java | 2 +-
.../appcatalog/UserResourceProfileEntity.java | 2 +-
.../appcatalog/UserStoragePreferenceEntity.java | 2 +-
.../ComputationalResourceSchedulingEntity.java | 2 +-
.../core/entities/expcatalog/ExperimentEntity.java | 2 +-
.../entities/expcatalog/ExperimentErrorEntity.java | 2 +-
.../entities/expcatalog/ExperimentInputEntity.java | 2 +-
.../expcatalog/ExperimentOutputEntity.java | 2 +-
.../expcatalog/ExperimentStatusEntity.java | 2 +-
.../expcatalog/ExperimentSummaryEntity.java | 2 +-
.../core/entities/expcatalog/GatewayEntity.java | 2 +-
.../GatewayUsageReportingCommandEntity.java | 2 +-
.../entities/expcatalog/GatewayWorkerEntity.java | 2 +-
.../core/entities/expcatalog/JobEntity.java | 2 +-
.../core/entities/expcatalog/JobStatusEntity.java | 2 +-
.../entities/expcatalog/NotificationEntity.java | 2 +-
.../core/entities/expcatalog/ProcessEntity.java | 2 +-
.../entities/expcatalog/ProcessErrorEntity.java | 2 +-
.../entities/expcatalog/ProcessInputEntity.java | 2 +-
.../entities/expcatalog/ProcessOutputEntity.java | 2 +-
.../expcatalog/ProcessResourceScheduleEntity.java | 2 +-
.../entities/expcatalog/ProcessStatusEntity.java | 2 +-
.../entities/expcatalog/ProcessWorkflowEntity.java | 2 +-
.../entities/expcatalog/ProcessWorkflowPK.java | 4 +-
.../core/entities/expcatalog/ProjectEntity.java | 2 +-
.../entities/expcatalog/ProjectUserEntity.java | 2 +-
.../entities/expcatalog/QueueStatusEntity.java | 2 +-
.../core/entities/expcatalog/TaskEntity.java | 2 +-
.../core/entities/expcatalog/TaskErrorEntity.java | 2 +-
.../core/entities/expcatalog/TaskStatusEntity.java | 2 +-
.../expcatalog/UserConfigurationDataEntity.java | 2 +-
.../core/entities/expcatalog/UserEntity.java | 2 +-
.../registry/core/entities/expcatalog/UserPK.java | 4 +-
.../replicacatalog/ConfigurationEntity.java | 2 +-
.../entities/replicacatalog/DataProductEntity.java | 2 +-
.../replicacatalog/DataProductMetadataEntity.java | 2 +-
.../replicacatalog/DataReplicaLocationEntity.java | 2 +-
.../replicacatalog/DataReplicaMetadataEntity.java | 2 +-
.../workflowcatalog/ComponentStatusEntity.java | 8 +-
.../core/entities/workflowcatalog/EdgeEntity.java | 2 +-
.../core/entities/workflowcatalog/NodeEntity.java | 2 +-
.../core/entities/workflowcatalog/PortEntity.java | 2 +-
.../entities/workflowcatalog/WorkflowEntity.java | 2 +-
.../workflowcatalog/WorkflowInputEntity.java | 2 +-
.../workflowcatalog/WorkflowOutputEntity.java | 2 +-
.../workflowcatalog/WorkflowStatusEntity.java | 2 +-
.../core/repositories/AbstractRepository.java | 4 +-
.../appcatalog/AppCatAbstractRepository.java | 2 +-
.../appcatalog/ComputeResourceRepository.java | 2 +-
.../appcatalog/ResourceJobManagerRepository.java | 2 +-
.../expcatalog/ExpCatAbstractRepository.java | 2 +-
.../expcatalog/ExperimentSummaryRepository.java | 2 +-
.../replicacatalog/RepCatAbstractRepository.java | 2 +-
.../WorkflowCatAbstractRepository.java | 2 +-
.../core/utils/JPAUtil/AppCatalogJPAUtils.java | 4 +-
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 4 +-
.../core/utils/JPAUtil/RepCatalogJPAUtils.java | 4 +-
.../utils/JPAUtil/WorkflowCatalogJPAUtils.java | 4 +-
.../src/main/resources/META-INF/persistence.xml | 16 +
.../mysql/airavata-server.properties | 6 +-
modules/server/pom.xml | 7 +-
.../sharing-registry/sharing-data-migrator/pom.xml | 8 +-
.../sharing-registry-server/pom.xml | 32 +-
.../sharing/registry/db/entities/DomainEntity.java | 2 +-
.../sharing/registry/db/entities/EntityEntity.java | 2 +-
.../sharing/registry/db/entities/EntityPK.java | 4 +-
.../registry/db/entities/EntityTypeEntity.java | 2 +-
.../sharing/registry/db/entities/EntityTypePK.java | 4 +-
.../registry/db/entities/GroupAdminEntity.java | 2 +-
.../sharing/registry/db/entities/GroupAdminPK.java | 4 +-
.../db/entities/GroupMembershipEntity.java | 2 +-
.../registry/db/entities/GroupMembershipPK.java | 4 +-
.../registry/db/entities/PermissionTypeEntity.java | 2 +-
.../registry/db/entities/PermissionTypePK.java | 4 +-
.../registry/db/entities/SharingEntity.java | 2 +-
.../sharing/registry/db/entities/SharingPK.java | 4 +-
.../sharing/registry/db/entities/UserEntity.java | 2 +-
.../registry/db/entities/UserGroupEntity.java | 2 +-
.../sharing/registry/db/entities/UserGroupPK.java | 4 +-
.../sharing/registry/db/entities/UserPK.java | 4 +-
.../db/repositories/AbstractRepository.java | 6 +-
.../db/repositories/SharingRepository.java | 2 +-
.../sharing/registry/db/utils/JPAUtils.java | 4 +-
.../src/main/resources/META-INF/persistence.xml | 4 +
.../src/main/resources/airavata.jks | Bin 1410 -> 0 bytes
.../src/main/resources/client_truststore.jks | Bin 5312 -> 0 bytes
.../src/test/resources/airavata.jks | Bin 1410 -> 0 bytes
.../src/test/resources/client_truststore.jks | Bin 5312 -> 0 bytes
.../sharing-registry-stubs/pom.xml | 5 +-
pom.xml | 17 +-
tools/load-client/pom.xml | 6 +
.../src/main/assembly/load-client-bin-assembly.xml | 2 +-
.../src/main/resources/client_truststore.jks | Bin 5312 -> 0 bytes
240 files changed, 3404 insertions(+), 4580 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..79250c290c
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,8 @@
+FROM mcr.microsoft.com/devcontainers/base:debian
+
+USER vscode
+
+RUN curl https://mise.run | sh
+RUN ~/.local/bin/mise install -y java@openjdk-17 maven@3.9.9 python@3.10 golang@1.23; \
+ ~/.local/bin/mise use -g java@openjdk-17 maven@3.9.9 python@3.10 golang@1.23; \
+ ~/.local/bin/mise env >> ~/.bashrc
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..05d77d7d5d
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+ "name": "Airavata",
+ "dockerComposeFile": "docker-compose.yml",
+ "service": "devcontainer",
+ "features": {},
+ "workspaceFolder": "/workspace",
+ "forwardPorts": [],
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "esbenp.prettier-vscode",
+ "eamodio.gitlens",
+ "foxundermoon.shell-format",
+ "golang.go",
+ "lkrms.inifmt",
+ "ms-python.python",
+ "ms-python.autopep8",
+ "ms-python.isort",
+ "ms-toolsai.jupyter",
+ "njpwerner.autodocstring",
+ "vscjava.vscode-java-pack",
+ ]
+ },
+ }
+}
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000000..0e8e5346a0
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,142 @@
+networks:
+ airavata-network:
+ driver: bridge
+ name: airavata.host
+ ipam:
+ config:
+ - subnet: 192.168.100.0/24
+ gateway: 192.168.100.1
+
+volumes:
+ db_data:
+ driver: local
+
+services:
+ devcontainer:
+ build: .
+ volumes:
+ - ..:/workspace:cached
+ command: sleep infinity
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.10
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ keycloak:
+ image: keycloak/keycloak:24.0
+ restart: always
+ environment:
+ KEYCLOAK_ADMIN: admin
+ KEYCLOAK_ADMIN_PASSWORD: admin
+ ports:
+ - "18080:8080"
+ - "8443:8443"
+ volumes:
+ - ../modules/ide-integration/src/main/containers/keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json
+ - ../modules/ide-integration/src/main/containers/keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf
+ - ../keystores/airavata.jks:/opt/keycloak/conf/keystores/airavata.jks
+ command: ["start-dev", "--import-realm"]
+ depends_on:
+ - db
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.11
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ db:
+ image: mariadb:10.4.13
+ restart: always
+ environment:
+ MYSQL_ROOT_PASSWORD: 123456
+ MYSQL_USER: airavata
+ MYSQL_PASSWORD: 123456
+ volumes:
+ - ../modules/ide-integration/src/main/containers/database_scripts/init:/docker-entrypoint-initdb.d
+ - db_data:/var/lib/mysql
+ ports:
+ - "13306:3306"
+ command:
+ [
+ "mysqld",
+ "--character-set-server=utf8mb4",
+ "--collation-server=utf8mb4_unicode_ci",
+ "--sql-mode=NO_ENGINE_SUBSTITUTION",
+ ]
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.12
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ rabbitmq:
+ image: rabbitmq:4.0-management
+ restart: always
+ environment:
+ RABBITMQ_DEFAULT_VHOST: develop
+ ports:
+ - "5672:5672"
+ - "15672:15672"
+ depends_on:
+ - db
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.13
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ zookeeper:
+ image: zookeeper
+ restart: always
+ hostname: zk
+ ports:
+ - "12181:2181"
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.14
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ kafka:
+ image: wurstmeister/kafka:latest
+ restart: always
+ hostname: kafka
+ ports:
+ - "9092:9092"
+ environment:
+ KAFKA_ADVERTISED_HOST_NAME: 192.168.100.15
+ KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ depends_on:
+ - zookeeper
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.15
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ sshd:
+ image: dimuthuupe/sshd:1.0
+ restart: always
+ volumes:
+ - /tmp:/tmp
+ ports:
+ - "22222:22"
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.16
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ adminer:
+ image: adminer:latest
+ restart: always
+ ports:
+ - "18088:8080"
+ depends_on:
+ - db
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.17
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
diff --git a/.gitignore b/.gitignore
index 31c5ae99db..38e85d00a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ com_crashlytics_export_strings.xml
.DS_Store
.project
.vscode
+!.vscode/launch.json
.settings
.classpath
.factorypath
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000..9a39c30cdc
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,26 @@
+{
+ "configurations": [
+ {
+ "type": "java",
+ "name": "Start API Server",
+ "request": "launch",
+ "cwd": "${workspaceFolder}/modules/ide-integration",
+ "mainClass": "org.apache.airavata.ide.integration.APIServerStarter",
+ "vmArgs": "-javaagent:/home/vscode/.m2/repository/org/apache/openjpa/openjpa/4.0.1/openjpa-4.0.1.jar",
+ },
+ {
+ "type": "java",
+ "name": "Start Job Engine",
+ "request": "launch",
+ "cwd": "${workspaceFolder}/modules/ide-integration",
+ "mainClass": "org.apache.airavata.ide.integration.JobEngineStarter"
+ },
+ {
+ "type": "java",
+ "name": "Start Job Monitor",
+ "request": "launch",
+ "cwd": "${workspaceFolder}/modules/ide-integration",
+ "mainClass": "org.apache.airavata.ide.integration.JobMonitorStarter"
+ }
+ ],
+}
\ No newline at end of file
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
index b4a846e35c..fe7cffd281 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
@@ -43,7 +43,7 @@
<executions>
<execution>
<id>unpack</id>
- <phase>compile</phase>
+ <phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
index b2686aee96..91052cc17b 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
@@ -43,7 +43,7 @@
<executions>
<execution>
<id>unpack</id>
- <phase>compile</phase>
+ <phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml
index 3c40866258..1d02d39acf 100644
--- a/airavata-services/profile-service/iam-admin-services-core/pom.xml
+++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml
@@ -58,6 +58,12 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>${keycloak.admin.client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 370ad62cd9..3394c9aff0 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -36,7 +36,7 @@
<derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>true</skipTests>
- <mysql.connector.version>5.1.34</mysql.connector.version>
+ <mysql.connector.version>8.0.31</mysql.connector.version>
</properties>
<dependencies>
@@ -88,17 +88,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
- <!--<source>1.8</source>-->
- <!--<target>1.8</target>-->
- <release>11</release>
+ <!--<source>17</source>-->
+ <!--<target>17</target>-->
+ <release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.version}</version>
+ <version>${openjpa.maven.plugin.version}</version>
<configuration>
<includes>**/entities/*.class</includes>
<excludes>**/entities/XML*.class</excludes>
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java
index 8f9df30cd1..f616a87a0f 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java
@@ -25,7 +25,7 @@ import org.dozer.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
index e9d822d806..b3d76aadea 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.service.profile.commons.tenant.entities;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.UUID;
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java
index 211868cf21..799df4499a 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java
@@ -22,7 +22,7 @@
package org.apache.airavata.service.profile.commons.user.entities;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "CUSTOMIZED_DASHBOARD")
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java
index bccbe6abcb..8468189d66 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.service.profile.commons.user.entities;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.List;
@Entity
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java
index 2c2f06ac78..d6fac6c512 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.service.profile.commons.user.entities;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.List;
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
index effac44064..b89851ca38 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
@@ -19,8 +19,8 @@
*/
package org.apache.airavata.service.profile.commons.utils;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import org.apache.airavata.common.utils.JDBCConfig;
diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java
index 8bc718e7eb..f8f018f029 100644
--- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java
+++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java
@@ -44,6 +44,7 @@ public class UserProfileService {
* @param authzToken
* @param userProfile
*/
+ @Deprecated
public java.lang.String addUserProfile(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.user.UserProfile userProfile) throws org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public boolean updateUserProfile(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.user.UserProfile userProfile) throws org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
diff --git a/airavata-services/profile-service/profile-tenant-core/pom.xml b/airavata-services/profile-service/profile-tenant-core/pom.xml
index 464d4eeff1..baeb2f7c7c 100644
--- a/airavata-services/profile-service/profile-tenant-core/pom.xml
+++ b/airavata-services/profile-service/profile-tenant-core/pom.xml
@@ -36,7 +36,7 @@
<derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
- <mysql.connector.version>5.1.34</mysql.connector.version>
+ <mysql.connector.version>8.0.31</mysql.connector.version>
</properties>
<dependencies>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index eebf3f3f38..d187dfd8cf 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -36,7 +36,7 @@
<derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
- <mysql.connector.version>5.1.34</mysql.connector.version>
+ <mysql.connector.version>8.0.31</mysql.connector.version>
</properties>
<dependencies>
@@ -52,9 +52,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
- <release>11</release>
+ <release>17</release>
<compilerArgs>
<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
</compilerArgs>
@@ -64,7 +64,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.version}</version>
+ <version>${openjpa.maven.plugin.version}</version>
<configuration>
<includes>**/entities/*.class</includes>
<excludes>**/entities/XML*.class</excludes>
diff --git a/modules/ide-integration/src/main/resources/keystores/airavata.jks b/keystores/airavata.jks
similarity index 100%
rename from modules/ide-integration/src/main/resources/keystores/airavata.jks
rename to keystores/airavata.jks
diff --git a/keystores/client_truststore.jks b/keystores/client_truststore.jks
new file mode 100644
index 0000000000..d163c6d4f1
Binary files /dev/null and b/keystores/client_truststore.jks differ
diff --git a/keystores/generate_keystore.sh b/keystores/generate_keystore.sh
new file mode 100755
index 0000000000..dfb46d8f3e
--- /dev/null
+++ b/keystores/generate_keystore.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Remove existing key stores
+rm -f airavata.jks client_truststore.jks
+
+# Generate a PKCS12 keystore with a self-signed certificate
+keytool -genkey -keyalg RSA -alias selfsigned -keystore airavata.jks -storetype pkcs12 -storepass airavata -validity 360 -keysize 2048 \
+ -dname "CN=airavata.host, OU=airavata.host, O=airavata.host, L=airavata.host, ST=airavata.host, C=airavata.host" \
+ -ext san=dns:airavata.host
+
+# Also generate a JKS keystore with that certificate (for backward-compatibility)
+keytool -importkeystore -noprompt \
+ -srckeystore airavata.jks -srcstoretype pkcs12 -srcstorepass airavata \
+ -destkeystore client_truststore.jks -deststoretype jks -deststorepass airavata
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index 6b57bd2868..8bfe2020a2 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -31,17 +31,17 @@
<artifactId>agent-service</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jul-to-slf4j.version>1.7.0</jul-to-slf4j.version>
<json.version>20240303</json.version>
<javax.version>2.0.1.Final</javax.version>
<apache.commons.lang3.version>3.14.0</apache.commons.lang3.version>
<mysql.connector.java>8.0.31</mysql.connector.java>
- <protobuf.version>3.23.4</protobuf.version>
- <protobuf-plugin.version>0.6.1</protobuf-plugin.version>
- <grpc.version>1.63.0</grpc.version>
+ <protoc.version>4.30.1</protoc.version>
+ <protobuf-plugin.version>2.12.1</protobuf-plugin.version>
+ <grpc.version>1.71.0</grpc.version>
<agent.service.dist.name>Agent-Service-0.01</agent.service.dist.name>
</properties>
@@ -109,16 +109,16 @@
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protoc.version}</version>
+ </dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
<version>3.0.0.RELEASE</version>
</dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${javax.version}</version>
- </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -164,30 +164,35 @@
</executions>
</plugin>
<plugin>
- <groupId>org.xolstice.maven.plugins</groupId>
- <artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-plugin.version}</version>
- <configuration>
- <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
- <pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>compile-custom</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>io.github.ascopes</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf-plugin.version}</version>
+ <configuration>
+ <protocVersion>${protoc.version}</protocVersion>
+ <sourceDirectories>
+ <sourceDirectory>${project.basedir}/../proto</sourceDirectory>
+ </sourceDirectories>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>14</source>
- <target>14</target>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.plugin.version}</version>
+ <configuration>
+ <source>17</source>
+ <target>17</target>
+ <generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory>
+ <includes>
+ <include>${project.build.directory}/generated-sources/**/*.java</include>
+ </includes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java
index e7ac9e8826..a2febb0b9b 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java
@@ -18,14 +18,12 @@
*/
package org.apache.airavata.agent.connection.service.controllers;
-import javax.validation.Valid;
-
-import org.apache.airavata.agent.TunnelCreationResponse;
import org.apache.airavata.agent.connection.service.handlers.AgentConnectionHandler;
import org.apache.airavata.agent.connection.service.models.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -57,19 +55,19 @@ public class AgentController {
}
@PostMapping("/setup/tunnel")
- public ResponseEntity<AgentTunnelAck> runTunnelCreationOnAgent(@Valid @RequestBody AgentTunnelCreateRequest tunnelRequest) {
+ public ResponseEntity<AgentTunnelAck> runTunnelCreationOnAgent(@Validated @RequestBody AgentTunnelCreateRequest tunnelRequest) {
logger.info("Received tunnel creation request to run on agent {}", tunnelRequest.getAgentId());
return ResponseEntity.accepted().body(agentConnectionHandler.runTunnelOnAgent(tunnelRequest));
}
@PostMapping("/terminate/tunnel")
- public ResponseEntity<AgentTunnelAck> runTunnelCreationOnAgent(@Valid @RequestBody AgentTunnelTerminateRequest terminateRequest) {
+ public ResponseEntity<AgentTunnelAck> runTunnelCreationOnAgent(@Validated @RequestBody AgentTunnelTerminateRequest terminateRequest) {
logger.info("Received tunnel termination request to run on agent {}", terminateRequest.getAgentId());
return ResponseEntity.accepted().body(agentConnectionHandler.terminateTunnelOnAgent(terminateRequest));
}
@PostMapping("/setup/env")
- public ResponseEntity<AgentEnvSetupAck> runEnvSetupOnAgent(@Valid @RequestBody AgentEnvSetupRequest envSetupRequest) {
+ public ResponseEntity<AgentEnvSetupAck> runEnvSetupOnAgent(@Validated @RequestBody AgentEnvSetupRequest envSetupRequest) {
logger.info("Received env setup request to run on agent {}", envSetupRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(envSetupRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runEnvSetupOnAgent(envSetupRequest));
@@ -88,7 +86,7 @@ public class AgentController {
}
@PostMapping("/setup/restart")
- public ResponseEntity<AgentKernelRestartAck> runKernelRestartOnAgent(@Valid @RequestBody AgentKernelRestartRequest kernelRestartRequest) {
+ public ResponseEntity<AgentKernelRestartAck> runKernelRestartOnAgent(@Validated @RequestBody AgentKernelRestartRequest kernelRestartRequest) {
logger.info("Received kernel restart request to run on agent {}", kernelRestartRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(kernelRestartRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runKernelRestartOnAgent(kernelRestartRequest));
@@ -107,7 +105,7 @@ public class AgentController {
}
@PostMapping("/execute/shell")
- public ResponseEntity<AgentCommandExecutionAck> runCommandOnAgent(@Valid @RequestBody AgentCommandExecutionRequest commandRequest) {
+ public ResponseEntity<AgentCommandExecutionAck> runCommandOnAgent(@Validated @RequestBody AgentCommandExecutionRequest commandRequest) {
logger.info("Received command request to run on agent {}", commandRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(commandRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runCommandOnAgent(commandRequest));
@@ -127,7 +125,7 @@ public class AgentController {
@PostMapping("/execute/asyncshell")
- public ResponseEntity<AgentCommandExecutionAck> runAsyncCommandOnAgent(@Valid @RequestBody AgentAsyncCommandExecutionRequest commandRequest) {
+ public ResponseEntity<AgentCommandExecutionAck> runAsyncCommandOnAgent(@Validated @RequestBody AgentAsyncCommandExecutionRequest commandRequest) {
logger.info("Received async command request to run on agent {}", commandRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(commandRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runAsyncCommandOnAgent(commandRequest));
@@ -147,7 +145,7 @@ public class AgentController {
@PostMapping("/list/asyncshell")
public ResponseEntity<AgentCommandExecutionAck> listAsyncCommandOnAgent(
- @Valid @RequestBody AgentAsyncCommandListRequest commandListRequest) {
+ @Validated @RequestBody AgentAsyncCommandListRequest commandListRequest) {
logger.info("Received list async command request to run on agent {}", commandListRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(commandListRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runAsyncCommandListOnAgent(commandListRequest));
@@ -167,7 +165,7 @@ public class AgentController {
@PostMapping("/terminate/asyncshell")
public ResponseEntity<AgentCommandExecutionAck> terminateAsyncCommandOnAgent(
- @Valid @RequestBody AgentAsyncCommandTerminateRequest commandTerminateRequest) {
+ @Validated @RequestBody AgentAsyncCommandTerminateRequest commandTerminateRequest) {
logger.info("Received terminate async command request to run on agent {}", commandTerminateRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(commandTerminateRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runAsyncCommandTerminateOnAgent(commandTerminateRequest));
@@ -186,7 +184,7 @@ public class AgentController {
}
@PostMapping("/execute/jupyter")
- public ResponseEntity<AgentJupyterExecutionAck> runJupyterOnAgent(@Valid @RequestBody AgentJupyterExecutionRequest executionRequest) {
+ public ResponseEntity<AgentJupyterExecutionAck> runJupyterOnAgent(@Validated @RequestBody AgentJupyterExecutionRequest executionRequest) {
logger.info("Received jupyter execution request to run on agent {}", executionRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(executionRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runJupyterOnAgent(executionRequest));
@@ -205,7 +203,7 @@ public class AgentController {
}
@PostMapping("/execute/python")
- public ResponseEntity<AgentPythonExecutionAck> runPythonOnAgent(@Valid @RequestBody AgentPythonExecutionRequest pythonRunRequest) {
+ public ResponseEntity<AgentPythonExecutionAck> runPythonOnAgent(@Validated @RequestBody AgentPythonExecutionRequest pythonRunRequest) {
logger.info("Received python execution request to run on agent {}", pythonRunRequest.getAgentId());
if (agentConnectionHandler.isAgentUp(pythonRunRequest.getAgentId()).isAgentUp()) {
return ResponseEntity.accepted().body(agentConnectionHandler.runPythonOnAgent(pythonRunRequest));
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
index 9cddb66e4c..f2fd6688f0 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
@@ -18,8 +18,6 @@
*/
package org.apache.airavata.agent.connection.service.controllers;
-import javax.validation.Valid;
-
import org.apache.airavata.agent.connection.service.handlers.AgentManagementHandler;
import org.apache.airavata.agent.connection.service.models.AgentLaunchRequest;
import org.apache.airavata.agent.connection.service.models.AgentLaunchResponse;
@@ -39,6 +37,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import org.springframework.validation.annotation.Validated;
+
@RestController
@RequestMapping("/api/v1/exp")
public class ExperimentController {
@@ -57,13 +57,13 @@ public class ExperimentController {
}
@PostMapping(value = "/launch", consumes = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<AgentLaunchResponse> createAndLaunchExperiment(@Valid @RequestBody AgentLaunchRequest request) {
+ public ResponseEntity<AgentLaunchResponse> createAndLaunchExperiment(@Validated @RequestBody AgentLaunchRequest request) {
AgentLaunchResponse agentResponse = agentManagementHandler.createAndLaunchExperiment(request);
return ResponseEntity.ok(agentResponse);
}
@PostMapping(value = "/launchoptimize", consumes = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<AgentLaunchResponse> createAndLaunchOptimizedExperiment(@Valid @RequestBody List<AgentLaunchRequest> request) {
+ public ResponseEntity<AgentLaunchResponse> createAndLaunchOptimizedExperiment(@Validated @RequestBody List<AgentLaunchRequest> request) {
try {
AgentLaunchRequest agentLaunchRequest = agentManagementHandler.filterOptimumLaunchRequest(request);
AgentLaunchResponse agentResponse = agentManagementHandler.createAndLaunchExperiment(agentLaunchRequest);
diff --git a/modules/agent-framework/agent-service/src/main/proto b/modules/agent-framework/agent-service/src/main/proto
deleted file mode 120000
index adcd77d7b0..0000000000
--- a/modules/agent-framework/agent-service/src/main/proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../proto
\ No newline at end of file
diff --git a/modules/agent-framework/agent-service/src/main/resources/application.yml b/modules/agent-framework/agent-service/src/main/resources/application.yml
index 4fd4f9fa58..b2c142bf75 100644
--- a/modules/agent-framework/agent-service/src/main/resources/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/application.yml
@@ -29,7 +29,7 @@ spring:
max-file-size: 200MB
max-request-size: 200MB
datasource:
- url: "jdbc:mariadb://localhost:13306/app_catalog"
+ url: "jdbc:mariadb://airavata.host:13306/app_catalog"
username: "root"
password: "123456"
driver-class-name: org.mariadb.jdbc.Driver
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
index 7b1519be82..9f35d9f5f8 100644
--- a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
@@ -28,7 +28,7 @@ spring:
max-file-size: 200MB
max-request-size: 200MB
datasource:
- url: "jdbc:mariadb://localhost:13306/app_catalog"
+ url: "jdbc:mariadb://airavata.host:13306/app_catalog"
username: "root"
password: "123456"
driver-class-name: org.mariadb.jdbc.Driver
diff --git a/modules/agent-framework/pom.xml b/modules/agent-framework/pom.xml
index 38bca284bb..849e628b1e 100644
--- a/modules/agent-framework/pom.xml
+++ b/modules/agent-framework/pom.xml
@@ -36,9 +36,22 @@
</modules>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>../../keystores</directory>
+ <targetPath>keystores</targetPath>
+ <includes>
+ <include>*.jks</include>
+ <include>*.p12</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/modules/airavata-helix/agent-api/pom.xml b/modules/airavata-helix/agent-api/pom.xml
index 7467f0e658..3011a6eac1 100644
--- a/modules/airavata-helix/agent-api/pom.xml
+++ b/modules/airavata-helix/agent-api/pom.xml
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
diff --git a/modules/airavata-helix/task-api/pom.xml b/modules/airavata-helix/task-api/pom.xml
index 666a1b51da..43801cc8c7 100644
--- a/modules/airavata-helix/task-api/pom.xml
+++ b/modules/airavata-helix/task-api/pom.xml
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
diff --git a/modules/airavata-helix/task-core/pom.xml b/modules/airavata-helix/task-core/pom.xml
index 61fd2811a1..f07c5d41ea 100644
--- a/modules/airavata-helix/task-core/pom.xml
+++ b/modules/airavata-helix/task-core/pom.xml
@@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
diff --git a/modules/airavata-helix/workflow-impl/pom.xml b/modules/airavata-helix/workflow-impl/pom.xml
index 54a407072e..8baf3a01c2 100644
--- a/modules/airavata-helix/workflow-impl/pom.xml
+++ b/modules/airavata-helix/workflow-impl/pom.xml
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
index 34fcad2e99..7ec6806547 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml
+++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
@@ -13,8 +13,8 @@
<artifactId>metadata-analyzer</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml
index 1c1d20b8e6..9969b9982b 100644
--- a/modules/airavata-metascheduler/metascheduler-core/pom.xml
+++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml
@@ -13,8 +13,8 @@
<artifactId>metascheduler-core</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
@@ -42,19 +42,13 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
diff --git a/modules/airavata-metascheduler/pom.xml b/modules/airavata-metascheduler/pom.xml
index f2a93aab50..fb869d410e 100644
--- a/modules/airavata-metascheduler/pom.xml
+++ b/modules/airavata-metascheduler/pom.xml
@@ -13,8 +13,8 @@
<artifactId>airavata-metascheduler</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml
index fc5d372094..71aa94c5e1 100644
--- a/modules/airavata-metascheduler/process-scheduler/pom.xml
+++ b/modules/airavata-metascheduler/process-scheduler/pom.xml
@@ -13,8 +13,8 @@
<artifactId>process-scheduler</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -59,12 +59,6 @@
<version>0.21-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.3.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml
index 0b7aa75259..6c8dd5cdac 100644
--- a/modules/cluster-monitoring/pom.xml
+++ b/modules/cluster-monitoring/pom.xml
@@ -55,12 +55,12 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.2.1</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
- <version>2.2.1</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index 88c334dd97..5c0a218357 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -145,6 +145,7 @@ public class ApplicationSettings {
* @throws ApplicationSettingsException If an error occurred while reading configurations.
* @deprecated use #getSetting(String) instead
*/
+ @Deprecated
public String getAbsoluteSetting(String key) throws ApplicationSettingsException {
String configurationValueWithVariables = ApplicationSettings.getSetting(key);
@@ -290,6 +291,7 @@ public class ApplicationSettings {
* @deprecated use {{@link #getSetting(String)}}
* @return
*/
+ @Deprecated
public Properties getPropertiesImpl() {
return properties;
}
@@ -501,6 +503,7 @@ public class ApplicationSettings {
* @return
* @throws ApplicationSettingsException
*/
+ @Deprecated
public static Properties getProperties() throws ApplicationSettingsException {
return getInstance().properties;
}
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
index 6ec2b67177..6d61104f8c 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
@@ -4,8 +4,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/commons/src/test/resources/mykeystore.jks b/modules/commons/src/test/resources/mykeystore.jks
deleted file mode 100644
index 335ebf8b52..0000000000
Binary files a/modules/commons/src/test/resources/mykeystore.jks and /dev/null differ
diff --git a/modules/computer-resource-monitoring-service/pom.xml b/modules/computer-resource-monitoring-service/pom.xml
index 6586d367b9..129a93aee5 100644
--- a/modules/computer-resource-monitoring-service/pom.xml
+++ b/modules/computer-resource-monitoring-service/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -59,8 +59,8 @@
</dependencies>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 2add9f3b5e..549f441ca1 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -170,6 +170,14 @@
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
+ <testResource>
+ <directory>${project.basedir}/../../../keystores</directory>
+ <targetPath>keystores</targetPath>
+ <includes>
+ <include>*.jks</include>
+ <include>*.p12</include>
+ </includes>
+ </testResource>
</testResources>
</build>
</project>
diff --git a/modules/credential-store/credential-store-service/src/test/resources/keystore.jks b/modules/credential-store/credential-store-service/src/test/resources/keystore.jks
deleted file mode 100644
index 14cf02261e..0000000000
Binary files a/modules/credential-store/credential-store-service/src/test/resources/keystore.jks and /dev/null differ
diff --git a/modules/credential-store/credential-store-service/src/test/resources/mykeystore.jks b/modules/credential-store/credential-store-service/src/test/resources/mykeystore.jks
deleted file mode 100644
index 335ebf8b52..0000000000
Binary files a/modules/credential-store/credential-store-service/src/test/resources/mykeystore.jks and /dev/null differ
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index e35292fc44..788eca2aa7 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -445,7 +445,7 @@
<executions>
<execution>
<id>unpack</id>
- <phase>compile</phase>
+ <phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index 29f17779cc..767d8360e4 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -133,7 +133,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>javax.mail:mail:jar</include>
+ <include>jakarta.mail:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index c0519fbb09..64400e89fb 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -92,8 +92,8 @@
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
- <include>javax.mail:javax.mail-api:jar</include>
- <include>com.sun.mail:javax.mail:jar</include>
+ <include>jakarta.mail:jakarta.mail-api:jar</include>
+ <include>jakarta.mail:jakarta.mail:jar</include>
<include>javax.activation:activation:jar</include>
<include>org.yaml:snakeyaml:jar</include>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index fb69c836c4..3a30e919e5 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -138,7 +138,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>javax.mail:mail:jar</include>
+ <include>jakarta.mail:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index 1cc4499a97..5ea4d98327 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -139,7 +139,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>javax.mail:mail:jar</include>
+ <include>jakarta.mail:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 2d5b00b9ad..6dab1016dd 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -138,8 +138,8 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>javax.mail:mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
+ <include>jakarta.mail:jakarta.mail:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
<include>org.apache.airavata:platform-monitor:jar</include>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index 75fa397967..d6b0e9ae5e 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -138,7 +138,7 @@
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.lz4:lz4-java:jar</include>
- <include>javax.mail:mail:jar</include>
+ <include>jakarta.mail:jakarta.mail:jar</include>
<include>io.dropwizard.metrics:metrics-core:jar</include>
<include>org.jboss.netty:netty:jar</include>
<include>org.apache.openjpa:openjpa:jar</include>
diff --git a/modules/distribution/src/main/docker/docker-compose.yml b/modules/distribution/src/main/docker/docker-compose.yml
index 8dbb1d895c..ed6cc60a72 100644
--- a/modules/distribution/src/main/docker/docker-compose.yml
+++ b/modules/distribution/src/main/docker/docker-compose.yml
@@ -173,7 +173,7 @@ services:
- profile.service.jdbc.password=123456
- profile.service.jdbc.driver=org.mariadb.jdbc.Driver
- profile.service.validationQuery=SELECT 1
- - iam.server.url=https://airavata.host:8443/auth
+ - iam.server.url=https://airavata.host:8443
- iam.server.super.admin.username=admin
- iam.server.super.admin.password=admin
- db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index aa58c9281d..4a3fe4363c 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg>
diff --git a/modules/ide-integration/src/main/containers/.gitignore b/modules/ide-integration/.gitignore
similarity index 100%
rename from modules/ide-integration/src/main/containers/.gitignore
rename to modules/ide-integration/.gitignore
diff --git a/modules/ide-integration/README.md b/modules/ide-integration/README.md
index f07dbd5d45..e31cd62d2f 100644
--- a/modules/ide-integration/README.md
+++ b/modules/ide-integration/README.md
@@ -189,40 +189,21 @@ https://myaccount.google.com/security
### NOTE: (Optional) Creating certificates if expired
* This is required only when the self signed certificate for keycloak is expired
- * Go to src/main/resources/keystores
+ * Go to <PROJECT_ROOT>/keystores
* Provide password as airavata for all key stores
- ```
- rm airavata.jks
-
- rm client_truststore.jks
-
- keytool -genkey -keyalg RSA -alias selfsigned -keystore keystore.jks -storepass airavata -validity 360 -keysize 2048
- What is your first and last name?
- [Unknown]: airavata.host
- What is the name of your organizational unit?
- [Unknown]: airavata.host
- What is the name of your organization?
- [Unknown]: airavata.host
- What is the name of your City or Locality?
- [Unknown]: airavata.host
- What is the name of your State or Province?
- [Unknown]: airavata.host
- What is the two-letter country code for this unit?
- [Unknown]: airavata.host
- Is CN=airavata.host, OU=airavata.host, O=airavata.host, L=airavata.host, ST=airavata.host, C=airavata.host correct?
- [no]: yes
-
-
- keytool -importkeystore -srckeystore keystore.jks -destkeystore airavata.jks -deststoretype pkcs12
+ ```sh
- rm keystore.jks
+ # Remove existing key stores
+ rm -f airavata.jks client_truststore.jks
- keytool -export -alias selfsigned -file root.cer -keystore airavata.jks -storepass airavata
+ # Generate a PKCS12 keystore with a self-signed certificate
+ keytool -genkey -keyalg RSA -alias selfsigned -keystore airavata.jks -storetype pkcs12 -storepass airavata -validity 360 -keysize 2048 \
+ -dname "CN=airavata.host, OU=airavata.host, O=airavata.host, L=airavata.host, ST=airavata.host, C=airavata.host"
- keytool -import -alias mykey -file root.cer -keystore client_truststore.jks -storepass airavata
-
- rm root.cer
-
-```
+ # Also generate a JKS keystore with that certificate (for backward-compatibility)
+ keytool -importkeystore -noprompt \
+ -srckeystore airavata.jks -srcstoretype pkcs12 -srcstorepass airavata \
+ -destkeystore client_truststore.jks -deststoretype jks -deststorepass airavata
+ ```
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index 0f3bec05dc..1b8162b6d5 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -83,6 +83,14 @@
<exclude>pga/**</exclude>
</excludes>
</resource>
+ <resource>
+ <directory>../../keystores</directory>
+ <targetPath>keystores</targetPath>
+ <includes>
+ <include>*.jks</include>
+ <include>*.p12</include>
+ </includes>
+ </resource>
</resources>
</build>
diff --git a/modules/ide-integration/src/main/containers/docker-compose.yml b/modules/ide-integration/src/main/containers/docker-compose.yml
deleted file mode 100644
index 4be68e9e0c..0000000000
--- a/modules/ide-integration/src/main/containers/docker-compose.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-version: '3'
-services:
- keycloak:
- image: quay.io/keycloak/keycloak:24.0.0
- environment:
- - KEYCLOAK_ADMIN=admin
- - KEYCLOAK_ADMIN_PASSWORD=admin
- ports:
- - "18080:8080"
- - "8443:8443"
- volumes:
- - ../resources/keystores/airavata.jks:/opt/keycloak/conf/airavata.jks
- - ./keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf
- command:
- - start-dev
- - "--import-realm"
- - "--hostname-strict=false"
- db:
- image: mariadb:10.4.13
- environment:
- - MYSQL_ROOT_PASSWORD=123456
- - MYSQL_USER=airavata
- - MYSQL_PASSWORD=123456
- volumes:
- - ./database_scripts/init:/docker-entrypoint-initdb.d
- - database_data:/var/lib/mysql
- ports:
- - "13306:3306"
- command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci', '--sql_mode=']
- rabbitmq:
- image: rabbitmq
- environment:
- - RABBITMQ_DEFAULT_VHOST=develop
- ports:
- - "5672:5672"
- - "15672:15672"
- zookeeper:
- image: zookeeper
- restart: always
- hostname: zk
- ports:
- - "12181:2181"
- kafka:
- image: wurstmeister/kafka
- hostname: kafka
- ports:
- - "9092:9092"
- environment:
- KAFKA_ADVERTISED_HOST_NAME: localhost
- KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
- sshd:
- image: dimuthuupe/sshd:1.0
- volumes:
- - /tmp:/tmp
- ports:
- - "22222:22"
-
-volumes:
- database_data:
- driver: local
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/containers/keycloak/Default-export.json b/modules/ide-integration/src/main/containers/keycloak/Default-export.json
deleted file mode 100644
index 4b2e775f5d..0000000000
--- a/modules/ide-integration/src/main/containers/keycloak/Default-export.json
+++ /dev/null
@@ -1,1990 +0,0 @@
-{
- "id": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "realm": "default",
- "displayName": "",
- "displayNameHtml": "",
- "notBefore": 0,
- "defaultSignatureAlgorithm": "RS256",
- "revokeRefreshToken": false,
- "refreshTokenMaxReuse": 0,
- "accessTokenLifespan": 7200,
- "accessTokenLifespanForImplicitFlow": 3600,
- "ssoSessionIdleTimeout": 604800,
- "ssoSessionMaxLifespan": 604800,
- "ssoSessionIdleTimeoutRememberMe": 0,
- "ssoSessionMaxLifespanRememberMe": 0,
- "offlineSessionIdleTimeout": 2592000,
- "offlineSessionMaxLifespanEnabled": false,
- "offlineSessionMaxLifespan": 5184000,
- "clientSessionIdleTimeout": 0,
- "clientSessionMaxLifespan": 0,
- "clientOfflineSessionIdleTimeout": 0,
- "clientOfflineSessionMaxLifespan": 0,
- "accessCodeLifespan": 60,
- "accessCodeLifespanUserAction": 300,
- "accessCodeLifespanLogin": 1800,
- "actionTokenGeneratedByAdminLifespan": 43200,
- "actionTokenGeneratedByUserLifespan": 300,
- "oauth2DeviceCodeLifespan": 600,
- "oauth2DevicePollingInterval": 5,
- "enabled": true,
- "sslRequired": "external",
- "registrationAllowed": false,
- "registrationEmailAsUsername": false,
- "rememberMe": false,
- "verifyEmail": false,
- "loginWithEmailAllowed": true,
- "duplicateEmailsAllowed": false,
- "resetPasswordAllowed": false,
- "editUsernameAllowed": false,
- "bruteForceProtected": false,
- "permanentLockout": false,
- "maxTemporaryLockouts": 0,
- "maxFailureWaitSeconds": 900,
- "minimumQuickLoginWaitSeconds": 60,
- "waitIncrementSeconds": 60,
- "quickLoginCheckMilliSeconds": 1000,
- "maxDeltaTimeSeconds": 43200,
- "failureFactor": 30,
- "roles": {
- "realm": [
- {
- "id": "4cd8497d-db71-41dd-9186-f7df0c22d446",
- "name": "gateway-provider",
- "description": "",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "b585e111-f934-43b7-b9c2-cbad0c7dc08a",
- "name": "default-roles-10000000",
- "description": "${role_default-roles}",
- "composite": true,
- "composites": {
- "realm": [
- "offline_access",
- "uma_authorization"
- ],
- "client": {
- "account": [
- "view-profile",
- "manage-account"
- ]
- }
- },
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "420f07dc-c07c-4ea8-bf56-f6adf3f2bbc7",
- "name": "uma_authorization",
- "description": "${role_uma_authorization}",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "61fafc5e-96fc-4644-98a9-94f9baf654e6",
- "name": "admin",
- "description": "",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "1f03206b-d918-491b-a33f-ee96147b310d",
- "name": "admin-read-only",
- "description": "",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "3f7e69dc-75d4-4388-8a34-e82d32071dc9",
- "name": "offline_access",
- "description": "${role_offline-access}",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "ebb21957-06c9-4350-9157-576b10cc8761",
- "name": "user-pending",
- "description": "",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- },
- {
- "id": "a2acdfe6-eb2a-4104-bb6a-be961e380d97",
- "name": "gateway-user",
- "description": "",
- "composite": false,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
- "attributes": {}
- }
- ],
- "client": {
- "pga": [
- {
- "id": "d8d76309-d081-4159-b2cd-d9ca93eb7d02",
- "name": "uma_protection",
- "composite": false,
- "clientRole": true,
- "containerId": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "attributes": {}
- },
- {
- "id": "f8051cd8-10cb-44e6-8826-d323daa236d1",
- "name": "gateway-provider",
- "description": "",
- "composite": false,
- "clientRole": true,
- "containerId": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "attributes": {}
- },
- {
- "id": "fb2c5f47-09e2-4f4b-b858-625f3c5442cd",
- "name": "user-pending",
- "description": "",
- "composite": false,
- "clientRole": true,
- "containerId": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "attributes": {}
- },
- {
- "id": "c7d75283-b7c3-4b93-8804-9ce55bccf74c",
- "name": "admin",
- "description": "",
- "composite": false,
- "clientRole": true,
- "containerId": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "attributes": {}
- },
- {
- "id": "da796582-cbf2-4b23-a31d-5fc9b4010bb0",
- "name": "admin-read-only",
- "description": "",
- "composite": false,
- "clientRole": true,
- "containerId": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "attributes": {}
- },
- {
- "id": "42660438-3a37-466f-b748-d25a25ff9082",
- "name": "gateway-user",
- "description": "",
- "composite": false,
- "clientRole": true,
- "containerId": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "attributes": {}
- }
- ]
- }
- },
- "groups": [],
- "defaultRole": {
- "id": "b585e111-f934-43b7-b9c2-cbad0c7dc08a",
- "name": "default-roles-10000000",
- "description": "${role_default-roles}",
- "composite": true,
- "clientRole": false,
- "containerId": "afc8036c-62c3-462e-ae10-e1727c4bd8f7"
- },
- "requiredCredentials": [
- "password"
- ],
- "otpPolicyType": "totp",
- "otpPolicyAlgorithm": "HmacSHA1",
- "otpPolicyInitialCounter": 0,
- "otpPolicyDigits": 6,
- "otpPolicyLookAheadWindow": 1,
- "otpPolicyPeriod": 30,
- "otpPolicyCodeReusable": false,
- "otpSupportedApplications": [
- "totpAppFreeOTPName",
- "totpAppGoogleName",
- "totpAppMicrosoftAuthenticatorName"
- ],
- "webAuthnPolicyRpEntityName": "keycloak",
- "webAuthnPolicySignatureAlgorithms": [
- "ES256"
- ],
- "webAuthnPolicyRpId": "",
- "webAuthnPolicyAttestationConveyancePreference": "not specified",
- "webAuthnPolicyAuthenticatorAttachment": "not specified",
- "webAuthnPolicyRequireResidentKey": "not specified",
- "webAuthnPolicyUserVerificationRequirement": "not specified",
- "webAuthnPolicyCreateTimeout": 0,
- "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
- "webAuthnPolicyAcceptableAaguids": [],
- "webAuthnPolicyExtraOrigins": [],
- "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
- "webAuthnPolicyPasswordlessSignatureAlgorithms": [
- "ES256"
- ],
- "webAuthnPolicyPasswordlessRpId": "",
- "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified",
- "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified",
- "webAuthnPolicyPasswordlessRequireResidentKey": "not specified",
- "webAuthnPolicyPasswordlessUserVerificationRequirement": "not specified",
- "webAuthnPolicyPasswordlessCreateTimeout": 0,
- "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
- "webAuthnPolicyPasswordlessAcceptableAaguids": [],
- "webAuthnPolicyPasswordlessExtraOrigins": [],
- "users": [
- {
- "id": "e9d5a7b9-c093-4916-a331-12fbc9101c70",
- "username": "service-account-pga",
- "emailVerified": false,
- "createdTimestamp": 1726317784923,
- "enabled": true,
- "totp": false,
- "serviceAccountClientId": "pga",
- "disableableCredentialTypes": [],
- "requiredActions": [],
- "realmRoles": [
- "default-roles-10000000"
- ],
- "clientRoles": {
- "realm-management": [
- "manage-users"
- ],
- "pga": [
- "uma_protection"
- ]
- },
- "notBefore": 0,
- "groups": []
- }
- ],
- "scopeMappings": [
- {
- "clientScope": "offline_access",
- "roles": [
- "offline_access"
- ]
- }
- ],
- "clientScopeMappings": {
- "account": [
- {
- "client": "account-console",
- "roles": [
- "manage-account",
- "view-groups"
- ]
- }
- ]
- },
- "clients": [
- {
- "id": "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
- "clientId": "pga",
- "name": "Airavata Client",
- "description": "Client For Airavata Services",
- "rootUrl": "",
- "adminUrl": "",
- "baseUrl": "",
- "surrogateAuthRequired": false,
- "enabled": true,
- "alwaysDisplayInConsole": false,
- "clientAuthenticatorType": "client-secret",
- "secret": "9790c8c4-7d9b-4ccc-a820-ca5aac38d2ad",
- "redirectUris": [
- "http://airavata.host:8008/callback-url",
- "http://localhost/callback-url",
- "https://airavata.host/callback-url",
- "https://airavata.host/",
- "https://airavata.host/auth/callback*"
- ],
- "webOrigins": [
- "https://gateway.airavata.host",
- "*"
- ],
- "notBefore": 0,
- "bearerOnly": false,
- "consentRequired": false,
- "standardFlowEnabled": true,
- "implicitFlowEnabled": false,
- "directAccessGrantsEnabled": true,
- "serviceAccountsEnabled": true,
- "authorizationServicesEnabled": true,
- "publicClient": false,
- "frontchannelLogout": true,
- "protocol": "openid-connect",
- "attributes": {
- "oidc.ciba.grant.enabled": "false",
- "client.secret.creation.time": "1726317784",
- "backchannel.logout.session.required": "true",
- "display.on.consent.screen": "false",
- "oauth2.device.authorization.grant.enabled": "true",
- "backchannel.logout.revoke.offline.tokens": "false"
- },
- "fullScopeAllowed": true,
- "nodeReRegistrationTimeout": -1,
- "protocolMappers": [
- {
- "id": "f15a7de0-0c1e-40d8-bd05-c1aaf0deb3e1",
- "name": "Client IP Address",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usersessionmodel-note-mapper",
- "consentRequired": false,
- "config": {
- "user.session.note": "clientAddress",
- "introspection.token.claim": "true",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "clientAddress",
- "jsonType.label": "String"
- }
- },
- {
- "id": "a0956d0b-e5c4-4d9a-aebf-89efa6881438",
- "name": "Client ID",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usersessionmodel-note-mapper",
- "consentRequired": false,
- "config": {
- "user.session.note": "client_id",
- "introspection.token.claim": "true",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "client_id",
- "jsonType.label": "String"
- }
- },
- {
- "id": "6863299e-7d4f-43f4-8d0e-fc8cd4a8ceac",
- "name": "Client Host",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usersessionmodel-note-mapper",
- "consentRequired": false,
- "config": {
- "user.session.note": "clientHost",
- "introspection.token.claim": "true",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "clientHost",
- "jsonType.label": "String"
- }
- }
- ],
- "defaultClientScopes": [
- "web-origins",
- "acr",
- "roles",
- "profile",
- "email"
- ],
- "optionalClientScopes": [
- "address",
- "phone",
- "offline_access",
- "preferred_username",
- "microprofile-jwt"
- ]
- }
- ],
- "clientScopes": [
- {
- "id": "a8292b23-f927-4a5c-a432-2f0ae8867105",
- "name": "roles",
- "description": "OpenID Connect scope for add user roles to the access token",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "false",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${rolesScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "bfd13362-6c5d-405c-b7c0-bd37063ca9f9",
- "name": "client roles",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-client-role-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "multivalued": "true",
- "user.attribute": "foo",
- "access.token.claim": "true",
- "claim.name": "resource_access.${client_id}.roles",
- "jsonType.label": "String"
- }
- },
- {
- "id": "be26563f-80a7-43d7-bf9f-d71205ec53be",
- "name": "audience resolve",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-audience-resolve-mapper",
- "consentRequired": false,
- "config": {
- "access.token.claim": "true",
- "introspection.token.claim": "true"
- }
- },
- {
- "id": "9565b5e4-dfbb-43bc-aa8d-3e845c188669",
- "name": "realm roles",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-realm-role-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "multivalued": "true",
- "user.attribute": "foo",
- "access.token.claim": "true",
- "claim.name": "realm_access.roles",
- "jsonType.label": "String"
- }
- }
- ]
- },
- {
- "id": "34779656-fdf3-41c5-a963-d1e2b533b8f0",
- "name": "phone",
- "description": "OpenID Connect built-in scope: phone",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${phoneScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "6d5c53bd-a91a-4066-baba-52de991b5d53",
- "name": "phone number",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "phoneNumber",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "phone_number",
- "jsonType.label": "String"
- }
- },
- {
- "id": "a4f0d91a-e59e-4794-b71c-726413ba5be8",
- "name": "phone number verified",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "phoneNumberVerified",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "phone_number_verified",
- "jsonType.label": "boolean"
- }
- }
- ]
- },
- {
- "id": "8240c399-c132-49a0-8e41-48266e89b2ce",
- "name": "address",
- "description": "OpenID Connect built-in scope: address",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${addressScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "cbd43ec1-4467-4148-a435-081cd1c0d161",
- "name": "address",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-address-mapper",
- "consentRequired": false,
- "config": {
- "user.attribute.formatted": "formatted",
- "user.attribute.country": "country",
- "introspection.token.claim": "true",
- "user.attribute.postal_code": "postal_code",
- "userinfo.token.claim": "true",
- "user.attribute.street": "street",
- "id.token.claim": "true",
- "user.attribute.region": "region",
- "access.token.claim": "true",
- "user.attribute.locality": "locality"
- }
- }
- ]
- },
- {
- "id": "7d17e91f-6691-4f1d-9f6c-7a6a7ae0b5ae",
- "name": "email",
- "description": "OpenID Connect built-in scope: email",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${emailScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "c0d4e90d-2c57-4ed5-9e82-01a6d1d16cf0",
- "name": "email",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "email",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "email",
- "jsonType.label": "String"
- }
- },
- {
- "id": "c7e78134-c7dd-45a9-a921-cc5dbdc9fc68",
- "name": "email verified",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "emailVerified",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "email_verified",
- "jsonType.label": "boolean"
- }
- }
- ]
- },
- {
- "id": "c0509e2e-01ae-49d6-8d24-0e86628a85aa",
- "name": "preferred_username",
- "description": "preferred_username",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "gui.order": "",
- "consent.screen.text": ""
- },
- "protocolMappers": [
- {
- "id": "e56aa26c-4614-43bb-a96b-56c1ad959e45",
- "name": "email",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "email",
- "id.token.claim": "true",
- "lightweight.claim": "false",
- "access.token.claim": "true",
- "claim.name": "email",
- "jsonType.label": "String"
- }
- },
- {
- "id": "b50ae18b-52e8-44f6-ad4d-ad596de89cfd",
- "name": "username",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "username",
- "id.token.claim": "true",
- "lightweight.claim": "false",
- "access.token.claim": "true",
- "claim.name": "preferred_username",
- "jsonType.label": "String"
- }
- },
- {
- "id": "0a93294b-2a7c-4098-af47-4faaa535c8d4",
- "name": "ClientId",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usersessionmodel-note-mapper",
- "consentRequired": false,
- "config": {
- "user.session.note": "clientId",
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "id.token.claim": "true",
- "lightweight.claim": "false",
- "access.token.claim": "true",
- "claim.name": "clientId",
- "jsonType.label": "String",
- "access.tokenResponse.claim": "false"
- }
- },
- {
- "id": "37b8b958-2396-4e2c-871c-f56f6ad393aa",
- "name": "family name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "lastName",
- "id.token.claim": "true",
- "lightweight.claim": "false",
- "access.token.claim": "true",
- "claim.name": "family_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "d779bc1f-5c49-46c6-ae84-1d9e419984ba",
- "name": "given name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-property-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "firstName",
- "id.token.claim": "true",
- "lightweight.claim": "false",
- "access.token.claim": "true",
- "claim.name": "given_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "75c6a588-0993-446e-90e0-52046505959e",
- "name": "full name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-full-name-mapper",
- "consentRequired": false,
- "config": {
- "id.token.claim": "true",
- "lightweight.claim": "false",
- "access.token.claim": "true",
- "introspection.token.claim": "true",
- "userinfo.token.claim": "false"
- }
- }
- ]
- },
- {
- "id": "33b54357-7cdd-494c-9806-6e6d59f6af69",
- "name": "role_list",
- "description": "SAML role list",
- "protocol": "saml",
- "attributes": {
- "consent.screen.text": "${samlRoleListScopeConsentText}",
- "display.on.consent.screen": "true"
- },
- "protocolMappers": [
- {
- "id": "c56cb073-719d-4f74-8a23-b2105804ee80",
- "name": "role list",
- "protocol": "saml",
- "protocolMapper": "saml-role-list-mapper",
- "consentRequired": false,
- "config": {
- "single": "false",
- "attribute.nameformat": "Basic",
- "attribute.name": "Role"
- }
- }
- ]
- },
- {
- "id": "658e931d-3b55-464e-b199-48e9b43f9c3f",
- "name": "profile",
- "description": "OpenID Connect built-in scope: profile",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "true",
- "consent.screen.text": "${profileScopeConsentText}"
- },
- "protocolMappers": [
- {
- "id": "a352424d-d48b-4e7e-9394-c769f9542605",
- "name": "website",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "website",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "website",
- "jsonType.label": "String"
- }
- },
- {
- "id": "3710a2dd-969f-4562-89af-55e31e30f565",
- "name": "middle name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "middleName",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "middle_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "862fa550-a9df-40e5-8fa3-473c45de5e59",
- "name": "zoneinfo",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "zoneinfo",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "zoneinfo",
- "jsonType.label": "String"
- }
- },
- {
- "id": "0ae8854b-1589-401c-b0e0-24e423d8e723",
- "name": "given name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "firstName",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "given_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "a72f9f11-04bb-4905-81fe-7b23b7446e20",
- "name": "gender",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "gender",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "gender",
- "jsonType.label": "String"
- }
- },
- {
- "id": "eaded814-dc28-450e-95ca-fbd2712e6a40",
- "name": "profile",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "profile",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "profile",
- "jsonType.label": "String"
- }
- },
- {
- "id": "652dd31b-d4d8-49e9-8f53-125404b2a1f1",
- "name": "locale",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "locale",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "locale",
- "jsonType.label": "String"
- }
- },
- {
- "id": "b20740b4-9fea-4035-b3af-cf0a40852b2f",
- "name": "birthdate",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "birthdate",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "birthdate",
- "jsonType.label": "String"
- }
- },
- {
- "id": "7d36aacc-aa67-4ccb-98b0-b02a111c7dea",
- "name": "username",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "username",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "preferred_username",
- "jsonType.label": "String"
- }
- },
- {
- "id": "4ed1750d-d48a-4005-8398-2c34f0c6548e",
- "name": "full name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-full-name-mapper",
- "consentRequired": false,
- "config": {
- "id.token.claim": "true",
- "access.token.claim": "true",
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true"
- }
- },
- {
- "id": "4b111e20-11ee-4429-be4d-93414b08e506",
- "name": "updated at",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "updatedAt",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "updated_at",
- "jsonType.label": "long"
- }
- },
- {
- "id": "7a7e5200-ae1c-44dc-a5a7-5546391929b5",
- "name": "family name",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "lastName",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "family_name",
- "jsonType.label": "String"
- }
- },
- {
- "id": "d353e69e-7d1e-4c41-9fdd-f76a59dacf2b",
- "name": "picture",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "picture",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "picture",
- "jsonType.label": "String"
- }
- },
- {
- "id": "a0e4a0a3-1428-46a5-a2a8-66480b1ecf9f",
- "name": "nickname",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "nickname",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "nickname",
- "jsonType.label": "String"
- }
- }
- ]
- },
- {
- "id": "af72f98c-7086-4e99-97ad-2cdfe9f46cd4",
- "name": "offline_access",
- "description": "OpenID Connect built-in scope: offline_access",
- "protocol": "openid-connect",
- "attributes": {
- "consent.screen.text": "${offlineAccessScopeConsentText}",
- "display.on.consent.screen": "true"
- }
- },
- {
- "id": "c98af4d7-e60f-469d-b76b-c8673b3d641c",
- "name": "acr",
- "description": "OpenID Connect scope for add acr (authentication context class reference) to the token",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "false",
- "display.on.consent.screen": "false"
- },
- "protocolMappers": [
- {
- "id": "d000afcc-348f-414e-8e18-fbf9dd73bec0",
- "name": "acr loa level",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-acr-mapper",
- "consentRequired": false,
- "config": {
- "id.token.claim": "true",
- "access.token.claim": "true",
- "introspection.token.claim": "true"
- }
- }
- ]
- },
- {
- "id": "9bc461ac-7b67-48ae-af92-03b51bdd2336",
- "name": "microprofile-jwt",
- "description": "Microprofile - JWT built-in scope",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "true",
- "display.on.consent.screen": "false"
- },
- "protocolMappers": [
- {
- "id": "075ba449-99e1-49c5-8642-755d9fd1ca08",
- "name": "upn",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-attribute-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "userinfo.token.claim": "true",
- "user.attribute": "username",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "upn",
- "jsonType.label": "String"
- }
- },
- {
- "id": "4d1db13c-a944-4205-95fc-6b9c184e3cc4",
- "name": "groups",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-usermodel-realm-role-mapper",
- "consentRequired": false,
- "config": {
- "introspection.token.claim": "true",
- "multivalued": "true",
- "user.attribute": "foo",
- "id.token.claim": "true",
- "access.token.claim": "true",
- "claim.name": "groups",
- "jsonType.label": "String"
- }
- }
- ]
- },
- {
- "id": "162a761a-4a0b-4c30-a388-1ee5df06eb8e",
- "name": "web-origins",
- "description": "OpenID Connect scope for add allowed web origins to the access token",
- "protocol": "openid-connect",
- "attributes": {
- "include.in.token.scope": "false",
- "display.on.consent.screen": "false",
- "consent.screen.text": ""
- },
- "protocolMappers": [
- {
- "id": "2ecc5181-9142-45b5-b11a-4d7936f9e38e",
- "name": "allowed web origins",
- "protocol": "openid-connect",
- "protocolMapper": "oidc-allowed-origins-mapper",
- "consentRequired": false,
- "config": {
- "access.token.claim": "true",
- "introspection.token.claim": "true"
- }
- }
- ]
- }
- ],
- "defaultDefaultClientScopes": [
- "web-origins",
- "role_list",
- "profile",
- "email",
- "roles",
- "acr"
- ],
- "defaultOptionalClientScopes": [
- "phone",
- "address",
- "microprofile-jwt",
- "offline_access",
- "preferred_username"
- ],
- "browserSecurityHeaders": {
- "contentSecurityPolicyReportOnly": "",
- "xContentTypeOptions": "nosniff",
- "referrerPolicy": "no-referrer",
- "xRobotsTag": "none",
- "xFrameOptions": "SAMEORIGIN",
- "contentSecurityPolicy": "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
- "xXSSProtection": "1; mode=block",
- "strictTransportSecurity": "max-age=31536000; includeSubDomains"
- },
- "smtpServer": {},
- "eventsEnabled": false,
- "eventsListeners": [
- "jboss-logging"
- ],
- "enabledEventTypes": [],
- "adminEventsEnabled": false,
- "adminEventsDetailsEnabled": false,
- "identityProviders": [
- {
- "alias": "oidc",
- "displayName": "CILogon",
- "internalId": "f0427047-bcb0-414d-9e9a-dc97b7cddefa",
- "providerId": "oidc",
- "enabled": true,
- "updateProfileFirstLoginMode": "on",
- "trustEmail": true,
- "storeToken": true,
- "addReadTokenRoleOnCreate": true,
- "authenticateByDefault": false,
- "linkOnly": false,
- "firstBrokerLoginFlowAlias": "first broker login",
- "config": {
- "acceptsPromptNoneForwardFromClient": "false",
- "tokenUrl": "https://cilogon.org/oauth2/token",
- "isAccessTokenJWT": "false",
- "filteredByClaim": "false",
- "backchannelSupported": "false",
- "issuer": "https://cilogon.org",
- "loginHint": "false",
- "clientAuthMethod": "client_secret_post",
- "syncMode": "IMPORT",
- "clientSecret": "**********",
- "allowedClockSkew": "0",
- "defaultScope": "openid profile email org.cilogon.userinfo",
- "guiOrder": "1",
- "hideOnLoginPage": "false",
- "userInfoUrl": "https://cilogon.org/oauth2/userinfo",
- "validateSignature": "false",
- "clientId": "cilogon:/client_id/392446d1fe4981d3eab8adb6da2a1952",
- "uiLocales": "false",
- "disableNonce": "false",
- "sendClientIdOnLogout": "false",
- "pkceEnabled": "false",
- "forwardParameters": "kc_idp_hint",
- "authorizationUrl": "https://cilogon.org/authorize",
- "disableUserInfo": "false",
- "logoutUrl": "https://cilogon.org/logout",
- "sendIdTokenOnLogout": "true",
- "passMaxAge": "false"
- }
- }
- ],
- "identityProviderMappers": [
- {
- "id": "c4c0522a-97a5-4f19-83cd-bf43ddaa164e",
- "name": "family_name",
- "identityProviderAlias": "oidc",
- "identityProviderMapper": "oidc-user-attribute-idp-mapper",
- "config": {
- "syncMode": "INHERIT",
- "claim": "family_name",
- "user.attribute": "lastName"
- }
- },
- {
- "id": "c63368b2-6bb7-4dc4-85bc-5ae63147ed9c",
- "name": "given_name",
- "identityProviderAlias": "oidc",
- "identityProviderMapper": "oidc-user-attribute-idp-mapper",
- "config": {
- "syncMode": "INHERIT",
- "claim": "given_name",
- "user.attribute": "firstName"
- }
- }
- ],
- "components": {
- "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
- {
- "id": "d446bfe5-46d7-4b5a-a569-41268f1f0e87",
- "name": "Trusted Hosts",
- "providerId": "trusted-hosts",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "host-sending-registration-request-must-match": [
- "true"
- ],
- "client-uris-must-match": [
- "true"
- ]
- }
- },
- {
- "id": "d6c586ad-07ab-4a3e-8f61-9ee3d4f7e03f",
- "name": "Max Clients Limit",
- "providerId": "max-clients",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "max-clients": [
- "200"
- ]
- }
- },
- {
- "id": "fcf2e8da-427f-4232-8e02-cf08151c0211",
- "name": "Allowed Protocol Mapper Types",
- "providerId": "allowed-protocol-mappers",
- "subType": "authenticated",
- "subComponents": {},
- "config": {
- "allowed-protocol-mapper-types": [
- "oidc-full-name-mapper",
- "oidc-usermodel-attribute-mapper",
- "saml-role-list-mapper",
- "oidc-sha256-pairwise-sub-mapper",
- "oidc-usermodel-property-mapper",
- "oidc-address-mapper",
- "saml-user-attribute-mapper",
- "saml-user-property-mapper"
- ]
- }
- },
- {
- "id": "9d32bc1e-fa04-4ab7-8911-cb344ff8b5c8",
- "name": "Consent Required",
- "providerId": "consent-required",
- "subType": "anonymous",
- "subComponents": {},
- "config": {}
- },
- {
- "id": "eff493d8-9108-420f-88ca-522e9df73f46",
- "name": "Allowed Protocol Mapper Types",
- "providerId": "allowed-protocol-mappers",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "allowed-protocol-mapper-types": [
- "oidc-address-mapper",
- "saml-role-list-mapper",
- "oidc-usermodel-property-mapper",
- "saml-user-attribute-mapper",
- "oidc-usermodel-attribute-mapper",
- "oidc-full-name-mapper",
- "oidc-sha256-pairwise-sub-mapper",
- "saml-user-property-mapper"
- ]
- }
- },
- {
- "id": "64e7e77a-3489-45bd-b440-e1c42941b22a",
- "name": "Allowed Client Scopes",
- "providerId": "allowed-client-templates",
- "subType": "anonymous",
- "subComponents": {},
- "config": {
- "allow-default-scopes": [
- "true"
- ]
- }
- },
- {
- "id": "b3315017-dfb7-4e2f-a682-f9278ae9008a",
- "name": "Allowed Client Scopes",
- "providerId": "allowed-client-templates",
- "subType": "authenticated",
- "subComponents": {},
- "config": {
- "allow-default-scopes": [
- "true"
- ]
- }
- },
- {
- "id": "35fa6e56-7042-4df8-bdda-feeeb6b39c45",
- "name": "Full Scope Disabled",
- "providerId": "scope",
- "subType": "anonymous",
- "subComponents": {},
- "config": {}
- }
- ],
- "org.keycloak.keys.KeyProvider": [
- {
- "id": "33a8177a-0278-4ce3-abee-a4394ec04aed",
- "name": "rsa-enc-generated",
- "providerId": "rsa-enc-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ],
- "algorithm": [
- "RSA-OAEP"
- ]
- }
- },
- {
- "id": "a4d499fc-aced-40b4-9102-255159578eec",
- "name": "hmac-generated-hs512",
- "providerId": "hmac-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ],
- "algorithm": [
- "HS512"
- ]
- }
- },
- {
- "id": "f5dc3169-59a8-4790-a9e5-e0bf3c78805c",
- "name": "aes-generated",
- "providerId": "aes-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ]
- }
- },
- {
- "id": "762fc122-3966-4253-8ff2-681aef52798a",
- "name": "rsa-generated",
- "providerId": "rsa-generated",
- "subComponents": {},
- "config": {
- "priority": [
- "100"
- ]
- }
- }
- ]
- },
- "internationalizationEnabled": false,
- "supportedLocales": [],
- "authenticationFlows": [
- {
- "id": "ee04c896-46c6-46e5-8f5f-2c3f5f5e982f",
- "alias": "Account verification options",
- "description": "Method with which to verity the existing account",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "idp-email-verification",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "ALTERNATIVE",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Verify Existing Account by Re-authentication",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "78e019d7-5a2f-44f3-81d0-6fa566f21a32",
- "alias": "Browser - Conditional OTP",
- "description": "Flow to determine if the OTP is required for the authentication",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-otp-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "3482050b-0ea3-4aee-8200-bcc78dfda38d",
- "alias": "Direct Grant - Conditional OTP",
- "description": "Flow to determine if the OTP is required for the authentication",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "direct-grant-validate-otp",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "64987dfc-4f74-4abe-a9fa-47028f056258",
- "alias": "First broker login - Conditional OTP",
- "description": "Flow to determine if the OTP is required for the authentication",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-otp-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "32144fde-d5b5-4a21-bdd5-fb8d92f3c435",
- "alias": "Handle Existing Account",
- "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "idp-confirm-link",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Account verification options",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "53e1602d-6fb0-4dcb-81a8-e0e549165a2c",
- "alias": "Reset - Conditional OTP",
- "description": "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "conditional-user-configured",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "reset-otp",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "4819cc94-f5e5-47ca-99ca-35abb57f80e4",
- "alias": "User creation or linking",
- "description": "Flow for the existing/non-existing user alternatives",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticatorConfig": "create unique user config",
- "authenticator": "idp-create-user-if-unique",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "ALTERNATIVE",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Handle Existing Account",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "5942a1e4-f029-40cd-ae92-830898bf97dc",
- "alias": "Verify Existing Account by Re-authentication",
- "description": "Reauthentication of existing account",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "idp-username-password-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "First broker login - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "92632d82-47d5-4dd6-8a7e-8bf3e0ecd02f",
- "alias": "browser",
- "description": "browser based authentication",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "auth-cookie",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "auth-spnego",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorConfig": "oidc",
- "authenticator": "identity-provider-redirector",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 25,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "ALTERNATIVE",
- "priority": 30,
- "autheticatorFlow": true,
- "flowAlias": "forms",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "dfedc4d5-a50e-4622-bba6-7e5ee9b2065c",
- "alias": "clients",
- "description": "Base authentication for clients",
- "providerId": "client-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "client-secret",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "client-jwt",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "client-secret-jwt",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 30,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "client-x509",
- "authenticatorFlow": false,
- "requirement": "ALTERNATIVE",
- "priority": 40,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "25ac344e-2d5e-4c5c-8f86-2b8ba2e3dfde",
- "alias": "direct grant",
- "description": "OpenID Connect Resource Owner Grant",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "direct-grant-validate-username",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "direct-grant-validate-password",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 30,
- "autheticatorFlow": true,
- "flowAlias": "Direct Grant - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "fc07ca16-4d7d-4132-a6d6-352a566d19da",
- "alias": "docker auth",
- "description": "Used by Docker clients to authenticate against the IDP",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "docker-http-basic-authenticator",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "eb9f31b1-f136-47bc-93d1-9fc8c62de3c5",
- "alias": "first broker login",
- "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticatorConfig": "review profile config",
- "authenticator": "idp-review-profile",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "User creation or linking",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "92f6f1d6-7684-4c3a-8623-1a1643cf1b07",
- "alias": "forms",
- "description": "Username, password, otp and other auth forms.",
- "providerId": "basic-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "auth-username-password-form",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 20,
- "autheticatorFlow": true,
- "flowAlias": "Browser - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "4701b039-0e51-435c-a867-76e602446315",
- "alias": "registration",
- "description": "registration flow",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "registration-page-form",
- "authenticatorFlow": true,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": true,
- "flowAlias": "registration form",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "4857befc-6fac-45f1-ae13-02830ab04646",
- "alias": "registration form",
- "description": "registration form",
- "providerId": "form-flow",
- "topLevel": false,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "registration-user-creation",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "registration-password-action",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 50,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "registration-recaptcha-action",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 60,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "registration-terms-and-conditions",
- "authenticatorFlow": false,
- "requirement": "DISABLED",
- "priority": 70,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "72627447-0fbe-4017-96ab-b12eacc75a2d",
- "alias": "reset credentials",
- "description": "Reset credentials for a user if they forgot their password or something",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "reset-credentials-choose-user",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "reset-credential-email",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 20,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticator": "reset-password",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 30,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- },
- {
- "authenticatorFlow": true,
- "requirement": "CONDITIONAL",
- "priority": 40,
- "autheticatorFlow": true,
- "flowAlias": "Reset - Conditional OTP",
- "userSetupAllowed": false
- }
- ]
- },
- {
- "id": "d8bec40b-7015-40c9-b069-c1bb1b1cf09e",
- "alias": "saml ecp",
- "description": "SAML ECP Profile Authentication Flow",
- "providerId": "basic-flow",
- "topLevel": true,
- "builtIn": true,
- "authenticationExecutions": [
- {
- "authenticator": "http-basic-authenticator",
- "authenticatorFlow": false,
- "requirement": "REQUIRED",
- "priority": 10,
- "autheticatorFlow": false,
- "userSetupAllowed": false
- }
- ]
- }
- ],
- "authenticatorConfig": [
- {
- "id": "6ee3b9e1-c19b-43f5-bc30-4dde2953aa3f",
- "alias": "create unique user config",
- "config": {
- "require.password.update.after.registration": "false"
- }
- },
- {
- "id": "420707ab-984e-4a95-a679-26cddf145323",
- "alias": "oidc",
- "config": {
- "default.reference.maxAge": "10000",
- "default.reference.value": "CILogon",
- "defaultProvider": "oidc"
- }
- },
- {
- "id": "6bab8c26-0c25-4cf3-a5a7-634cdfcf9f41",
- "alias": "review profile config",
- "config": {
- "update.profile.on.first.login": "missing"
- }
- }
- ],
- "requiredActions": [
- {
- "alias": "CONFIGURE_TOTP",
- "name": "Configure OTP",
- "providerId": "CONFIGURE_TOTP",
- "enabled": true,
- "defaultAction": false,
- "priority": 10,
- "config": {}
- },
- {
- "alias": "TERMS_AND_CONDITIONS",
- "name": "Terms and Conditions",
- "providerId": "TERMS_AND_CONDITIONS",
- "enabled": false,
- "defaultAction": false,
- "priority": 20,
- "config": {}
- },
- {
- "alias": "UPDATE_PASSWORD",
- "name": "Update Password",
- "providerId": "UPDATE_PASSWORD",
- "enabled": true,
- "defaultAction": false,
- "priority": 30,
- "config": {}
- },
- {
- "alias": "UPDATE_PROFILE",
- "name": "Update Profile",
- "providerId": "UPDATE_PROFILE",
- "enabled": true,
- "defaultAction": false,
- "priority": 40,
- "config": {}
- },
- {
- "alias": "VERIFY_EMAIL",
- "name": "Verify Email",
- "providerId": "VERIFY_EMAIL",
- "enabled": true,
- "defaultAction": false,
- "priority": 50,
- "config": {}
- },
- {
- "alias": "delete_account",
- "name": "Delete Account",
- "providerId": "delete_account",
- "enabled": false,
- "defaultAction": false,
- "priority": 60,
- "config": {}
- },
- {
- "alias": "webauthn-register",
- "name": "Webauthn Register",
- "providerId": "webauthn-register",
- "enabled": true,
- "defaultAction": false,
- "priority": 70,
- "config": {}
- },
- {
- "alias": "webauthn-register-passwordless",
- "name": "Webauthn Register Passwordless",
- "providerId": "webauthn-register-passwordless",
- "enabled": true,
- "defaultAction": false,
- "priority": 80,
- "config": {}
- },
- {
- "alias": "VERIFY_PROFILE",
- "name": "Verify Profile",
- "providerId": "VERIFY_PROFILE",
- "enabled": true,
- "defaultAction": false,
- "priority": 90,
- "config": {}
- },
- {
- "alias": "update_user_locale",
- "name": "Update User Locale",
- "providerId": "update_user_locale",
- "enabled": true,
- "defaultAction": false,
- "priority": 1000,
- "config": {}
- }
- ],
- "browserFlow": "browser",
- "registrationFlow": "registration",
- "directGrantFlow": "direct grant",
- "resetCredentialsFlow": "reset credentials",
- "clientAuthenticationFlow": "clients",
- "dockerAuthenticationFlow": "docker auth",
- "firstBrokerLoginFlow": "first broker login",
- "attributes": {
- "cibaBackchannelTokenDeliveryMode": "poll",
- "cibaAuthRequestedUserHint": "login_hint",
- "clientOfflineSessionMaxLifespan": "0",
- "oauth2DevicePollingInterval": "5",
- "clientSessionIdleTimeout": "0",
- "actionTokenGeneratedByUserLifespan.idp-verify-account-via-email": "",
- "actionTokenGeneratedByUserLifespan.verify-email": "",
- "clientOfflineSessionIdleTimeout": "0",
- "actionTokenGeneratedByUserLifespan.execute-actions": "",
- "cibaInterval": "5",
- "realmReusableOtpCode": "false",
- "cibaExpiresIn": "120",
- "oauth2DeviceCodeLifespan": "600",
- "parRequestUriLifespan": "60",
- "clientSessionMaxLifespan": "0",
- "frontendUrl": "",
- "acr.loa.map": "{}",
- "shortVerificationUri": "",
- "actionTokenGeneratedByUserLifespan.reset-credentials": ""
- },
- "keycloakVersion": "24.0.0",
- "userManagedAccessAllowed": false,
- "clientProfiles": {
- "profiles": []
- },
- "clientPolicies": {
- "policies": []
- }
-}
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/containers/keycloak/Default-export.json.bk b/modules/ide-integration/src/main/containers/keycloak/Default-export.json.bk
deleted file mode 100644
index 740eb85634..0000000000
--- a/modules/ide-integration/src/main/containers/keycloak/Default-export.json.bk
+++ /dev/null
@@ -1,1507 +0,0 @@
-{
- "id" : "default",
- "realm" : "default",
- "notBefore" : 0,
- "revokeRefreshToken" : false,
- "accessTokenLifespan" : 300,
- "accessTokenLifespanForImplicitFlow" : 900,
- "ssoSessionIdleTimeout" : 1800,
- "ssoSessionMaxLifespan" : 36000,
- "offlineSessionIdleTimeout" : 2592000,
- "accessCodeLifespan" : 60,
- "accessCodeLifespanUserAction" : 300,
- "accessCodeLifespanLogin" : 1800,
- "enabled" : true,
- "sslRequired" : "external",
- "registrationAllowed" : false,
- "registrationEmailAsUsername" : false,
- "rememberMe" : false,
- "verifyEmail" : false,
- "loginWithEmailAllowed" : true,
- "duplicateEmailsAllowed" : false,
- "resetPasswordAllowed" : false,
- "editUsernameAllowed" : false,
- "bruteForceProtected" : false,
- "maxFailureWaitSeconds" : 900,
- "minimumQuickLoginWaitSeconds" : 60,
- "waitIncrementSeconds" : 60,
- "quickLoginCheckMilliSeconds" : 1000,
- "maxDeltaTimeSeconds" : 43200,
- "failureFactor" : 30,
- "roles" : {
- "realm" : [ {
- "id" : "e57cc238-851f-438f-9e3a-fdfe5bf1b01d",
- "name" : "admin",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- }, {
- "id" : "1fc6a378-99fc-4ae4-8cfe-f3e570594fbc",
- "name" : "gateway-user",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- }, {
- "id" : "0058eb76-b61e-4f14-a3de-5377c154e6ce",
- "name" : "gateway-provider",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- }, {
- "id" : "33473891-9fb4-4076-90c3-325b4bdbfe71",
- "name" : "user-pending",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- }, {
- "id" : "4edaec82-9b96-4b04-bbc0-e72b4b028b8f",
- "name" : "uma_authorization",
- "description" : "${role_uma_authorization}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- }, {
- "id" : "3bd559a1-cb42-4326-a211-ebe386abedb8",
- "name" : "admin-read-only",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- }, {
- "id" : "c287cd41-2fa9-4af0-adf4-e1cf8eaed0a1",
- "name" : "offline_access",
- "description" : "${role_offline-access}",
- "scopeParamRequired" : true,
- "composite" : false,
- "clientRole" : false,
- "containerId" : "default"
- } ],
- "client" : {
- "realm-management" : [ {
- "id" : "25eeb575-8f30-4c3c-9025-7c49521168a3",
- "name" : "view-identity-providers",
- "description" : "${role_view-identity-providers}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "ae1d8150-4437-4f85-bb2e-a8a12c0be9ef",
- "name" : "view-users",
- "description" : "${role_view-users}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "6c48363c-70d1-4f39-a0b5-d7a34be66705",
- "name" : "create-client",
- "description" : "${role_create-client}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "97be766a-b5cc-422d-82c6-77ccec6cc721",
- "name" : "manage-realm",
- "description" : "${role_manage-realm}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "2425b20b-e233-4b88-9d2d-b487c31a97f2",
- "name" : "manage-events",
- "description" : "${role_manage-events}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "5e0ca9e1-9ae6-49a5-a61e-4ebda609752a",
- "name" : "realm-admin",
- "description" : "${role_realm-admin}",
- "scopeParamRequired" : false,
- "composite" : true,
- "composites" : {
- "client" : {
- "realm-management" : [ "view-users", "view-identity-providers", "create-client", "manage-realm", "manage-events", "view-events", "manage-users", "impersonation", "view-authorization", "view-clients", "manage-identity-providers", "manage-clients", "manage-authorization", "view-realm" ]
- }
- },
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "0d64c48f-9309-4ed9-a4e9-c18635d4c31b",
- "name" : "view-events",
- "description" : "${role_view-events}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "2a0ec04e-46bf-47e3-9f41-a54c7049bf1c",
- "name" : "manage-users",
- "description" : "${role_manage-users}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "ea3213a8-fdcf-4481-9620-68634705206f",
- "name" : "impersonation",
- "description" : "${role_impersonation}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "279b6454-4e02-4499-a874-e6efb7c35fc7",
- "name" : "view-authorization",
- "description" : "${role_view-authorization}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "7f35f618-9954-4e54-826d-9c8613a6a74d",
- "name" : "view-clients",
- "description" : "${role_view-clients}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "bd937a5a-1f13-4d06-a30c-8993e66a6533",
- "name" : "manage-identity-providers",
- "description" : "${role_manage-identity-providers}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "72b5f596-1d58-42ef-b4bf-79fec573406e",
- "name" : "manage-clients",
- "description" : "${role_manage-clients}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "bc379239-b21b-46fc-8b0b-43c991d825bf",
- "name" : "manage-authorization",
- "description" : "${role_manage-authorization}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- }, {
- "id" : "f6d83939-a100-4f4d-9b32-238bf4688bff",
- "name" : "view-realm",
- "description" : "${role_view-realm}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f"
- } ],
- "security-admin-console" : [ ],
- "admin-cli" : [ ],
- "pga" : [ {
- "id" : "5b99936c-2625-4824-9a44-0fd70382c46f",
- "name" : "uma_protection",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "d91304eb-aaa7-4c21-a3bd-7d525a88756f"
- } ],
- "broker" : [ {
- "id" : "3ae3efa0-3a7d-4eac-b13e-eb0a6f018ec9",
- "name" : "read-token",
- "description" : "${role_read-token}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "9d167524-4ff0-40d0-9beb-3fd1dd6c61b5"
- } ],
- "account" : [ {
- "id" : "737745c4-d179-414b-b5a3-bfb9bb7e3d13",
- "name" : "manage-account",
- "description" : "${role_manage-account}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "6b0b6755-6e5f-4f38-b78a-be79208be58e"
- }, {
- "id" : "c918eba7-f2d1-48e3-b3a5-492569936317",
- "name" : "view-profile",
- "description" : "${role_view-profile}",
- "scopeParamRequired" : false,
- "composite" : false,
- "clientRole" : true,
- "containerId" : "6b0b6755-6e5f-4f38-b78a-be79208be58e"
- } ]
- }
- },
- "groups" : [ ],
- "defaultRoles" : [ "uma_authorization", "offline_access" ],
- "requiredCredentials" : [ "password" ],
- "passwordPolicy" : "hashIterations(20000)",
- "otpPolicyType" : "totp",
- "otpPolicyAlgorithm" : "HmacSHA1",
- "otpPolicyInitialCounter" : 0,
- "otpPolicyDigits" : 6,
- "otpPolicyLookAheadWindow" : 1,
- "otpPolicyPeriod" : 30,
- "users" : [ {
- "id" : "dcc21374-79ff-4f9f-b895-a6f6a35554bf",
- "createdTimestamp" : 1521560049031,
- "username" : "default-admin",
- "enabled" : true,
- "totp" : false,
- "emailVerified" : true,
- "firstName" : "dim",
- "lastName" : "Upe",
- "email" : "dimuthu.upeksha2@gmail.com",
- "credentials" : [ {
- "type" : "password",
- "hashedSaltedValue" : "z8nHFEg9ZRGRsKAx3EE6yJPnzI7+a8qxVKgMI0pZo+WzFKKkPVR+rIrJv32Ht+dROjaT9DBRUJVe5J01oHo6PQ==",
- "salt" : "DyQ22650v7+xdd1KxHa96A==",
- "hashIterations" : 20000,
- "counter" : 0,
- "algorithm" : "pbkdf2",
- "digits" : 0,
- "period" : 0,
- "createdDate" : 1521560064798,
- "config" : { }
- } ],
- "disableableCredentialTypes" : [ "password" ],
- "requiredActions" : [ ],
- "realmRoles" : [ "admin", "uma_authorization", "offline_access" ],
- "clientRoles" : {
- "realm-management" : [ "create-client", "manage-realm", "manage-events", "realm-admin", "manage-users", "impersonation", "manage-identity-providers", "manage-clients", "manage-authorization" ],
- "account" : [ "view-profile", "manage-account" ]
- },
- "groups" : [ ]
- }, {
- "id" : "03b635cf-bc43-45c5-9cbf-191a90b1ee87",
- "createdTimestamp" : 1521559886114,
- "username" : "service-account-pga",
- "enabled" : true,
- "totp" : false,
- "emailVerified" : false,
- "email" : "service-account-pga@placeholder.org",
- "serviceAccountClientId" : "pga",
- "credentials" : [ ],
- "disableableCredentialTypes" : [ ],
- "requiredActions" : [ ],
- "realmRoles" : [ "uma_authorization", "offline_access" ],
- "clientRoles" : {
- "pga" : [ "uma_protection" ],
- "account" : [ "manage-account", "view-profile" ]
- },
- "groups" : [ ]
- } ],
- "clientScopeMappings" : {
- "realm-management" : [ {
- "client" : "admin-cli",
- "roles" : [ "realm-admin" ]
- }, {
- "client" : "security-admin-console",
- "roles" : [ "realm-admin" ]
- } ]
- },
- "clients" : [ {
- "id" : "6b0b6755-6e5f-4f38-b78a-be79208be58e",
- "clientId" : "account",
- "name" : "${client_account}",
- "baseUrl" : "/auth/realms/default/account",
- "surrogateAuthRequired" : false,
- "enabled" : true,
- "clientAuthenticatorType" : "client-secret",
- "secret" : "7c020384-8beb-4b0d-8b6b-13b5fb976349",
- "defaultRoles" : [ "manage-account", "view-profile" ],
- "redirectUris" : [ "/auth/realms/default/account/*" ],
- "webOrigins" : [ ],
- "notBefore" : 0,
- "bearerOnly" : false,
- "consentRequired" : false,
- "standardFlowEnabled" : true,
- "implicitFlowEnabled" : false,
- "directAccessGrantsEnabled" : false,
- "serviceAccountsEnabled" : false,
- "publicClient" : false,
- "frontchannelLogout" : false,
- "attributes" : { },
- "fullScopeAllowed" : false,
- "nodeReRegistrationTimeout" : 0,
- "protocolMappers" : [ {
- "id" : "acb04784-f725-4707-a0f3-5ef026a0452f",
- "name" : "username",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${username}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "username",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "preferred_username",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "9c98c619-0112-4b32-9244-42e62c8b7fd8",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "81028b13-e742-4424-951c-78a360cd135c",
- "name" : "family name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${familyName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "family_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "fa4e2f31-68d2-427a-a650-00b36a507c21",
- "name" : "given name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${givenName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "firstName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "given_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "66c52b74-a51b-4250-bc51-988af6e8e189",
- "name" : "email",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${email}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "email",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "email",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "7aad501b-e92b-4097-b9ec-6b64394ea98b",
- "name" : "role list",
- "protocol" : "saml",
- "protocolMapper" : "saml-role-list-mapper",
- "consentRequired" : false,
- "config" : {
- "single" : "false",
- "attribute.nameformat" : "Basic",
- "attribute.name" : "Role"
- }
- } ],
- "useTemplateConfig" : false,
- "useTemplateScope" : false,
- "useTemplateMappers" : false
- }, {
- "id" : "5bbd77f4-a98e-49e6-a97a-09be34fd34dc",
- "clientId" : "admin-cli",
- "name" : "${client_admin-cli}",
- "surrogateAuthRequired" : false,
- "enabled" : true,
- "clientAuthenticatorType" : "client-secret",
- "secret" : "384ad67c-1d4c-4952-af98-2a9a9f0bf672",
- "redirectUris" : [ ],
- "webOrigins" : [ ],
- "notBefore" : 0,
- "bearerOnly" : false,
- "consentRequired" : false,
- "standardFlowEnabled" : false,
- "implicitFlowEnabled" : false,
- "directAccessGrantsEnabled" : true,
- "serviceAccountsEnabled" : false,
- "publicClient" : true,
- "frontchannelLogout" : false,
- "attributes" : { },
- "fullScopeAllowed" : false,
- "nodeReRegistrationTimeout" : 0,
- "protocolMappers" : [ {
- "id" : "3df9d992-a422-481a-bc5e-ef52741346e4",
- "name" : "role list",
- "protocol" : "saml",
- "protocolMapper" : "saml-role-list-mapper",
- "consentRequired" : false,
- "config" : {
- "single" : "false",
- "attribute.nameformat" : "Basic",
- "attribute.name" : "Role"
- }
- }, {
- "id" : "3ea8fbae-2d92-4e1e-bf7e-f8d63b78c665",
- "name" : "given name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${givenName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "firstName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "given_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "6e13db11-02be-473e-8fda-805a90c07b38",
- "name" : "family name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${familyName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "family_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "a5de4a6a-8835-4924-bf92-457b8afc9ce9",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "43f531b4-1b1d-4663-a7c5-f4140a8699b3",
- "name" : "username",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${username}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "username",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "preferred_username",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "64508175-b6b9-4f48-929d-9a7e2a144eed",
- "name" : "email",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${email}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "email",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "email",
- "jsonType.label" : "String"
- }
- } ],
- "useTemplateConfig" : false,
- "useTemplateScope" : false,
- "useTemplateMappers" : false
- }, {
- "id" : "9d167524-4ff0-40d0-9beb-3fd1dd6c61b5",
- "clientId" : "broker",
- "name" : "${client_broker}",
- "surrogateAuthRequired" : false,
- "enabled" : true,
- "clientAuthenticatorType" : "client-secret",
- "secret" : "a2ca00a3-d2d9-4647-9ad0-e52e59644bef",
- "redirectUris" : [ ],
- "webOrigins" : [ ],
- "notBefore" : 0,
- "bearerOnly" : false,
- "consentRequired" : false,
- "standardFlowEnabled" : true,
- "implicitFlowEnabled" : false,
- "directAccessGrantsEnabled" : false,
- "serviceAccountsEnabled" : false,
- "publicClient" : false,
- "frontchannelLogout" : false,
- "attributes" : { },
- "fullScopeAllowed" : false,
- "nodeReRegistrationTimeout" : 0,
- "protocolMappers" : [ {
- "id" : "dcb271f7-326f-4108-b628-9f328bb6e0ca",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "355de467-08d5-4742-87f4-18d950e2662b",
- "name" : "given name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${givenName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "firstName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "given_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "8e642aca-e044-40c3-a154-08b41c47f87d",
- "name" : "email",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${email}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "email",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "email",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "c3c3d79c-8b7f-44db-8886-050bfe1be7ce",
- "name" : "family name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${familyName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "family_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "172c3f41-0346-44bb-9149-cdb7af510f54",
- "name" : "role list",
- "protocol" : "saml",
- "protocolMapper" : "saml-role-list-mapper",
- "consentRequired" : false,
- "config" : {
- "single" : "false",
- "attribute.nameformat" : "Basic",
- "attribute.name" : "Role"
- }
- }, {
- "id" : "acad670c-0565-4c4a-ada8-93b9315cd1e6",
- "name" : "username",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${username}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "username",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "preferred_username",
- "jsonType.label" : "String"
- }
- } ],
- "useTemplateConfig" : false,
- "useTemplateScope" : false,
- "useTemplateMappers" : false
- }, {
- "id" : "d91304eb-aaa7-4c21-a3bd-7d525a88756f",
- "clientId" : "pga",
- "surrogateAuthRequired" : false,
- "enabled" : true,
- "clientAuthenticatorType" : "client-secret",
- "secret" : "9790c8c4-7d9b-4ccc-a820-ca5aac38d2ad",
- "redirectUris" : [ "http://192.168.99.103:8008" ],
- "webOrigins" : [ ],
- "notBefore" : 0,
- "bearerOnly" : false,
- "consentRequired" : false,
- "standardFlowEnabled" : true,
- "implicitFlowEnabled" : false,
- "directAccessGrantsEnabled" : true,
- "serviceAccountsEnabled" : true,
- "authorizationServicesEnabled" : true,
- "publicClient" : false,
- "frontchannelLogout" : false,
- "protocol" : "openid-connect",
- "attributes" : {
- "saml.assertion.signature" : "false",
- "saml.force.post.binding" : "false",
- "saml.multivalued.roles" : "false",
- "saml.encrypt" : "false",
- "saml_force_name_id_format" : "false",
- "saml.client.signature" : "false",
- "saml.authnstatement" : "false",
- "saml.server.signature" : "false",
- "saml.server.signature.keyinfo.ext" : "false"
- },
- "fullScopeAllowed" : true,
- "nodeReRegistrationTimeout" : -1,
- "protocolMappers" : [ {
- "id" : "63bfb4d1-6721-4b30-be12-9524f33ca5d6",
- "name" : "given name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${givenName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "firstName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "given_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "e1563941-e46b-47df-ac80-ad9ebe4b4a1c",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "ea351bc5-0d40-42e8-b915-76bb9146725c",
- "name" : "Client IP Address",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usersessionmodel-note-mapper",
- "consentRequired" : false,
- "consentText" : "",
- "config" : {
- "user.session.note" : "clientAddress",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "clientAddress",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "8e2d75f2-0cbe-40c0-bc64-4e26492d3ddb",
- "name" : "family name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${familyName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "family_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "f0310a3c-718c-4e6a-9a78-b1c78c53c7e8",
- "name" : "username",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${username}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "username",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "preferred_username",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "2fa4d469-c87f-4af1-8dfa-94b7389d6d41",
- "name" : "Client Host",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usersessionmodel-note-mapper",
- "consentRequired" : false,
- "consentText" : "",
- "config" : {
- "user.session.note" : "clientHost",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "clientHost",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "b78030a3-90f0-41fe-8490-0b0e94d24019",
- "name" : "Client ID",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usersessionmodel-note-mapper",
- "consentRequired" : false,
- "consentText" : "",
- "config" : {
- "user.session.note" : "clientId",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "clientId",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "adc877a6-20cc-43e4-8716-28210a7579b7",
- "name" : "role list",
- "protocol" : "saml",
- "protocolMapper" : "saml-role-list-mapper",
- "consentRequired" : false,
- "config" : {
- "single" : "false",
- "attribute.nameformat" : "Basic",
- "attribute.name" : "Role"
- }
- }, {
- "id" : "bce95330-6b57-42a0-92b5-9b20bb826c93",
- "name" : "email",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${email}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "email",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "email",
- "jsonType.label" : "String"
- }
- } ],
- "useTemplateConfig" : false,
- "useTemplateScope" : false,
- "useTemplateMappers" : false,
- "authorizationSettings" : {
- "allowRemoteResourceManagement" : false,
- "policyEnforcementMode" : "ENFORCING",
- "resources" : [ {
- "name" : "Default Resource",
- "uri" : "/*",
- "type" : "urn:pga:resources:default",
- "typedScopes" : [ ]
- } ],
- "policies" : [ {
- "name" : "Default Policy",
- "description" : "A policy that grants access only for users within this realm",
- "type" : "js",
- "logic" : "POSITIVE",
- "decisionStrategy" : "AFFIRMATIVE",
- "config" : {
- "code" : "// by default, grants any permission associated with this policy\n$evaluation.grant();\n"
- }
- }, {
- "name" : "Default Permission",
- "description" : "A permission that applies to the default resource type",
- "type" : "resource",
- "logic" : "POSITIVE",
- "decisionStrategy" : "UNANIMOUS",
- "config" : {
- "defaultResourceType" : "urn:pga:resources:default",
- "applyPolicies" : "[\"Default Policy\"]",
- "default" : "true"
- }
- } ],
- "scopes" : [ ]
- }
- }, {
- "id" : "444bd287-e88f-4bdf-b806-c1fa1f81de4f",
- "clientId" : "realm-management",
- "name" : "${client_realm-management}",
- "surrogateAuthRequired" : false,
- "enabled" : true,
- "clientAuthenticatorType" : "client-secret",
- "secret" : "55353926-9432-4e0c-be9b-cc4a7b07a859",
- "redirectUris" : [ ],
- "webOrigins" : [ ],
- "notBefore" : 0,
- "bearerOnly" : true,
- "consentRequired" : false,
- "standardFlowEnabled" : true,
- "implicitFlowEnabled" : false,
- "directAccessGrantsEnabled" : false,
- "serviceAccountsEnabled" : false,
- "publicClient" : false,
- "frontchannelLogout" : false,
- "attributes" : { },
- "fullScopeAllowed" : false,
- "nodeReRegistrationTimeout" : 0,
- "protocolMappers" : [ {
- "id" : "f3cffafd-897c-45b1-946b-21271bbc4265",
- "name" : "email",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${email}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "email",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "email",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "778385bb-7275-4431-89b5-ad94216345d2",
- "name" : "family name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${familyName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "family_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "51319a83-386d-40df-a706-91f400e1aed9",
- "name" : "role list",
- "protocol" : "saml",
- "protocolMapper" : "saml-role-list-mapper",
- "consentRequired" : false,
- "config" : {
- "single" : "false",
- "attribute.nameformat" : "Basic",
- "attribute.name" : "Role"
- }
- }, {
- "id" : "e4fe5a3e-3217-4953-8c26-17cf78de3d34",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "396d04c3-47da-4aa0-a7c5-ea88df50ed1f",
- "name" : "username",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${username}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "username",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "preferred_username",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "3beafd0d-c620-417e-8b68-22d96c9604c0",
- "name" : "given name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${givenName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "firstName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "given_name",
- "jsonType.label" : "String"
- }
- } ],
- "useTemplateConfig" : false,
- "useTemplateScope" : false,
- "useTemplateMappers" : false
- }, {
- "id" : "8bdd2a6b-05aa-4512-bbfe-e1f0ea762107",
- "clientId" : "security-admin-console",
- "name" : "${client_security-admin-console}",
- "baseUrl" : "/auth/admin/default/console/index.html",
- "surrogateAuthRequired" : false,
- "enabled" : true,
- "clientAuthenticatorType" : "client-secret",
- "secret" : "01e0b45c-0dd4-45ef-99a8-4d9d40fcbf50",
- "redirectUris" : [ "/auth/admin/default/console/*" ],
- "webOrigins" : [ ],
- "notBefore" : 0,
- "bearerOnly" : false,
- "consentRequired" : false,
- "standardFlowEnabled" : true,
- "implicitFlowEnabled" : false,
- "directAccessGrantsEnabled" : false,
- "serviceAccountsEnabled" : false,
- "publicClient" : true,
- "frontchannelLogout" : false,
- "attributes" : { },
- "fullScopeAllowed" : false,
- "nodeReRegistrationTimeout" : 0,
- "protocolMappers" : [ {
- "id" : "438a8794-0eed-4e1e-a2d9-6214d34c6b8a",
- "name" : "email",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${email}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "email",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "email",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "8617a0a7-e20c-42ea-9291-69d10c99b95e",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "1568fb0b-0340-4e7b-be46-115e950d7b41",
- "name" : "role list",
- "protocol" : "saml",
- "protocolMapper" : "saml-role-list-mapper",
- "consentRequired" : false,
- "config" : {
- "single" : "false",
- "attribute.nameformat" : "Basic",
- "attribute.name" : "Role"
- }
- }, {
- "id" : "e170660c-244f-4eca-bbde-2b62fc9da922",
- "name" : "family name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${familyName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "lastName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "family_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "40a0c295-03f0-42d9-a1a2-78c0c4aac05b",
- "name" : "given name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${givenName}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "firstName",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "given_name",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "a55f9a18-163c-46aa-a51e-9db11e6ebb84",
- "name" : "username",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-property-mapper",
- "consentRequired" : true,
- "consentText" : "${username}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "username",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "preferred_username",
- "jsonType.label" : "String"
- }
- }, {
- "id" : "a459fa53-bc8b-443e-bc9a-919bc11cfea5",
- "name" : "locale",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-usermodel-attribute-mapper",
- "consentRequired" : false,
- "consentText" : "${locale}",
- "config" : {
- "userinfo.token.claim" : "true",
- "user.attribute" : "locale",
- "id.token.claim" : "true",
- "access.token.claim" : "true",
- "claim.name" : "locale",
- "jsonType.label" : "String"
- }
- } ],
- "useTemplateConfig" : false,
- "useTemplateScope" : false,
- "useTemplateMappers" : false
- } ],
- "clientTemplates" : [ ],
- "browserSecurityHeaders" : {
- "xContentTypeOptions" : "nosniff",
- "xFrameOptions" : "SAMEORIGIN",
- "contentSecurityPolicy" : "frame-src 'self'"
- },
- "smtpServer" : { },
- "eventsEnabled" : false,
- "eventsListeners" : [ "jboss-logging" ],
- "enabledEventTypes" : [ ],
- "adminEventsEnabled" : false,
- "adminEventsDetailsEnabled" : false,
- "components" : {
- "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy" : [ {
- "id" : "15cbcc72-a1de-46ed-b3dc-47535293f0da",
- "name" : "Allowed Protocol Mapper Types",
- "providerId" : "allowed-protocol-mappers",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : {
- "allowed-protocol-mapper-types" : [ "oidc-full-name-mapper", "oidc-usermodel-property-mapper", "oidc-usermodel-attribute-mapper", "saml-user-property-mapper", "saml-user-attribute-mapper", "oidc-address-mapper", "saml-role-list-mapper", "oidc-sha256-pairwise-sub-mapper" ],
- "consent-required-for-all-mappers" : [ "true" ]
- }
- }, {
- "id" : "2e27e8d7-80f4-417e-b359-9971614cf7c8",
- "name" : "Consent Required",
- "providerId" : "consent-required",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : { }
- }, {
- "id" : "30944217-0b40-4d9c-915d-65818a53cc99",
- "name" : "Allowed Client Templates",
- "providerId" : "allowed-client-templates",
- "subType" : "authenticated",
- "subComponents" : { },
- "config" : { }
- }, {
- "id" : "54fd7c81-ef7f-4329-935b-dba6b309d528",
- "name" : "Full Scope Disabled",
- "providerId" : "scope",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : { }
- }, {
- "id" : "7ce77be7-0568-4e91-a69a-8335c3c19f62",
- "name" : "Trusted Hosts",
- "providerId" : "trusted-hosts",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : {
- "host-sending-registration-request-must-match" : [ "true" ],
- "client-uris-must-match" : [ "true" ]
- }
- }, {
- "id" : "92012f2d-f36a-42ec-9ccb-6a18b23bfc47",
- "name" : "Allowed Client Templates",
- "providerId" : "allowed-client-templates",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : { }
- }, {
- "id" : "ab75f593-8e0e-469a-bf4f-a6993c069b62",
- "name" : "Allowed Protocol Mapper Types",
- "providerId" : "allowed-protocol-mappers",
- "subType" : "authenticated",
- "subComponents" : { },
- "config" : {
- "allowed-protocol-mapper-types" : [ "saml-role-list-mapper", "oidc-usermodel-property-mapper", "saml-user-property-mapper", "oidc-address-mapper", "saml-user-attribute-mapper", "oidc-usermodel-attribute-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-full-name-mapper" ],
- "consent-required-for-all-mappers" : [ "true" ]
- }
- }, {
- "id" : "e0b51b51-51bc-4bf0-8f50-4c60279ed926",
- "name" : "Max Clients Limit",
- "providerId" : "max-clients",
- "subType" : "anonymous",
- "subComponents" : { },
- "config" : {
- "max-clients" : [ "200" ]
- }
- } ],
- "org.keycloak.keys.KeyProvider" : [ {
- "id" : "c809b9e5-5b4d-406d-99be-5a8542a30131",
- "name" : "hmac-generated",
- "providerId" : "hmac-generated",
- "subComponents" : { },
- "config" : {
- "kid" : [ "bdedd233-061c-4042-935b-680b91cd39b8" ],
- "secret" : [ "Ab8Dw3Si_vOmkkGQqiFo-IPCMziYKk017UfBnEdnOow" ],
- "priority" : [ "100" ]
- }
- }, {
- "id" : "c93b4a04-cb15-45e2-b8c5-1e8dd240e818",
- "name" : "rsa-generated",
- "providerId" : "rsa-generated",
- "subComponents" : { },
- "config" : {
- "privateKey" : [ "MIIEowIBAAKCAQEAuG14Yb94lXVhv213hNnbvLdhj03teLESoIkTS/D8OGFFmzR6bpgLNk63a5ajYt9g+C803hyV27Z2hhwZFjpDi0Csh7vikCpdBwfJuJUZd83mfy9zwufHmAcFXD1f70nfMtdis8bDmplQ+CvToI/8AEdNjR6FEzjoFG9SLo6ON/ccVL/jcMW1geLBhFm15WzFk/l4sopS3kuaEo6qN7ubb1IDvfHKnqk+ZoeZLOFXzUMSRo2r6n3VnNa421e8pxM5twh07V+GEw+otxc2d4ocmoTLNnAmUf9Nu1jb9RcVHe9E+VLwNyQiJ9yolbN2Cbius9tBlmHLvQ8QajrEiHKFxwIDAQABAoIBAQCBE7zpTMTsddcPz2GTDZcJIZ+aWIQXsHbE/KsQv30HSK0az0PRG4DdZYJiPm/jx0tq6D8sJP2NZMrXWdsE/4o+b+lQpmMPW1 [...]
- "certificate" : [ "MIICnTCCAYUCBgFiRAjgcTANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdkZWZhdWx0MB4XDTE4MDMyMDE1MjkxNVoXDTI4MDMyMDE1MzA1NVowEjEQMA4GA1UEAwwHZGVmYXVsdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhteGG/eJV1Yb9td4TZ27y3YY9N7XixEqCJE0vw/DhhRZs0em6YCzZOt2uWo2LfYPgvNN4cldu2doYcGRY6Q4tArIe74pAqXQcHybiVGXfN5n8vc8Lnx5gHBVw9X+9J3zLXYrPGw5qZUPgr06CP/ABHTY0ehRM46BRvUi6Ojjf3HFS/43DFtYHiwYRZteVsxZP5eLKKUt5LmhKOqje7m29SA73xyp6pPmaHmSzhV81DEkaNq+p91ZzWuNtXvKcTObcIdO1fhhMPqLcXNneKHJqEyzZwJ [...]
- "priority" : [ "100" ]
- }
- } ]
- },
- "internationalizationEnabled" : false,
- "supportedLocales" : [ ],
- "authenticationFlows" : [ {
- "id" : "019bcc2f-0262-40cd-80b9-09695025956d",
- "alias" : "Handle Existing Account",
- "description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "idp-confirm-link",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "idp-email-verification",
- "requirement" : "ALTERNATIVE",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "requirement" : "ALTERNATIVE",
- "priority" : 30,
- "flowAlias" : "Verify Existing Account by Re-authentication",
- "userSetupAllowed" : false,
- "autheticatorFlow" : true
- } ]
- }, {
- "id" : "acf385b1-ca2b-4915-a9a7-ebd0d50a773d",
- "alias" : "Verify Existing Account by Re-authentication",
- "description" : "Reauthentication of existing account",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "idp-username-password-form",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "auth-otp-form",
- "requirement" : "OPTIONAL",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- }, {
- "id" : "d0edd344-70c1-4cec-8212-06e9eef11654",
- "alias" : "browser",
- "description" : "browser based authentication",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "auth-cookie",
- "requirement" : "ALTERNATIVE",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "auth-spnego",
- "requirement" : "DISABLED",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "identity-provider-redirector",
- "requirement" : "ALTERNATIVE",
- "priority" : 25,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "requirement" : "ALTERNATIVE",
- "priority" : 30,
- "flowAlias" : "forms",
- "userSetupAllowed" : false,
- "autheticatorFlow" : true
- } ]
- }, {
- "id" : "942c0549-21d8-4bc5-8ce5-48e8743b44b8",
- "alias" : "clients",
- "description" : "Base authentication for clients",
- "providerId" : "client-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "client-secret",
- "requirement" : "ALTERNATIVE",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "client-jwt",
- "requirement" : "ALTERNATIVE",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- }, {
- "id" : "bd526764-1c51-436d-b51e-634838675496",
- "alias" : "direct grant",
- "description" : "OpenID Connect Resource Owner Grant",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "direct-grant-validate-username",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "direct-grant-validate-password",
- "requirement" : "REQUIRED",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "direct-grant-validate-otp",
- "requirement" : "OPTIONAL",
- "priority" : 30,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- }, {
- "id" : "639c578b-98a5-4a0e-91ac-eadd20e22f82",
- "alias" : "first broker login",
- "description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticatorConfig" : "review profile config",
- "authenticator" : "idp-review-profile",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticatorConfig" : "create unique user config",
- "authenticator" : "idp-create-user-if-unique",
- "requirement" : "ALTERNATIVE",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "requirement" : "ALTERNATIVE",
- "priority" : 30,
- "flowAlias" : "Handle Existing Account",
- "userSetupAllowed" : false,
- "autheticatorFlow" : true
- } ]
- }, {
- "id" : "d510b177-7e43-41c5-a0ba-524e40564eb1",
- "alias" : "forms",
- "description" : "Username, password, otp and other auth forms.",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "auth-username-password-form",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "auth-otp-form",
- "requirement" : "OPTIONAL",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- }, {
- "id" : "b2a16db2-0538-49ce-8478-5e982e0e428e",
- "alias" : "registration",
- "description" : "registration flow",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "registration-page-form",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "flowAlias" : "registration form",
- "userSetupAllowed" : false,
- "autheticatorFlow" : true
- } ]
- }, {
- "id" : "cb43a4d3-5513-4341-91c8-f48b490d0325",
- "alias" : "registration form",
- "description" : "registration form",
- "providerId" : "form-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "registration-user-creation",
- "requirement" : "REQUIRED",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "registration-profile-action",
- "requirement" : "REQUIRED",
- "priority" : 40,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "registration-password-action",
- "requirement" : "REQUIRED",
- "priority" : 50,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "registration-recaptcha-action",
- "requirement" : "DISABLED",
- "priority" : 60,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- }, {
- "id" : "230a1ca4-f347-446a-9149-48efac890537",
- "alias" : "reset credentials",
- "description" : "Reset credentials for a user if they forgot their password or something",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "reset-credentials-choose-user",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "reset-credential-email",
- "requirement" : "REQUIRED",
- "priority" : 20,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "reset-password",
- "requirement" : "REQUIRED",
- "priority" : 30,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- }, {
- "authenticator" : "reset-otp",
- "requirement" : "OPTIONAL",
- "priority" : 40,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- }, {
- "id" : "48904284-dd62-4b0d-8b26-a7edcef5eff0",
- "alias" : "saml ecp",
- "description" : "SAML ECP Profile Authentication Flow",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "http-basic-authenticator",
- "requirement" : "REQUIRED",
- "priority" : 10,
- "userSetupAllowed" : false,
- "autheticatorFlow" : false
- } ]
- } ],
- "authenticatorConfig" : [ {
- "id" : "e321d1b8-e71c-49ed-9a4f-bcb54d674b46",
- "alias" : "create unique user config",
- "config" : {
- "require.password.update.after.registration" : "false"
- }
- }, {
- "id" : "1d76feba-114d-464e-99cc-8839b3f271d7",
- "alias" : "review profile config",
- "config" : {
- "update.profile.on.first.login" : "missing"
- }
- } ],
- "requiredActions" : [ {
- "alias" : "CONFIGURE_TOTP",
- "name" : "Configure OTP",
- "providerId" : "CONFIGURE_TOTP",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "UPDATE_PASSWORD",
- "name" : "Update Password",
- "providerId" : "UPDATE_PASSWORD",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "UPDATE_PROFILE",
- "name" : "Update Profile",
- "providerId" : "UPDATE_PROFILE",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "VERIFY_EMAIL",
- "name" : "Verify Email",
- "providerId" : "VERIFY_EMAIL",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "terms_and_conditions",
- "name" : "Terms and Conditions",
- "providerId" : "terms_and_conditions",
- "enabled" : false,
- "defaultAction" : false,
- "config" : { }
- } ],
- "browserFlow" : "browser",
- "registrationFlow" : "registration",
- "directGrantFlow" : "direct grant",
- "resetCredentialsFlow" : "reset credentials",
- "clientAuthenticationFlow" : "clients",
- "attributes" : {
- "failureFactor" : "30",
- "_browser_header.xFrameOptions" : "SAMEORIGIN",
- "quickLoginCheckMilliSeconds" : "1000",
- "maxDeltaTimeSeconds" : "43200",
- "_browser_header.xContentTypeOptions" : "nosniff",
- "bruteForceProtected" : "false",
- "maxFailureWaitSeconds" : "900",
- "minimumQuickLoginWaitSeconds" : "60",
- "_browser_header.contentSecurityPolicy" : "frame-src 'self'",
- "waitIncrementSeconds" : "60"
- },
- "keycloakVersion" : "2.5.4.Final"
-}
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/containers/keycloak/keycloak.conf b/modules/ide-integration/src/main/containers/keycloak/keycloak.conf
index 7a1dff512d..93ecbb9206 100644
--- a/modules/ide-integration/src/main/containers/keycloak/keycloak.conf
+++ b/modules/ide-integration/src/main/containers/keycloak/keycloak.conf
@@ -1,37 +1,20 @@
-admin-user=admin
-admin-password=admin
-log-level=INFO
-log-console-output=json
-
-db=dev-file
-db-username=sa
-db-password=sa
-
-
-cache=local
-theme-static-max-age=2592000
-theme-cache-themes=true
-theme-cache-templates=true
-theme-dir=/opt/keycloak/themes
+# Keycloak Configuration File
+db=dev-mem
-hostname=0.0.0.0
+# HTTP/HTTPS settings
+http-enabled=true
http-port=8080
https-port=8443
+https-key-store-file=${kc.home.dir}/conf/keystores/airavata.jks
+https-key-store-password=airavata
+
+# Hostname configuration
hostname-strict=false
hostname-strict-https=false
-proxy=edge
-
-features=admin-api,admin-fine-grained-authz,token-exchange
+# Health and metrics
+health-enabled=true
+metrics-enabled=true
-transaction-xa-enabled=false
-
-migration-strategy=update
-
-spi-user-cache-provider=default
-spi-realm-cache-provider=default
-
-https-key-store-file=/opt/keycloak/conf/airavata.jks
-https-key-store-password=airavata
-
-quarkus.hibernate-orm.persistence-xml.ignore=true
\ No newline at end of file
+# Logging
+log-level=INFO
diff --git a/modules/ide-integration/src/main/containers/keycloak/realm-default.json b/modules/ide-integration/src/main/containers/keycloak/realm-default.json
new file mode 100644
index 0000000000..3741b867a4
--- /dev/null
+++ b/modules/ide-integration/src/main/containers/keycloak/realm-default.json
@@ -0,0 +1,2649 @@
+{
+ "id" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "realm" : "default",
+ "displayName" : "",
+ "displayNameHtml" : "",
+ "notBefore" : 0,
+ "defaultSignatureAlgorithm" : "RS256",
+ "revokeRefreshToken" : false,
+ "refreshTokenMaxReuse" : 0,
+ "accessTokenLifespan" : 7200,
+ "accessTokenLifespanForImplicitFlow" : 3600,
+ "ssoSessionIdleTimeout" : 604800,
+ "ssoSessionMaxLifespan" : 604800,
+ "ssoSessionIdleTimeoutRememberMe" : 0,
+ "ssoSessionMaxLifespanRememberMe" : 0,
+ "offlineSessionIdleTimeout" : 2592000,
+ "offlineSessionMaxLifespanEnabled" : false,
+ "offlineSessionMaxLifespan" : 5184000,
+ "clientSessionIdleTimeout" : 0,
+ "clientSessionMaxLifespan" : 0,
+ "clientOfflineSessionIdleTimeout" : 0,
+ "clientOfflineSessionMaxLifespan" : 0,
+ "accessCodeLifespan" : 60,
+ "accessCodeLifespanUserAction" : 300,
+ "accessCodeLifespanLogin" : 1800,
+ "actionTokenGeneratedByAdminLifespan" : 43200,
+ "actionTokenGeneratedByUserLifespan" : 300,
+ "oauth2DeviceCodeLifespan" : 600,
+ "oauth2DevicePollingInterval" : 5,
+ "enabled" : true,
+ "sslRequired" : "external",
+ "registrationAllowed" : false,
+ "registrationEmailAsUsername" : false,
+ "rememberMe" : false,
+ "verifyEmail" : false,
+ "loginWithEmailAllowed" : true,
+ "duplicateEmailsAllowed" : false,
+ "resetPasswordAllowed" : false,
+ "editUsernameAllowed" : false,
+ "bruteForceProtected" : false,
+ "permanentLockout" : false,
+ "maxTemporaryLockouts" : 0,
+ "maxFailureWaitSeconds" : 900,
+ "minimumQuickLoginWaitSeconds" : 60,
+ "waitIncrementSeconds" : 60,
+ "quickLoginCheckMilliSeconds" : 1000,
+ "maxDeltaTimeSeconds" : 43200,
+ "failureFactor" : 30,
+ "roles" : {
+ "realm" : [ {
+ "id" : "4cd8497d-db71-41dd-9186-f7df0c22d446",
+ "name" : "gateway-provider",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "b585e111-f934-43b7-b9c2-cbad0c7dc08a",
+ "name" : "default-roles-10000000",
+ "description" : "${role_default-roles}",
+ "composite" : true,
+ "composites" : {
+ "realm" : [ "offline_access", "uma_authorization" ],
+ "client" : {
+ "account" : [ "view-profile", "manage-account" ]
+ }
+ },
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "420f07dc-c07c-4ea8-bf56-f6adf3f2bbc7",
+ "name" : "uma_authorization",
+ "description" : "${role_uma_authorization}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "61fafc5e-96fc-4644-98a9-94f9baf654e6",
+ "name" : "admin",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "1f03206b-d918-491b-a33f-ee96147b310d",
+ "name" : "admin-read-only",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "3f7e69dc-75d4-4388-8a34-e82d32071dc9",
+ "name" : "offline_access",
+ "description" : "${role_offline-access}",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "ebb21957-06c9-4350-9157-576b10cc8761",
+ "name" : "user-pending",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ }, {
+ "id" : "a2acdfe6-eb2a-4104-bb6a-be961e380d97",
+ "name" : "gateway-user",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7",
+ "attributes" : { }
+ } ],
+ "client" : {
+ "realm-management" : [ {
+ "id" : "d14d392e-59cf-49fd-8ba9-507ffaa329cc",
+ "name" : "manage-identity-providers",
+ "description" : "${role_manage-identity-providers}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "66a7f387-fd45-4b01-9457-12692a2d5180",
+ "name" : "realm-admin",
+ "description" : "${role_realm-admin}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "realm-management" : [ "manage-identity-providers", "create-client", "manage-authorization", "impersonation", "view-identity-providers", "manage-clients", "manage-users", "query-realms", "query-clients", "query-users", "view-clients", "manage-realm", "view-users", "view-authorization", "view-realm", "query-groups", "manage-events", "view-events" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "d5d0c66d-b530-4fa4-af75-bf3b556873b0",
+ "name" : "create-client",
+ "description" : "${role_create-client}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "370cf6dc-2013-4a9b-a726-227edf3b6e04",
+ "name" : "impersonation",
+ "description" : "${role_impersonation}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "2fea86aa-2a95-429f-83c2-c2a9594ce050",
+ "name" : "manage-authorization",
+ "description" : "${role_manage-authorization}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "febffa99-60f8-4933-97c5-fe73d082802c",
+ "name" : "view-identity-providers",
+ "description" : "${role_view-identity-providers}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "658c0ab4-ded5-410a-ad62-f3c4a6a99ff4",
+ "name" : "manage-clients",
+ "description" : "${role_manage-clients}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "1cf0e329-8b88-4e64-95bb-e1a9e3ed2d28",
+ "name" : "manage-users",
+ "description" : "${role_manage-users}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "9ea990ff-0ece-463e-9792-c274aa005b3a",
+ "name" : "query-realms",
+ "description" : "${role_query-realms}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "6c20b3e8-97c4-4028-85c3-33531c8b8ed3",
+ "name" : "query-clients",
+ "description" : "${role_query-clients}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "c6aa40d9-b892-41e3-b59f-8dc332db8724",
+ "name" : "query-users",
+ "description" : "${role_query-users}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "24a3d19f-0d0a-4e33-b913-3166b675f5f6",
+ "name" : "view-clients",
+ "description" : "${role_view-clients}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "realm-management" : [ "query-clients" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "65a3c9f0-9d28-43d8-bb95-d34eaf643493",
+ "name" : "manage-realm",
+ "description" : "${role_manage-realm}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "2fc992a6-c78e-4b64-9b44-b7241c993e05",
+ "name" : "view-users",
+ "description" : "${role_view-users}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "realm-management" : [ "query-users", "query-groups" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "e0fd87a5-f6fd-4415-b38f-b767ee595812",
+ "name" : "view-authorization",
+ "description" : "${role_view-authorization}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "3ce7f726-99cc-4738-91d0-0d2d5559e013",
+ "name" : "view-realm",
+ "description" : "${role_view-realm}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "43cb7af1-22b5-49f2-a98a-2ac0b8ad887f",
+ "name" : "query-groups",
+ "description" : "${role_query-groups}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "03528436-9a19-41c6-bb7b-29a504fe7fa8",
+ "name" : "manage-events",
+ "description" : "${role_manage-events}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ }, {
+ "id" : "8586e2c7-b3a5-4f64-beb6-5f61617f661e",
+ "name" : "view-events",
+ "description" : "${role_view-events}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "attributes" : { }
+ } ],
+ "cybershuttle-agent" : [ ],
+ "cs-jupyterlab" : [ {
+ "id" : "bc3da200-4725-43cc-abdc-efee7c26a748",
+ "name" : "uma_protection",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "ac2469cf-1760-4d47-9079-7306fee96ae4",
+ "attributes" : { }
+ } ],
+ "security-admin-console" : [ ],
+ "admin-cli" : [ ],
+ "account-console" : [ ],
+ "pga" : [ {
+ "id" : "d8d76309-d081-4159-b2cd-d9ca93eb7d02",
+ "name" : "uma_protection",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "attributes" : { }
+ }, {
+ "id" : "f8051cd8-10cb-44e6-8826-d323daa236d1",
+ "name" : "gateway-provider",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "attributes" : { }
+ }, {
+ "id" : "fb2c5f47-09e2-4f4b-b858-625f3c5442cd",
+ "name" : "user-pending",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "attributes" : { }
+ }, {
+ "id" : "c7d75283-b7c3-4b93-8804-9ce55bccf74c",
+ "name" : "admin",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "attributes" : { }
+ }, {
+ "id" : "da796582-cbf2-4b23-a31d-5fc9b4010bb0",
+ "name" : "admin-read-only",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "attributes" : { }
+ }, {
+ "id" : "42660438-3a37-466f-b748-d25a25ff9082",
+ "name" : "gateway-user",
+ "description" : "",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "attributes" : { }
+ } ],
+ "broker" : [ {
+ "id" : "dd71ed3a-bb48-41b6-9dae-e81170c4c445",
+ "name" : "read-token",
+ "description" : "${role_read-token}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "af99dd7f-6d3a-4fec-93c0-8deab50edf0e",
+ "attributes" : { }
+ } ],
+ "account" : [ {
+ "id" : "3fa60a39-7c55-434e-b602-3789dd70ec15",
+ "name" : "view-applications",
+ "description" : "${role_view-applications}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "2f3dc94f-9347-49cf-914e-dc3615e550e1",
+ "name" : "view-profile",
+ "description" : "${role_view-profile}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "501821b9-9fd0-42df-b89d-28375acfcbaa",
+ "name" : "manage-account-links",
+ "description" : "${role_manage-account-links}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "c9752755-7d07-40b7-bf61-da14c3d524f2",
+ "name" : "view-groups",
+ "description" : "${role_view-groups}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "de86f028-34c5-422e-a8a0-0508bd5071ed",
+ "name" : "view-consent",
+ "description" : "${role_view-consent}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "c5b77ca2-7619-4ad9-994d-0bd6ba8e8747",
+ "name" : "manage-account",
+ "description" : "${role_manage-account}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "account" : [ "manage-account-links" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "fd21c288-87c3-414c-9152-ea3f5a23b2ca",
+ "name" : "manage-consent",
+ "description" : "${role_manage-consent}",
+ "composite" : true,
+ "composites" : {
+ "client" : {
+ "account" : [ "view-consent" ]
+ }
+ },
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ }, {
+ "id" : "ea81e9c3-3f7b-4cda-901b-4bbe6a30e5e7",
+ "name" : "delete-account",
+ "description" : "${role_delete-account}",
+ "composite" : false,
+ "clientRole" : true,
+ "containerId" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "attributes" : { }
+ } ]
+ }
+ },
+ "groups" : [ ],
+ "defaultRole" : {
+ "id" : "b585e111-f934-43b7-b9c2-cbad0c7dc08a",
+ "name" : "default-roles-10000000",
+ "description" : "${role_default-roles}",
+ "composite" : true,
+ "clientRole" : false,
+ "containerId" : "afc8036c-62c3-462e-ae10-e1727c4bd8f7"
+ },
+ "requiredCredentials" : [ "password" ],
+ "otpPolicyType" : "totp",
+ "otpPolicyAlgorithm" : "HmacSHA1",
+ "otpPolicyInitialCounter" : 0,
+ "otpPolicyDigits" : 6,
+ "otpPolicyLookAheadWindow" : 1,
+ "otpPolicyPeriod" : 30,
+ "otpPolicyCodeReusable" : false,
+ "otpSupportedApplications" : [ "totpAppFreeOTPName", "totpAppGoogleName", "totpAppMicrosoftAuthenticatorName" ],
+ "localizationTexts" : { },
+ "webAuthnPolicyRpEntityName" : "keycloak",
+ "webAuthnPolicySignatureAlgorithms" : [ "ES256" ],
+ "webAuthnPolicyRpId" : "",
+ "webAuthnPolicyAttestationConveyancePreference" : "not specified",
+ "webAuthnPolicyAuthenticatorAttachment" : "not specified",
+ "webAuthnPolicyRequireResidentKey" : "not specified",
+ "webAuthnPolicyUserVerificationRequirement" : "not specified",
+ "webAuthnPolicyCreateTimeout" : 0,
+ "webAuthnPolicyAvoidSameAuthenticatorRegister" : false,
+ "webAuthnPolicyAcceptableAaguids" : [ ],
+ "webAuthnPolicyExtraOrigins" : [ ],
+ "webAuthnPolicyPasswordlessRpEntityName" : "keycloak",
+ "webAuthnPolicyPasswordlessSignatureAlgorithms" : [ "ES256" ],
+ "webAuthnPolicyPasswordlessRpId" : "",
+ "webAuthnPolicyPasswordlessAttestationConveyancePreference" : "not specified",
+ "webAuthnPolicyPasswordlessAuthenticatorAttachment" : "not specified",
+ "webAuthnPolicyPasswordlessRequireResidentKey" : "not specified",
+ "webAuthnPolicyPasswordlessUserVerificationRequirement" : "not specified",
+ "webAuthnPolicyPasswordlessCreateTimeout" : 0,
+ "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister" : false,
+ "webAuthnPolicyPasswordlessAcceptableAaguids" : [ ],
+ "webAuthnPolicyPasswordlessExtraOrigins" : [ ],
+ "users" : [ {
+ "id" : "33865abf-b336-4f77-b370-c2aaadcefaa8",
+ "username" : "default-admin",
+ "firstName" : "admin",
+ "lastName" : "admin",
+ "email" : "default-admin@default",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741788577569,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ {
+ "id" : "21ba2cc3-1794-4f87-8df4-a7350cc570ca",
+ "type" : "password",
+ "userLabel" : "My password",
+ "createdDate" : 1741788838245,
+ "secretData" : "{\"value\":\"qQ+RHT09vJb1Mv4snElCbOh67CM7cO8r2oFX5UtZunk33EG/uplFAOTIeklRMU5HydfeL1u8gisa9ui+8e2A2g==\",\"salt\":\"tbme6ZolnVOjWqLtWTmzSA==\",\"additionalParameters\":{}}",
+ "credentialData" : "{\"hashIterations\":210000,\"algorithm\":\"pbkdf2-sha512\",\"additionalParameters\":{}}"
+ } ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "9a3569d7-7cd6-43d2-89ab-48c3040b8a07",
+ "username" : "dimuthuw@gatech.edu",
+ "firstName" : "Dimuthu",
+ "lastName" : "Wannipurage",
+ "email" : "dimuthuw@gatech.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741869545145,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverE/users/194529",
+ "userName" : "dimuthuw@gatech.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "23ea1ee4-22f8-4804-858b-ad9b69f866a3",
+ "username" : "dwannipu@iu.edu",
+ "firstName" : "Dimuthu",
+ "lastName" : "Wannipurage",
+ "email" : "dwannipu@iu.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741871229151,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverA/users/287161",
+ "userName" : "dwannipu@iu.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "3e7d3897-5dbc-486f-b5c6-00135e8fb0a5",
+ "username" : "eroma.abey@gmail.com",
+ "firstName" : "Eroma",
+ "lastName" : "Abey",
+ "email" : "eroma.abey@gmail.com",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741789737864,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverE/users/8674",
+ "userName" : "eroma.abey@gmail.com"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "b36672e8-ccb2-40ed-8522-9eec5a2d8662",
+ "username" : "eroma@gatech.edu",
+ "firstName" : "Eroma",
+ "lastName" : "Abeysinghe",
+ "email" : "eroma@gatech.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741787443518,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverF/users/141980",
+ "userName" : "eroma@gatech.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "ac7b156b-564c-4b44-80b4-409114e88510",
+ "username" : "ganning.xu@gatech.edu",
+ "firstName" : "Ganning",
+ "lastName" : "Xu",
+ "email" : "ganning.xu@gatech.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741888661947,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverE/users/152691",
+ "userName" : "ganning.xu@gatech.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "455c7d22-6cd2-4b9b-ac91-949307380a5c",
+ "username" : "isralewi@illinois.edu",
+ "firstName" : "Barry",
+ "lastName" : "Isralewitz",
+ "email" : "isralewi@illinois.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741737143337,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverA/users/72206",
+ "userName" : "isralewi@illinois.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "7d66792c-2027-428b-bede-2efb7046d0ae",
+ "username" : "lahiruj.jayathilake@gmail.com",
+ "firstName" : "Lahiru",
+ "lastName" : "Jayathilake",
+ "email" : "lahiruj.jayathilake@gmail.com",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741788322225,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverE/users/59623",
+ "userName" : "lahiruj.jayathilake@gmail.com"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "12ae3225-636e-4545-952b-115b22596c98",
+ "username" : "ljayathilake3@gatech.edu",
+ "firstName" : "Lahiru",
+ "lastName" : "Jayathilake",
+ "email" : "ljayathilake3@gatech.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741725237000,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverE/users/173020",
+ "userName" : "ljayathilake3@gatech.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "clientConsents" : [ {
+ "clientId" : "cybershuttle-agent",
+ "grantedClientScopes" : [ "roles", "email", "profile" ],
+ "createdDate" : 1741726104600,
+ "lastUpdatedDate" : 1741726104611
+ } ],
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "dfe38185-9db7-4820-97c3-d0712ff35159",
+ "username" : "pamidigs@iu.edu",
+ "firstName" : "Sudhakar",
+ "lastName" : "Pamidighantam",
+ "email" : "pamidigs@iu.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741728655391,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverA/users/20201",
+ "userName" : "pamidigs@iu.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "clientConsents" : [ {
+ "clientId" : "cybershuttle-agent",
+ "grantedClientScopes" : [ "roles", "email", "profile" ],
+ "createdDate" : 1741729390542,
+ "lastUpdatedDate" : 1741729390548
+ } ],
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "e3fb714e-9ed6-4d26-a403-781e71bbb025",
+ "username" : "service-account-cs-jupyterlab",
+ "emailVerified" : false,
+ "createdTimestamp" : 1733075288051,
+ "enabled" : true,
+ "totp" : false,
+ "serviceAccountClientId" : "cs-jupyterlab",
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "cs-jupyterlab" : [ "uma_protection" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "e9d5a7b9-c093-4916-a331-12fbc9101c70",
+ "username" : "service-account-pga",
+ "emailVerified" : false,
+ "createdTimestamp" : 1726317784923,
+ "enabled" : true,
+ "totp" : false,
+ "serviceAccountClientId" : "pga",
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "realm-management" : [ "manage-users" ],
+ "pga" : [ "uma_protection" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "e68c29c2-7f0f-471c-a3e1-dfe1033a8889",
+ "username" : "smarru@gatech.edu",
+ "firstName" : "Suresh",
+ "lastName" : "Marru",
+ "email" : "smarru@gatech.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741871207623,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverE/users/121218",
+ "userName" : "smarru@gatech.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ }, {
+ "id" : "433fd8f3-db52-4bb5-8d7d-2d1b74dea467",
+ "username" : "tenbarge@princeton.edu",
+ "firstName" : "Jason",
+ "lastName" : "TenBarge",
+ "email" : "tenbarge@princeton.edu",
+ "emailVerified" : true,
+ "createdTimestamp" : 1741791838996,
+ "enabled" : true,
+ "totp" : false,
+ "credentials" : [ ],
+ "disableableCredentialTypes" : [ ],
+ "requiredActions" : [ ],
+ "federatedIdentities" : [ {
+ "identityProvider" : "oidc",
+ "userId" : "http://cilogon.org/serverA/users/6168781",
+ "userName" : "tenbarge@princeton.edu"
+ } ],
+ "realmRoles" : [ "default-roles-10000000" ],
+ "clientRoles" : {
+ "broker" : [ "read-token" ]
+ },
+ "notBefore" : 0,
+ "groups" : [ ]
+ } ],
+ "scopeMappings" : [ {
+ "clientScope" : "offline_access",
+ "roles" : [ "offline_access" ]
+ } ],
+ "clientScopeMappings" : {
+ "account" : [ {
+ "client" : "account-console",
+ "roles" : [ "manage-account", "view-groups" ]
+ } ]
+ },
+ "clients" : [ {
+ "id" : "c1602103-6c60-4e27-a7ed-c2c21d7801f2",
+ "clientId" : "account",
+ "name" : "${client_account}",
+ "rootUrl" : "${authBaseUrl}",
+ "baseUrl" : "/realms/default/account/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/realms/default/account/*" ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "def3d25e-919c-4b1b-b3fd-0a976a33e4b6",
+ "clientId" : "account-console",
+ "name" : "${client_account-console}",
+ "rootUrl" : "${authBaseUrl}",
+ "baseUrl" : "/realms/default/account/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/realms/default/account/*" ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+",
+ "pkce.code.challenge.method" : "S256"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "protocolMappers" : [ {
+ "id" : "a2d8962f-2ac2-4fa5-b42e-f37990a4d098",
+ "name" : "audience resolve",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-audience-resolve-mapper",
+ "consentRequired" : false,
+ "config" : { }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "4a5fd0fd-6842-4528-8fea-ca0727dce936",
+ "clientId" : "admin-cli",
+ "name" : "${client_admin-cli}",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : false,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : true,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "af99dd7f-6d3a-4fec-93c0-8deab50edf0e",
+ "clientId" : "broker",
+ "name" : "${client_broker}",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : true,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "ac2469cf-1760-4d47-9079-7306fee96ae4",
+ "clientId" : "cs-jupyterlab",
+ "name" : "JupyterLab",
+ "description" : "",
+ "rootUrl" : "",
+ "adminUrl" : "",
+ "baseUrl" : "http://localhost:8080/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "secret" : "DxeMtfiWU1qkDEmaGHf13RDahCujzhy1",
+ "redirectUris" : [ "", "/*", "https://hub.cybershuttle.org/hub/oauth_callback" ],
+ "webOrigins" : [ "/*" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : true,
+ "serviceAccountsEnabled" : true,
+ "authorizationServicesEnabled" : true,
+ "publicClient" : false,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "client.secret.creation.time" : "1741725835",
+ "post.logout.redirect.uris" : "+",
+ "oauth2.device.authorization.grant.enabled" : "false",
+ "backchannel.logout.revoke.offline.tokens" : "false",
+ "use.refresh.tokens" : "true",
+ "oidc.ciba.grant.enabled" : "false",
+ "client.use.lightweight.access.token.enabled" : "false",
+ "backchannel.logout.session.required" : "true",
+ "client_credentials.use_refresh_token" : "false",
+ "acr.loa.map" : "{}",
+ "require.pushed.authorization.requests" : "false",
+ "tls.client.certificate.bound.access.tokens" : "false",
+ "display.on.consent.screen" : "false",
+ "token.response.type.bearer.lower-case" : "false"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : true,
+ "nodeReRegistrationTimeout" : -1,
+ "protocolMappers" : [ {
+ "id" : "8674e3d9-f43c-4f89-a290-2666ed0567c1",
+ "name" : "Client IP Address",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "clientAddress",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "clientAddress",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "b0fdec17-a04b-48c7-870b-ba71c0bb6680",
+ "name" : "Client ID",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "client_id",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "client_id",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "f8031842-1fd7-41ac-b5e8-b22330cdcdda",
+ "name" : "Client Host",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "clientHost",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "clientHost",
+ "jsonType.label" : "String"
+ }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "preferred_username", "microprofile-jwt" ],
+ "authorizationSettings" : {
+ "allowRemoteResourceManagement" : true,
+ "policyEnforcementMode" : "ENFORCING",
+ "resources" : [ ],
+ "policies" : [ ],
+ "scopes" : [ ],
+ "decisionStrategy" : "UNANIMOUS"
+ }
+ }, {
+ "id" : "f4c30fed-2f14-471d-a922-b5ad262273f2",
+ "clientId" : "cybershuttle-agent",
+ "name" : "CyberShuttle Agent",
+ "description" : "",
+ "rootUrl" : "",
+ "adminUrl" : "",
+ "baseUrl" : "https://cybershuttle.org/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/*" ],
+ "webOrigins" : [ "/*" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : false,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : true,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+",
+ "oauth2.device.authorization.grant.enabled" : "true",
+ "backchannel.logout.revoke.offline.tokens" : "false",
+ "use.refresh.tokens" : "true",
+ "oidc.ciba.grant.enabled" : "false",
+ "client.use.lightweight.access.token.enabled" : "false",
+ "backchannel.logout.session.required" : "true",
+ "client_credentials.use_refresh_token" : "false",
+ "acr.loa.map" : "{}",
+ "require.pushed.authorization.requests" : "false",
+ "tls.client.certificate.bound.access.tokens" : "false",
+ "display.on.consent.screen" : "false",
+ "token.response.type.bearer.lower-case" : "false"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : true,
+ "nodeReRegistrationTimeout" : -1,
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "5e2398e0-3498-4da3-9262-4f2dcc7448fa",
+ "clientId" : "pga",
+ "name" : "Cybeshuttle Client",
+ "description" : "Client For Cybershuttle Services",
+ "rootUrl" : "",
+ "adminUrl" : "",
+ "baseUrl" : "",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "secret" : "m36BXQIxX3j3VILadeHMK5IvbOeRlCCc",
+ "redirectUris" : [ "https://cybershuttle.org/callback-url", "http://localhost/callback-url", "http://airavata.host:8008/callback-url", "https://cybershuttle.org/", "https://cybershuttle.org/auth/callback*" ],
+ "webOrigins" : [ "https://cybershuttle.org", "*" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : true,
+ "serviceAccountsEnabled" : true,
+ "authorizationServicesEnabled" : true,
+ "publicClient" : false,
+ "frontchannelLogout" : true,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "oidc.ciba.grant.enabled" : "false",
+ "client.secret.creation.time" : "1741724922",
+ "backchannel.logout.session.required" : "true",
+ "frontchannel.logout.url" : "https://cybershuttle.org/",
+ "post.logout.redirect.uris" : "+##https://cybershuttle.org/",
+ "display.on.consent.screen" : "false",
+ "oauth2.device.authorization.grant.enabled" : "true",
+ "backchannel.logout.revoke.offline.tokens" : "false"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : true,
+ "nodeReRegistrationTimeout" : -1,
+ "protocolMappers" : [ {
+ "id" : "f15a7de0-0c1e-40d8-bd05-c1aaf0deb3e1",
+ "name" : "Client IP Address",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "clientAddress",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "clientAddress",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "a0956d0b-e5c4-4d9a-aebf-89efa6881438",
+ "name" : "Client ID",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "client_id",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "client_id",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "6863299e-7d4f-43f4-8d0e-fc8cd4a8ceac",
+ "name" : "Client Host",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "clientHost",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "clientHost",
+ "jsonType.label" : "String"
+ }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "preferred_username", "microprofile-jwt" ],
+ "authorizationSettings" : {
+ "allowRemoteResourceManagement" : true,
+ "policyEnforcementMode" : "ENFORCING",
+ "resources" : [ ],
+ "policies" : [ ],
+ "scopes" : [ ],
+ "decisionStrategy" : "UNANIMOUS"
+ }
+ }, {
+ "id" : "be9976ab-8e62-4d5a-8176-b6efaba2e1bf",
+ "clientId" : "realm-management",
+ "name" : "${client_realm-management}",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ ],
+ "webOrigins" : [ ],
+ "notBefore" : 0,
+ "bearerOnly" : true,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ }, {
+ "id" : "cedda658-7913-4763-89b8-71d1d1794c1c",
+ "clientId" : "security-admin-console",
+ "name" : "${client_security-admin-console}",
+ "rootUrl" : "${authAdminUrl}",
+ "baseUrl" : "/admin/default/console/",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "alwaysDisplayInConsole" : false,
+ "clientAuthenticatorType" : "client-secret",
+ "redirectUris" : [ "/admin/default/console/*" ],
+ "webOrigins" : [ "+" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : true,
+ "frontchannelLogout" : false,
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "post.logout.redirect.uris" : "+",
+ "pkce.code.challenge.method" : "S256"
+ },
+ "authenticationFlowBindingOverrides" : { },
+ "fullScopeAllowed" : false,
+ "nodeReRegistrationTimeout" : 0,
+ "protocolMappers" : [ {
+ "id" : "f8a3200c-fed5-4d3e-9fc7-80c23c458056",
+ "name" : "locale",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "locale",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "locale",
+ "jsonType.label" : "String"
+ }
+ } ],
+ "defaultClientScopes" : [ "web-origins", "acr", "roles", "profile", "email" ],
+ "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
+ } ],
+ "clientScopes" : [ {
+ "id" : "a8292b23-f927-4a5c-a432-2f0ae8867105",
+ "name" : "roles",
+ "description" : "OpenID Connect scope for add user roles to the access token",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : "${rolesScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "bfd13362-6c5d-405c-b7c0-bd37063ca9f9",
+ "name" : "client roles",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-client-role-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "multivalued" : "true",
+ "user.attribute" : "foo",
+ "access.token.claim" : "true",
+ "claim.name" : "resource_access.${client_id}.roles",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "be26563f-80a7-43d7-bf9f-d71205ec53be",
+ "name" : "audience resolve",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-audience-resolve-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "access.token.claim" : "true",
+ "introspection.token.claim" : "true"
+ }
+ }, {
+ "id" : "9565b5e4-dfbb-43bc-aa8d-3e845c188669",
+ "name" : "realm roles",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-realm-role-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "multivalued" : "true",
+ "user.attribute" : "foo",
+ "access.token.claim" : "true",
+ "claim.name" : "realm_access.roles",
+ "jsonType.label" : "String"
+ }
+ } ]
+ }, {
+ "id" : "34779656-fdf3-41c5-a963-d1e2b533b8f0",
+ "name" : "phone",
+ "description" : "OpenID Connect built-in scope: phone",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${phoneScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "6d5c53bd-a91a-4066-baba-52de991b5d53",
+ "name" : "phone number",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "phoneNumber",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "phone_number",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "a4f0d91a-e59e-4794-b71c-726413ba5be8",
+ "name" : "phone number verified",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "phoneNumberVerified",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "phone_number_verified",
+ "jsonType.label" : "boolean"
+ }
+ } ]
+ }, {
+ "id" : "8240c399-c132-49a0-8e41-48266e89b2ce",
+ "name" : "address",
+ "description" : "OpenID Connect built-in scope: address",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "consent.screen.text" : "${addressScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "cbd43ec1-4467-4148-a435-081cd1c0d161",
+ "name" : "address",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-address-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.attribute.formatted" : "formatted",
+ "user.attribute.country" : "country",
+ "introspection.token.claim" : "true",
+ "user.attribute.postal_code" : "postal_code",
+ "userinfo.token.claim" : "true",
+ "user.attribute.street" : "street",
+ "id.token.claim" : "true",
+ "user.attribute.region" : "region",
+ "access.token.claim" : "true",
+ "user.attribute.locality" : "locality"
+ }
+ } ]
+ }, {
+ "id" : "7d17e91f-6691-4f1d-9f6c-7a6a7ae0b5ae",
+ "name" : "email",
+ "description" : "OpenID Connect built-in scope: email",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : "${emailScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "c0d4e90d-2c57-4ed5-9e82-01a6d1d16cf0",
+ "name" : "email",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "email",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "email",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "c7e78134-c7dd-45a9-a921-cc5dbdc9fc68",
+ "name" : "email verified",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "emailVerified",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "email_verified",
+ "jsonType.label" : "boolean"
+ }
+ } ]
+ }, {
+ "id" : "c0509e2e-01ae-49d6-8d24-0e86628a85aa",
+ "name" : "preferred_username",
+ "description" : "preferred_username",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "true",
+ "gui.order" : "",
+ "consent.screen.text" : ""
+ },
+ "protocolMappers" : [ {
+ "id" : "e56aa26c-4614-43bb-a96b-56c1ad959e45",
+ "name" : "email",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "email",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "email",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "b50ae18b-52e8-44f6-ad4d-ad596de89cfd",
+ "name" : "username",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "preferred_username",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "0a93294b-2a7c-4098-af47-4faaa535c8d4",
+ "name" : "ClientId",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usersessionmodel-note-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "user.session.note" : "clientId",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "clientId",
+ "jsonType.label" : "String",
+ "access.tokenResponse.claim" : "false"
+ }
+ }, {
+ "id" : "37b8b958-2396-4e2c-871c-f56f6ad393aa",
+ "name" : "family name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "lastName",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "family_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "d779bc1f-5c49-46c6-ae84-1d9e419984ba",
+ "name" : "given name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "firstName",
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "claim.name" : "given_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "75c6a588-0993-446e-90e0-52046505959e",
+ "name" : "full name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-full-name-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "id.token.claim" : "true",
+ "lightweight.claim" : "false",
+ "access.token.claim" : "true",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "false"
+ }
+ } ]
+ }, {
+ "id" : "33b54357-7cdd-494c-9806-6e6d59f6af69",
+ "name" : "role_list",
+ "description" : "SAML role list",
+ "protocol" : "saml",
+ "attributes" : {
+ "consent.screen.text" : "${samlRoleListScopeConsentText}",
+ "display.on.consent.screen" : "true"
+ },
+ "protocolMappers" : [ {
+ "id" : "c56cb073-719d-4f74-8a23-b2105804ee80",
+ "name" : "role list",
+ "protocol" : "saml",
+ "protocolMapper" : "saml-role-list-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "single" : "false",
+ "attribute.nameformat" : "Basic",
+ "attribute.name" : "Role"
+ }
+ } ]
+ }, {
+ "id" : "658e931d-3b55-464e-b199-48e9b43f9c3f",
+ "name" : "profile",
+ "description" : "OpenID Connect built-in scope: profile",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false",
+ "gui.order" : "",
+ "consent.screen.text" : "${profileScopeConsentText}"
+ },
+ "protocolMappers" : [ {
+ "id" : "a352424d-d48b-4e7e-9394-c769f9542605",
+ "name" : "website",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "website",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "website",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "3710a2dd-969f-4562-89af-55e31e30f565",
+ "name" : "middle name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "middleName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "middle_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "862fa550-a9df-40e5-8fa3-473c45de5e59",
+ "name" : "zoneinfo",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "zoneinfo",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "zoneinfo",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "0ae8854b-1589-401c-b0e0-24e423d8e723",
+ "name" : "given name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "firstName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "given_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "a72f9f11-04bb-4905-81fe-7b23b7446e20",
+ "name" : "gender",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "gender",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "gender",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "eaded814-dc28-450e-95ca-fbd2712e6a40",
+ "name" : "profile",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "profile",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "profile",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "652dd31b-d4d8-49e9-8f53-125404b2a1f1",
+ "name" : "locale",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "locale",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "locale",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "b20740b4-9fea-4035-b3af-cf0a40852b2f",
+ "name" : "birthdate",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "birthdate",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "birthdate",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "7d36aacc-aa67-4ccb-98b0-b02a111c7dea",
+ "name" : "username",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "preferred_username",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "4ed1750d-d48a-4005-8398-2c34f0c6548e",
+ "name" : "full name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-full-name-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true"
+ }
+ }, {
+ "id" : "4b111e20-11ee-4429-be4d-93414b08e506",
+ "name" : "updated at",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "updatedAt",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "updated_at",
+ "jsonType.label" : "long"
+ }
+ }, {
+ "id" : "7a7e5200-ae1c-44dc-a5a7-5546391929b5",
+ "name" : "family name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "lastName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "family_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "d353e69e-7d1e-4c41-9fdd-f76a59dacf2b",
+ "name" : "picture",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "picture",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "picture",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "a0e4a0a3-1428-46a5-a2a8-66480b1ecf9f",
+ "name" : "nickname",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "nickname",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "nickname",
+ "jsonType.label" : "String"
+ }
+ } ]
+ }, {
+ "id" : "af72f98c-7086-4e99-97ad-2cdfe9f46cd4",
+ "name" : "offline_access",
+ "description" : "OpenID Connect built-in scope: offline_access",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "consent.screen.text" : "${offlineAccessScopeConsentText}",
+ "display.on.consent.screen" : "true"
+ }
+ }, {
+ "id" : "c98af4d7-e60f-469d-b76b-c8673b3d641c",
+ "name" : "acr",
+ "description" : "OpenID Connect scope for add acr (authentication context class reference) to the token",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "false"
+ },
+ "protocolMappers" : [ {
+ "id" : "d000afcc-348f-414e-8e18-fbf9dd73bec0",
+ "name" : "acr loa level",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-acr-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true"
+ }
+ } ]
+ }, {
+ "id" : "9bc461ac-7b67-48ae-af92-03b51bdd2336",
+ "name" : "microprofile-jwt",
+ "description" : "Microprofile - JWT built-in scope",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "true",
+ "display.on.consent.screen" : "false"
+ },
+ "protocolMappers" : [ {
+ "id" : "075ba449-99e1-49c5-8642-755d9fd1ca08",
+ "name" : "upn",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-attribute-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "upn",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "4d1db13c-a944-4205-95fc-6b9c184e3cc4",
+ "name" : "groups",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-realm-role-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "introspection.token.claim" : "true",
+ "multivalued" : "true",
+ "userinfo.token.claim" : "true",
+ "user.attribute" : "foo",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "groups",
+ "jsonType.label" : "String"
+ }
+ } ]
+ }, {
+ "id" : "162a761a-4a0b-4c30-a388-1ee5df06eb8e",
+ "name" : "web-origins",
+ "description" : "OpenID Connect scope for add allowed web origins to the access token",
+ "protocol" : "openid-connect",
+ "attributes" : {
+ "include.in.token.scope" : "false",
+ "display.on.consent.screen" : "false",
+ "consent.screen.text" : ""
+ },
+ "protocolMappers" : [ {
+ "id" : "2ecc5181-9142-45b5-b11a-4d7936f9e38e",
+ "name" : "allowed web origins",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-allowed-origins-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "access.token.claim" : "true",
+ "introspection.token.claim" : "true"
+ }
+ } ]
+ } ],
+ "defaultDefaultClientScopes" : [ "web-origins", "role_list", "profile", "email", "roles", "acr" ],
+ "defaultOptionalClientScopes" : [ "phone", "address", "microprofile-jwt", "offline_access", "preferred_username" ],
+ "browserSecurityHeaders" : {
+ "contentSecurityPolicyReportOnly" : "",
+ "xContentTypeOptions" : "nosniff",
+ "referrerPolicy" : "no-referrer",
+ "xRobotsTag" : "none",
+ "xFrameOptions" : "SAMEORIGIN",
+ "contentSecurityPolicy" : "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+ "xXSSProtection" : "1; mode=block",
+ "strictTransportSecurity" : "max-age=31536000; includeSubDomains"
+ },
+ "smtpServer" : { },
+ "loginTheme" : "custom-theme",
+ "accountTheme" : "",
+ "adminTheme" : "",
+ "emailTheme" : "",
+ "eventsEnabled" : false,
+ "eventsListeners" : [ "jboss-logging" ],
+ "enabledEventTypes" : [ ],
+ "adminEventsEnabled" : false,
+ "adminEventsDetailsEnabled" : false,
+ "identityProviders" : [ {
+ "alias" : "oidc",
+ "displayName" : "CILogon",
+ "internalId" : "f0427047-bcb0-414d-9e9a-dc97b7cddefa",
+ "providerId" : "oidc",
+ "enabled" : true,
+ "updateProfileFirstLoginMode" : "on",
+ "trustEmail" : true,
+ "storeToken" : true,
+ "addReadTokenRoleOnCreate" : true,
+ "authenticateByDefault" : false,
+ "linkOnly" : false,
+ "firstBrokerLoginFlowAlias" : "first broker login",
+ "config" : {
+ "acceptsPromptNoneForwardFromClient" : "false",
+ "tokenUrl" : "https://cilogon.org/oauth2/token",
+ "isAccessTokenJWT" : "false",
+ "filteredByClaim" : "false",
+ "backchannelSupported" : "false",
+ "issuer" : "https://cilogon.org",
+ "loginHint" : "false",
+ "clientAuthMethod" : "client_secret_post",
+ "syncMode" : "IMPORT",
+ "clientSecret" : "xNgIF3suP5NFRiBnyDdBnJRP5XG3D5fgCfg5jxdkMlBUOe735UDXayX3OpOh2ra-zXY1VZKV4uou2qYw4WvAOg",
+ "allowedClockSkew" : "0",
+ "defaultScope" : "openid profile email org.cilogon.userinfo",
+ "guiOrder" : "1",
+ "hideOnLoginPage" : "false",
+ "userInfoUrl" : "https://cilogon.org/oauth2/userinfo",
+ "validateSignature" : "false",
+ "clientId" : "cilogon:/client_id/392446d1fe4981d3eab8adb6da2a1952",
+ "uiLocales" : "false",
+ "disableNonce" : "false",
+ "sendClientIdOnLogout" : "false",
+ "pkceEnabled" : "false",
+ "forwardParameters" : "kc_idp_hint",
+ "authorizationUrl" : "https://cilogon.org/authorize",
+ "disableUserInfo" : "false",
+ "logoutUrl" : "https://cybershuttle.org/",
+ "sendIdTokenOnLogout" : "true",
+ "passMaxAge" : "false"
+ }
+ } ],
+ "identityProviderMappers" : [ {
+ "id" : "59cabb48-742d-471c-9bb5-8741c98675ad",
+ "name" : "family_name",
+ "identityProviderAlias" : "oidc",
+ "identityProviderMapper" : "oidc-user-attribute-idp-mapper",
+ "config" : {
+ "syncMode" : "INHERIT",
+ "claim" : "family_name",
+ "user.attribute" : "lastName"
+ }
+ }, {
+ "id" : "6d5651e9-75cd-4c70-9bbc-6f2acc5496ab",
+ "name" : "given_name",
+ "identityProviderAlias" : "oidc",
+ "identityProviderMapper" : "oidc-user-attribute-idp-mapper",
+ "config" : {
+ "syncMode" : "INHERIT",
+ "claim" : "given_name",
+ "user.attribute" : "firstName"
+ }
+ } ],
+ "components" : {
+ "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy" : [ {
+ "id" : "d446bfe5-46d7-4b5a-a569-41268f1f0e87",
+ "name" : "Trusted Hosts",
+ "providerId" : "trusted-hosts",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "host-sending-registration-request-must-match" : [ "true" ],
+ "client-uris-must-match" : [ "true" ]
+ }
+ }, {
+ "id" : "d6c586ad-07ab-4a3e-8f61-9ee3d4f7e03f",
+ "name" : "Max Clients Limit",
+ "providerId" : "max-clients",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "max-clients" : [ "200" ]
+ }
+ }, {
+ "id" : "fcf2e8da-427f-4232-8e02-cf08151c0211",
+ "name" : "Allowed Protocol Mapper Types",
+ "providerId" : "allowed-protocol-mappers",
+ "subType" : "authenticated",
+ "subComponents" : { },
+ "config" : {
+ "allowed-protocol-mapper-types" : [ "saml-user-property-mapper", "saml-user-attribute-mapper", "oidc-full-name-mapper", "saml-role-list-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-property-mapper", "oidc-usermodel-attribute-mapper" ]
+ }
+ }, {
+ "id" : "9d32bc1e-fa04-4ab7-8911-cb344ff8b5c8",
+ "name" : "Consent Required",
+ "providerId" : "consent-required",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : { }
+ }, {
+ "id" : "eff493d8-9108-420f-88ca-522e9df73f46",
+ "name" : "Allowed Protocol Mapper Types",
+ "providerId" : "allowed-protocol-mappers",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "allowed-protocol-mapper-types" : [ "saml-role-list-mapper", "saml-user-property-mapper", "saml-user-attribute-mapper", "oidc-usermodel-property-mapper", "oidc-address-mapper", "oidc-usermodel-attribute-mapper", "oidc-full-name-mapper", "oidc-sha256-pairwise-sub-mapper" ]
+ }
+ }, {
+ "id" : "64e7e77a-3489-45bd-b440-e1c42941b22a",
+ "name" : "Allowed Client Scopes",
+ "providerId" : "allowed-client-templates",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : {
+ "allow-default-scopes" : [ "true" ]
+ }
+ }, {
+ "id" : "b3315017-dfb7-4e2f-a682-f9278ae9008a",
+ "name" : "Allowed Client Scopes",
+ "providerId" : "allowed-client-templates",
+ "subType" : "authenticated",
+ "subComponents" : { },
+ "config" : {
+ "allow-default-scopes" : [ "true" ]
+ }
+ }, {
+ "id" : "35fa6e56-7042-4df8-bdda-feeeb6b39c45",
+ "name" : "Full Scope Disabled",
+ "providerId" : "scope",
+ "subType" : "anonymous",
+ "subComponents" : { },
+ "config" : { }
+ } ],
+ "org.keycloak.keys.KeyProvider" : [ {
+ "id" : "33a8177a-0278-4ce3-abee-a4394ec04aed",
+ "name" : "rsa-enc-generated",
+ "providerId" : "rsa-enc-generated",
+ "subComponents" : { },
+ "config" : {
+ "privateKey" : [ "MIIEowIBAAKCAQEArMNxvbCXCLZBiqnNEcZ+XpGJVvKXnGVOvc6P4CT4IDDqjuSUWbpGAECPiygYjlUDRkNw5qY0Z8Foo4g0/wBOBvEMotkBEW8JiT9ND1JZAFcqlVksSMdE9YvmrZSoteSs5wSKHxvh0903cLEtRUmwlq1AVt6Eux90ime5iuBbLmwskk882SUcxgRsDp4iocrBZ99bl6oq10D+7h6JyNS0k7fh9o7q5F4fsqENjXvoPASRk1R0Q3pJPT7Uih/wetm4iv9S+jqmoFccYjBnamy7U/NRF2XauTLr0Xj/S2WRPb+eDF59onPyz13Cr/jZC5YzaKqjFGBReW+c3YJ5ETDdWQIDAQABAoIBAAkRpGec/LyuFpAxHCz18r3DnYZFK0zAK6s+i+JsBmNoNfPkz13Lb6/FM9PN+cYE8+xND4DoEiGtLzFAbenB6hamsi9dPVddMQ [...]
+ "certificate" : [ "MIICnTCCAYUCBgGVhuGg5jANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdkZWZhdWx0MB4XDTI1MDMxMTIwMjMwOFoXDTM1MDMxMTIwMjQ0OFowEjEQMA4GA1UEAwwHZGVmYXVsdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKzDcb2wlwi2QYqpzRHGfl6RiVbyl5xlTr3Oj+Ak+CAw6o7klFm6RgBAj4soGI5VA0ZDcOamNGfBaKOINP8ATgbxDKLZARFvCYk/TQ9SWQBXKpVZLEjHRPWL5q2UqLXkrOcEih8b4dPdN3CxLUVJsJatQFbehLsfdIpnuYrgWy5sLJJPPNklHMYEbA6eIqHKwWffW5eqKtdA/u4eicjUtJO34faO6uReH7KhDY176DwEkZNUdEN6ST0+1Iof8HrZuIr/Uvo6pqBXHGIwZ2psu1PzURdl2 [...]
+ "priority" : [ "100" ],
+ "algorithm" : [ "RSA-OAEP" ]
+ }
+ }, {
+ "id" : "a4d499fc-aced-40b4-9102-255159578eec",
+ "name" : "hmac-generated-hs512",
+ "providerId" : "hmac-generated",
+ "subComponents" : { },
+ "config" : {
+ "kid" : [ "097e5e0b-731e-4051-8125-e6f2a95d85dd" ],
+ "secret" : [ "C5PmVP-PUiEhOvaR8pO91VirtTrFqejyQGJRJDiauQLTiK7M064pqVxeRhuTuPnlJwmykGD0LVHP1Hfk315rt9zR-cyBL3JaVgZsfeU4jHwcwJixFWtmXN0XjG5Ql-UpdMUoVWucvI_TUMNffWuSI2beLHU3ik2NkMUjAXwQ_eM" ],
+ "priority" : [ "100" ],
+ "algorithm" : [ "HS512" ]
+ }
+ }, {
+ "id" : "f5dc3169-59a8-4790-a9e5-e0bf3c78805c",
+ "name" : "aes-generated",
+ "providerId" : "aes-generated",
+ "subComponents" : { },
+ "config" : {
+ "kid" : [ "a6afd833-da03-4f08-a7f7-c4b8eb2a375f" ],
+ "secret" : [ "aOC5gC8wSuQzdQfwtHqH1w" ],
+ "priority" : [ "100" ]
+ }
+ }, {
+ "id" : "762fc122-3966-4253-8ff2-681aef52798a",
+ "name" : "rsa-generated",
+ "providerId" : "rsa-generated",
+ "subComponents" : { },
+ "config" : {
+ "privateKey" : [ "MIIEpAIBAAKCAQEAsXBlZ1S+NSOWhZ9nGebBTh7TjGPxl0LbcFgKnB8uLnQa7VSAWjmicCB+3bVXIP29l0MtstKJx6tZhGaiIazHGgjtK44hagr0NJwf+B+LwilmzgwcDyrOY4NUMkoFDkoaf4fTN75UKTW+ELKlIkm85mu7X1WySeQg23QvX3tCzPaUoUBP6HnWQwdcc0LeuPRd3rp2LAKPDug2ZWP7VzAWsLbimykd+C8BSJzTYDC0hn2B5t10VHhzOPgpZRbcHPY/xOLKN31oAymLfPH+OxAe7Px0mGZFuH4O6CcQEErsqIFRjsfByMBofjmQJbgOcse9EHLdPZh4vp3GBIdzfwyedQIDAQABAoIBACxBlmkxb8edOrvVSEfjkC9F7QnFG8rYeBcLPoo2FLStbNHpE6JtYaCJ2lq+Eh8+an1B2jIR5R+SE1+8oY+4omhR9aW5a4ghd0 [...]
+ "certificate" : [ "MIICnTCCAYUCBgGVhuGkdTANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdkZWZhdWx0MB4XDTI1MDMxMTIwMjMwOVoXDTM1MDMxMTIwMjQ0OVowEjEQMA4GA1UEAwwHZGVmYXVsdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFwZWdUvjUjloWfZxnmwU4e04xj8ZdC23BYCpwfLi50Gu1UgFo5onAgft21VyD9vZdDLbLSicerWYRmoiGsxxoI7SuOIWoK9DScH/gfi8IpZs4MHA8qzmODVDJKBQ5KGn+H0ze+VCk1vhCypSJJvOZru19VsknkINt0L197Qsz2lKFAT+h51kMHXHNC3rj0Xd66diwCjw7oNmVj+1cwFrC24pspHfgvAUic02AwtIZ9gebddFR4czj4KWUW3Bz2P8Tiyjd9aAMpi3zx/jsQHuz8dJhmR [...]
+ "priority" : [ "100" ]
+ }
+ } ]
+ },
+ "internationalizationEnabled" : false,
+ "supportedLocales" : [ ],
+ "authenticationFlows" : [ {
+ "id" : "ee04c896-46c6-46e5-8f5f-2c3f5f5e982f",
+ "alias" : "Account verification options",
+ "description" : "Method with which to verity the existing account",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "idp-email-verification",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Verify Existing Account by Re-authentication",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "78e019d7-5a2f-44f3-81d0-6fa566f21a32",
+ "alias" : "Browser - Conditional OTP",
+ "description" : "Flow to determine if the OTP is required for the authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-otp-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "3482050b-0ea3-4aee-8200-bcc78dfda38d",
+ "alias" : "Direct Grant - Conditional OTP",
+ "description" : "Flow to determine if the OTP is required for the authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "direct-grant-validate-otp",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "64987dfc-4f74-4abe-a9fa-47028f056258",
+ "alias" : "First broker login - Conditional OTP",
+ "description" : "Flow to determine if the OTP is required for the authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-otp-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "32144fde-d5b5-4a21-bdd5-fb8d92f3c435",
+ "alias" : "Handle Existing Account",
+ "description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "idp-confirm-link",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Account verification options",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "53e1602d-6fb0-4dcb-81a8-e0e549165a2c",
+ "alias" : "Reset - Conditional OTP",
+ "description" : "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "conditional-user-configured",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "reset-otp",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "4819cc94-f5e5-47ca-99ca-35abb57f80e4",
+ "alias" : "User creation or linking",
+ "description" : "Flow for the existing/non-existing user alternatives",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticatorConfig" : "create unique user config",
+ "authenticator" : "idp-create-user-if-unique",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Handle Existing Account",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "5942a1e4-f029-40cd-ae92-830898bf97dc",
+ "alias" : "Verify Existing Account by Re-authentication",
+ "description" : "Reauthentication of existing account",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "idp-username-password-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "First broker login - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "92632d82-47d5-4dd6-8a7e-8bf3e0ecd02f",
+ "alias" : "browser",
+ "description" : "browser based authentication",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "auth-cookie",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "auth-spnego",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorConfig" : "oidc",
+ "authenticator" : "identity-provider-redirector",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 25,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 30,
+ "autheticatorFlow" : true,
+ "flowAlias" : "forms",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "dfedc4d5-a50e-4622-bba6-7e5ee9b2065c",
+ "alias" : "clients",
+ "description" : "Base authentication for clients",
+ "providerId" : "client-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "client-secret",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "client-jwt",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "client-secret-jwt",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 30,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "client-x509",
+ "authenticatorFlow" : false,
+ "requirement" : "ALTERNATIVE",
+ "priority" : 40,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "25ac344e-2d5e-4c5c-8f86-2b8ba2e3dfde",
+ "alias" : "direct grant",
+ "description" : "OpenID Connect Resource Owner Grant",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "direct-grant-validate-username",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "direct-grant-validate-password",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 30,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Direct Grant - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "fc07ca16-4d7d-4132-a6d6-352a566d19da",
+ "alias" : "docker auth",
+ "description" : "Used by Docker clients to authenticate against the IDP",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "docker-http-basic-authenticator",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "eb9f31b1-f136-47bc-93d1-9fc8c62de3c5",
+ "alias" : "first broker login",
+ "description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticatorConfig" : "review profile config",
+ "authenticator" : "idp-review-profile",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "User creation or linking",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "92f6f1d6-7684-4c3a-8623-1a1643cf1b07",
+ "alias" : "forms",
+ "description" : "Username, password, otp and other auth forms.",
+ "providerId" : "basic-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "auth-username-password-form",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 20,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Browser - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "4701b039-0e51-435c-a867-76e602446315",
+ "alias" : "registration",
+ "description" : "registration flow",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "registration-page-form",
+ "authenticatorFlow" : true,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : true,
+ "flowAlias" : "registration form",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "4857befc-6fac-45f1-ae13-02830ab04646",
+ "alias" : "registration form",
+ "description" : "registration form",
+ "providerId" : "form-flow",
+ "topLevel" : false,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "registration-user-creation",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "registration-password-action",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 50,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "registration-recaptcha-action",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 60,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "registration-terms-and-conditions",
+ "authenticatorFlow" : false,
+ "requirement" : "DISABLED",
+ "priority" : 70,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "72627447-0fbe-4017-96ab-b12eacc75a2d",
+ "alias" : "reset credentials",
+ "description" : "Reset credentials for a user if they forgot their password or something",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "reset-credentials-choose-user",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "reset-credential-email",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 20,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticator" : "reset-password",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 30,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ }, {
+ "authenticatorFlow" : true,
+ "requirement" : "CONDITIONAL",
+ "priority" : 40,
+ "autheticatorFlow" : true,
+ "flowAlias" : "Reset - Conditional OTP",
+ "userSetupAllowed" : false
+ } ]
+ }, {
+ "id" : "d8bec40b-7015-40c9-b069-c1bb1b1cf09e",
+ "alias" : "saml ecp",
+ "description" : "SAML ECP Profile Authentication Flow",
+ "providerId" : "basic-flow",
+ "topLevel" : true,
+ "builtIn" : true,
+ "authenticationExecutions" : [ {
+ "authenticator" : "http-basic-authenticator",
+ "authenticatorFlow" : false,
+ "requirement" : "REQUIRED",
+ "priority" : 10,
+ "autheticatorFlow" : false,
+ "userSetupAllowed" : false
+ } ]
+ } ],
+ "authenticatorConfig" : [ {
+ "id" : "6ee3b9e1-c19b-43f5-bc30-4dde2953aa3f",
+ "alias" : "create unique user config",
+ "config" : {
+ "require.password.update.after.registration" : "false"
+ }
+ }, {
+ "id" : "420707ab-984e-4a95-a679-26cddf145323",
+ "alias" : "oidc",
+ "config" : {
+ "default.reference.maxAge" : "10000",
+ "default.reference.value" : "CILogon",
+ "defaultProvider" : "oidc"
+ }
+ }, {
+ "id" : "6bab8c26-0c25-4cf3-a5a7-634cdfcf9f41",
+ "alias" : "review profile config",
+ "config" : {
+ "update.profile.on.first.login" : "missing"
+ }
+ } ],
+ "requiredActions" : [ {
+ "alias" : "CONFIGURE_TOTP",
+ "name" : "Configure OTP",
+ "providerId" : "CONFIGURE_TOTP",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 10,
+ "config" : { }
+ }, {
+ "alias" : "TERMS_AND_CONDITIONS",
+ "name" : "Terms and Conditions",
+ "providerId" : "TERMS_AND_CONDITIONS",
+ "enabled" : false,
+ "defaultAction" : false,
+ "priority" : 20,
+ "config" : { }
+ }, {
+ "alias" : "UPDATE_PASSWORD",
+ "name" : "Update Password",
+ "providerId" : "UPDATE_PASSWORD",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 30,
+ "config" : { }
+ }, {
+ "alias" : "UPDATE_PROFILE",
+ "name" : "Update Profile",
+ "providerId" : "UPDATE_PROFILE",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 40,
+ "config" : { }
+ }, {
+ "alias" : "VERIFY_EMAIL",
+ "name" : "Verify Email",
+ "providerId" : "VERIFY_EMAIL",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 50,
+ "config" : { }
+ }, {
+ "alias" : "delete_account",
+ "name" : "Delete Account",
+ "providerId" : "delete_account",
+ "enabled" : false,
+ "defaultAction" : false,
+ "priority" : 60,
+ "config" : { }
+ }, {
+ "alias" : "webauthn-register",
+ "name" : "Webauthn Register",
+ "providerId" : "webauthn-register",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 70,
+ "config" : { }
+ }, {
+ "alias" : "webauthn-register-passwordless",
+ "name" : "Webauthn Register Passwordless",
+ "providerId" : "webauthn-register-passwordless",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 80,
+ "config" : { }
+ }, {
+ "alias" : "VERIFY_PROFILE",
+ "name" : "Verify Profile",
+ "providerId" : "VERIFY_PROFILE",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 90,
+ "config" : { }
+ }, {
+ "alias" : "update_user_locale",
+ "name" : "Update User Locale",
+ "providerId" : "update_user_locale",
+ "enabled" : true,
+ "defaultAction" : false,
+ "priority" : 1000,
+ "config" : { }
+ } ],
+ "browserFlow" : "browser",
+ "registrationFlow" : "registration",
+ "directGrantFlow" : "direct grant",
+ "resetCredentialsFlow" : "reset credentials",
+ "clientAuthenticationFlow" : "clients",
+ "dockerAuthenticationFlow" : "docker auth",
+ "firstBrokerLoginFlow" : "first broker login",
+ "attributes" : {
+ "cibaBackchannelTokenDeliveryMode" : "poll",
+ "cibaAuthRequestedUserHint" : "login_hint",
+ "clientOfflineSessionMaxLifespan" : "0",
+ "oauth2DevicePollingInterval" : "5",
+ "clientSessionIdleTimeout" : "0",
+ "actionTokenGeneratedByUserLifespan.idp-verify-account-via-email" : "",
+ "actionTokenGeneratedByUserLifespan.verify-email" : "",
+ "clientOfflineSessionIdleTimeout" : "0",
+ "actionTokenGeneratedByUserLifespan.execute-actions" : "",
+ "cibaInterval" : "5",
+ "realmReusableOtpCode" : "false",
+ "cibaExpiresIn" : "120",
+ "oauth2DeviceCodeLifespan" : "600",
+ "parRequestUriLifespan" : "60",
+ "clientSessionMaxLifespan" : "0",
+ "frontendUrl" : "",
+ "acr.loa.map" : "{}",
+ "shortVerificationUri" : "",
+ "actionTokenGeneratedByUserLifespan.reset-credentials" : ""
+ },
+ "keycloakVersion" : "24.0.0",
+ "userManagedAccessAllowed" : false,
+ "clientProfiles" : {
+ "profiles" : [ ]
+ },
+ "clientPolicies" : {
+ "policies" : [ ]
+ }
+}
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/containers/keycloak/standalone.xml b/modules/ide-integration/src/main/containers/keycloak/standalone.xml
deleted file mode 100644
index f3eaea9db2..0000000000
--- a/modules/ide-integration/src/main/containers/keycloak/standalone.xml
+++ /dev/null
@@ -1,521 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:domain:4.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.keycloak.keycloak-server-subsystem"/>
- <extension module="org.wildfly.extension.bean-validation"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.request-controller"/>
- <extension module="org.wildfly.extension.security.manager"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local" skip-group-loading="true"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="UndertowRealm">
- <server-identities>
- <ssl>
- <keystore path="keystores/airavata.jks" relative-to="jboss.server.config.dir" keystore-password="airavata" />
- </ssl>
- </server-identities>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir"
- path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:3.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
- </formatter>
- <log:logger xmlns:log="urn:jboss:domain:logging:3.0" xmlns="" category="org.keycloak">
- <log:level name="${env.KEYCLOAK_LOGLEVEL:INFO}"/>
- </log:logger>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
- <subsystem xmlns="urn:jboss:domain:datasources:4.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS"
- enabled="true"
- use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS"
- enabled="true"
- use-java-context="true">
- <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"
- runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:4.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"
- use-transaction-setup-provider="true"/>
- </context-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default"
- context-service="default"/>
- </managed-thread-factories>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default"
- context-service="default"
- hung-task-threshold="60000"
- keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default"
- context-service="default"
- hung-task-threshold="60000"
- keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default"
- datasource="java:jboss/datasources/ExampleDS"
- managed-executor-service="java:jboss/ee/concurrency/executor/default"
- managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default"
- managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
- <session-bean>
- <stateless>
- <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
- </stateless>
- <stateful default-access-timeout="5000" cache-ref="simple"
- passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <pools>
- <bean-instance-pools>
- <!-- Automatically configure pools. Alternatively, max-pool-size can be set to a specific value -->
- <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools"
- instance-acquisition-timeout="5"
- instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count"
- instance-acquisition-timeout="5"
- instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" passivation-store-ref="infinispan"
- aliases="passivating clustered"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data"
- relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- <log-system-exceptions value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.1">
- <worker name="default"/>
- <buffer-pool name="default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
- <cache-container name="keycloak" jndi-name="infinispan/Keycloak">
- <local-cache name="realms">
- <eviction max-entries="10000" strategy="LRU"/>
- </local-cache>
- <local-cache name="users">
- <eviction max-entries="10000" strategy="LRU"/>
- </local-cache>
- <local-cache name="sessions"/>
- <local-cache name="offlineSessions"/>
- <local-cache name="loginFailures"/>
- <local-cache name="work"/>
- <local-cache name="authorization">
- <eviction max-entries="100" strategy="LRU"/>
- </local-cache>
- <local-cache name="keys">
- <eviction max-entries="1000" strategy="LRU"/>
- <expiration max-idle="3600000"/>
- </local-cache>
- </cache-container>
- <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
- <local-cache name="default">
- <transaction mode="BATCH"/>
- </local-cache>
- </cache-container>
- <cache-container name="web" default-cache="passivation"
- module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation">
- <locking isolation="REPEATABLE_READ"/>
- <transaction mode="BATCH"/>
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent">
- <locking isolation="REPEATABLE_READ"/>
- <transaction mode="BATCH"/>
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation"
- module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation">
- <locking isolation="REPEATABLE_READ"/>
- <transaction mode="BATCH"/>
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent">
- <locking isolation="REPEATABLE_READ"/>
- <transaction mode="BATCH"/>
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps"/>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:4.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:remoting:3.0">
- <endpoint/>
- <http-connector name="http-remoting-connector" connector-ref="default"
- security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
- <deployment-permissions>
- <maximum-set>
- <permission class="java.security.AllPermission"/>
- </maximum-set>
- </deployment-permissions>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jaspitest" cache-type="default">
- <authentication-jaspi>
- <login-module-stack name="dummy">
- <login-module code="Dummy" flag="optional"/>
- </login-module-stack>
- <auth-module code="Dummy"/>
- </authentication-jaspi>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:transactions:3.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment"
- status-socket-binding="txn-status-manager"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:3.0">
- <buffer-cache name="default"/>
- <server name="default-server">
- <http-listener name="default" socket-binding="http" redirect-socket="https"/>
- <https-listener name="https" socket-binding="https" security-realm="UndertowRealm"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default">
- <jsp-config/>
- <websockets/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
- <web-context>auth</web-context>
- <providers>
- <provider>classpath:${jboss.home.dir}/providers/*</provider>
- </providers>
- <master-realm-name>master</master-realm-name>
- <scheduled-task-interval>900</scheduled-task-interval>
- <theme>
- <staticMaxAge>2592000</staticMaxAge>
- <cacheThemes>true</cacheThemes>
- <cacheTemplates>true</cacheTemplates>
- <dir>${jboss.home.dir}/themes</dir>
- </theme>
- <spi name="eventsStore">
- <default-provider>jpa</default-provider>
- <provider name="jpa" enabled="true">
- <properties>
- <property name="exclude-events" value="["REFRESH_TOKEN"]"/>
- </properties>
- </provider>
- </spi>
- <spi name="realm">
- <default-provider>jpa</default-provider>
- </spi>
- <spi name="user">
- <default-provider>jpa</default-provider>
- </spi>
- <spi name="userFederatedStorage">
- <default-provider>jpa</default-provider>
- </spi>
- <spi name="userCache">
- <provider name="default" enabled="true"/>
- </spi>
- <spi name="userSessionPersister">
- <default-provider>jpa</default-provider>
- </spi>
- <spi name="authorizationPersister">
- <default-provider>jpa</default-provider>
- </spi>
- <spi name="timer">
- <default-provider>basic</default-provider>
- </spi>
- <spi name="connectionsHttpClient">
- <provider name="default" enabled="true"/>
- </spi>
- <spi name="connectionsJpa">
- <provider name="default" enabled="true">
- <properties>
- <property name="dataSource" value="java:jboss/datasources/KeycloakDS"/>
- <property name="initializeEmpty" value="true"/>
- <property name="migrationStrategy" value="update"/>
- <property name="migrationExport" value="${jboss.home.dir}/keycloak-database-update.sql"/>
- </properties>
- </provider>
- </spi>
- <spi name="realmCache">
- <provider name="default" enabled="true"/>
- </spi>
- <spi name="connectionsInfinispan">
- <default-provider>default</default-provider>
- <provider name="default" enabled="true">
- <properties>
- <property name="cacheContainer" value="java:comp/env/infinispan/Keycloak"/>
- </properties>
- </provider>
- </spi>
- <spi name="jta-lookup">
- <default-provider>${keycloak.jta.lookup.provider:jboss}</default-provider>
- <provider name="jboss" enabled="true"/>
- </spi>
- <spi name="publicKeyStorage">
- <provider name="infinispan" enabled="true">
- <properties>
- <property name="minTimeBetweenRequests" value="10"/>
- </properties>
- </provider>
- </spi>
- </subsystem>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public"
- port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management"
- port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management"
- port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/config/pga_config.php b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/config/pga_config.php
index 6250d84422..745dd5563f 100755
--- a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/config/pga_config.php
+++ b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/config/pga_config.php
@@ -91,12 +91,12 @@ return array(
/**
* For OIDC servers that support the discovery protocol.
*/
- 'openid-connect-discovery-url' => 'https://airavata.host:8443/auth/realms/default/.well-known/openid-configuration',
+ 'openid-connect-discovery-url' => 'https://airavata.host:8443/realms/default/.well-known/openid-configuration',
/**
* Identity server url
*/
- 'service-url' => 'https://airavata.host:8443/auth',
+ 'service-url' => 'https://airavata.host:8443',
/**
* Enable HTTPS server verification
diff --git a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
index 028c3ccb78..b4546339f5 100755
--- a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
+++ b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
@@ -13,11 +13,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
- <!--<source>1.7</source>-->
- <!--<target>1.7</target>-->
- <release>11</release>
+ <!--<source>17</source>-->
+ <!--<target>17</target>-->
+ <release>17</release>
</configuration>
</plugin>
<plugin>
diff --git a/modules/ide-integration/src/main/resources/airavata-server.properties b/modules/ide-integration/src/main/resources/airavata-server.properties
index db2cdf8211..95fe8ef53b 100644
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ b/modules/ide-integration/src/main/resources/airavata-server.properties
@@ -30,7 +30,7 @@
###########################################################################
registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
+registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
registry.jdbc.user=root
registry.jdbc.password=123456
#FIXME: Probably the following property should be removed.
@@ -59,7 +59,7 @@ cluster.status.monitoring.repeat.time=18000
# Application Catalog DB Configuration
###########################################################################
appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
+appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
appcatalog.jdbc.user=root
appcatalog.jdbc.password=123456
appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -68,7 +68,7 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
# Replica Catalog DB Configuration
###########################################################################
replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
+replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
replicacatalog.jdbc.user=root
replicacatalog.jdbc.password=123456
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -77,7 +77,7 @@ replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
# Workflow Catalog DB Configuration
###########################################################################
workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
+workflowcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/workflow_catalog
workflowcatalog.jdbc.user=root
workflowcatalog.jdbc.password=123456
workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -86,7 +86,7 @@ workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
# Sharing Catalog DB Configuration
###########################################################################
sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
+sharingcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/sharing_catalog
sharingcatalog.jdbc.user=root
sharingcatalog.jdbc.password=123456
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -166,7 +166,7 @@ job.notification.flags=abe
credential.store.keystore.url=keystores/airavata_sym.jks
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
+credential.store.jdbc.url=jdbc:mariadb://airavata.host:13306/credential_store
credential.store.jdbc.user=root
credential.store.jdbc.password=123456
credential.store.jdbc.driver=org.mariadb.jdbc.Driver
@@ -183,7 +183,7 @@ email.password=xxx
email.ssl=true
email.from=airavata@apache.org
-rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
+rabbitmq.broker.url=amqp://guest:guest@airavata.host:5672/develop
rabbitmq.status.exchange.name=status_exchange
rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
@@ -196,7 +196,7 @@ experiment.launch..queue.name=experiment.launch.queue
# Zookeeper Server Configuration
###########################################################################
embedded.zk=false
-zookeeper.server.connection=localhost:12181
+zookeeper.server.connection=airavata.host:12181
zookeeper.timeout=30000
########################################################################
@@ -221,7 +221,7 @@ in.memory.cache.size=1000
# Kafka Logging related configuration
isRunningOnAws=false
-kafka.broker.list=localhost:9092
+kafka.broker.list=airavata.host:9092
kafka.topic.prefix=local
enable.kafka.logging=false
@@ -232,7 +232,7 @@ profile.service.server.host=0.0.0.0
profile.service.server.port=8962
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
# MariaDB properties
-profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
+profile.service.jdbc.url=jdbc:mariadb://airavata.host:13306/profile_service
profile.service.jdbc.user=root
profile.service.jdbc.password=123456
profile.service.jdbc.driver=org.mariadb.jdbc.Driver
@@ -241,7 +241,7 @@ profile.service.validationQuery=SELECT 1
###########################################################################
# Iam Admin services Configuration
###########################################################################
-iam.server.url=https://airavata.host:8443/auth
+iam.server.url=https://airavata.host:8443
iam.server.super.admin.username=admin
iam.server.super.admin.password=admin
diff --git a/modules/ide-integration/src/main/resources/keystores/airavata_sym.jks b/modules/ide-integration/src/main/resources/keystores/airavata_sym.jks
deleted file mode 100644
index 57434f024d..0000000000
Binary files a/modules/ide-integration/src/main/resources/keystores/airavata_sym.jks and /dev/null differ
diff --git a/modules/ide-integration/src/main/resources/keystores/client_truststore.jks b/modules/ide-integration/src/main/resources/keystores/client_truststore.jks
deleted file mode 100644
index a449ce746b..0000000000
Binary files a/modules/ide-integration/src/main/resources/keystores/client_truststore.jks and /dev/null differ
diff --git a/modules/ide-integration/src/main/resources/log4j2.xml b/modules/ide-integration/src/main/resources/log4j2.xml
index e38f7ff011..a06ff13d8a 100644
--- a/modules/ide-integration/src/main/resources/log4j2.xml
+++ b/modules/ide-integration/src/main/resources/log4j2.xml
@@ -26,7 +26,7 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
</Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ <RollingFile name="RollingFileAppender" fileName="logs/airavata.log"
filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
@@ -45,6 +45,8 @@
<logger name="org.apache.zookeeper" level="ERROR"/>
<logger name="org.apache.airavata" level="INFO"/>
<logger name="org.hibernate" level="ERROR"/>
+ <logger name="org.apache.openjpa" level="DEBUG"/>
+ <logger name="org.apache.openjpa.enhance" level="DEBUG"/>
<Root level="INFO">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFileAppender"/>
diff --git a/modules/job-monitor/email-monitor/pom.xml b/modules/job-monitor/email-monitor/pom.xml
index 3a062933e8..ac66537f89 100644
--- a/modules/job-monitor/email-monitor/pom.xml
+++ b/modules/job-monitor/email-monitor/pom.xml
@@ -41,12 +41,9 @@
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>2.1.2</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
index 63f9e47ee5..9c35025f26 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
@@ -33,15 +33,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
-import javax.mail.Address;
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.search.FlagTerm;
-import javax.mail.search.SearchTerm;
+import jakarta.mail.Address;
+import jakarta.mail.Flags;
+import jakarta.mail.Folder;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Store;
+import jakarta.mail.search.FlagTerm;
+import jakarta.mail.search.SearchTerm;
import java.io.InputStream;
import java.util.*;
@@ -193,6 +193,9 @@ public class EmailBasedMonitor extends AbstractMonitor implements Runnable {
emailFolder = store.getFolder(folderName);
}
log.info("[EJM]: Retrieving unseen emails");
+ if (emailFolder == null) {
+ return;
+ }
emailFolder.open(Folder.READ_WRITE);
if (emailFolder.isOpen()) {
// flush if any message left in flushUnseenMessage
@@ -228,7 +231,9 @@ public class EmailBasedMonitor extends AbstractMonitor implements Runnable {
log.error("[EJM]: Caught a throwable ", e);
} finally {
try {
- emailFolder.close(false);
+ if (emailFolder != null) {
+ emailFolder.close(false);
+ }
store.close();
} catch (MessagingException e) {
log.error("[EJM]: Store close operation failed, couldn't close store", e);
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
index ae0cecb900..20c561207e 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
@@ -26,8 +26,8 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
index d76f733c19..2996dd50cd 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
@@ -23,8 +23,8 @@ import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.monitor.JobStatusResult;
import org.apache.airavata.registry.api.RegistryService;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
public interface EmailParser {
static final String STATUS = "status";
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
index e91b0153ec..5e9d5d15ee 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
@@ -27,8 +27,8 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
index 99660c2ae8..be61fad37e 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
@@ -26,8 +26,8 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
index b0c22988e7..2da293d827 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
@@ -26,8 +26,8 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
index eaae04071d..0e8b4b3386 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
@@ -26,8 +26,8 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
index ebaf84d90e..728182d128 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
@@ -26,8 +26,8 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index dc8657564d..8a62fcc7b2 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -44,14 +44,9 @@
<version>1.15</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.6.2</version>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index a5b7c2cf58..0634e28f6f 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -37,7 +37,7 @@
<derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
- <mysql.connector.version>5.1.34</mysql.connector.version>
+ <mysql.connector.version>8.0.31</mysql.connector.version>
</properties>
<dependencies>
@@ -128,9 +128,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
- <release>11</release>
+ <release>17</release>
<!--<compilerArgs>-->
<!--<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>-->
<!--</compilerArgs>-->
@@ -222,7 +222,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.version}</version>
+ <version>${openjpa.maven.plugin.version}</version>
<configuration>
<includes>**/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
index 738e61f596..dbac506777 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
index 82fd1e14c5..f26faf7471 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
index 7119262b15..480db8264d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
@@ -21,7 +21,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.model.workflow.WorkflowState;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
index 9a8d35ef6b..9f94516baa 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
index 95c33b87bc..35907c2a4d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
@@ -21,7 +21,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.model.workflow.ApplicationState;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
index f5a94757ca..4b9318554e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
index 45866cd897..f4c12f2251 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.model.application.io.DataType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
index 3c72020719..1d97d78f4c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.model.application.io.DataType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
index c94dd45a91..476e695d8a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
index c8329e3dc6..27c243795e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
@@ -21,7 +21,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.registry.core.entities.expcatalog.ProcessEntity;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
index f6baf150da..8f342c30b7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
@@ -21,7 +21,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.model.workflow.ComponentType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
index 5b260cad41..703a93c509 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
index d0f53447d8..a1eab80949 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
@@ -21,7 +21,7 @@ package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import org.apache.airavata.model.workflow.HandlerType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
index cbeec0b25b..6678c8adcd 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
index c805b48eae..bb6f8cd48a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
index 21e3af63f5..8836c589d9 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.parallelism.ApplicationParallelismType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
index 878ffb4e37..469b6cb559 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -24,7 +24,7 @@ import org.apache.airavata.model.application.io.DataType;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
index 06ee3568e8..e7cb80b60e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
index f18dc63dfe..2b8ee2f73d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
index a408655e4d..23f7c0db7b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
@@ -24,7 +24,7 @@ import org.apache.airavata.model.application.io.DataType;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
index 390647b5cf..6cace49203 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
index f0631d7fef..4fb190f0f1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
@@ -23,12 +23,12 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
index 908859edb1..0bfa6b7f21 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.appcatalog.computeresource.ProviderName;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
index 313a5db5d2..cdb83f33c2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
index 4a65992a83..988dc9228a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.appcatalog.computeresource.FileSystems;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
index e78ffd1479..6da5d37fe0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
@@ -23,15 +23,15 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
index 40dc3d0248..484ea3be27 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
index 3948098638..4ad124c3e1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
@@ -23,17 +23,17 @@ import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
index efae53f36d..328c29ccaa 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
index ec7f9f79ea..787a36ce0a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
@@ -20,10 +20,10 @@
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
index 0fab6d68b0..7bde137074 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
index 14102b1e68..93d45ce67b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
index ab71edab10..80105a01d1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
index 5845e8664d..afefee06ee 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
index cce0eff1c3..41e77d4fdd 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
index 97383e8cd5..f910d86ae7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
@@ -24,19 +24,19 @@ import org.apache.airavata.model.data.movement.DataMovementProtocol;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java
index 4396818b1a..8e5487d10b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java
@@ -19,13 +19,13 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
index c913d1dd9f..e1f6d6488d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
@@ -22,15 +22,15 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
index c7eb2296e8..3d60ca0b2e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
index f4b2298a33..833c055fa1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
index 02a5bfa318..10ba332f15 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
index 471f042470..65ecbc8275 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
index a39e791b96..40c86e60a6 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
index 2f1e28e7b0..0f1ee7e32c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
index 35bd448edb..cac0909c33 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
index f0520690cd..7c6b01b70b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java
index b868696184..26ec1b8965 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
index 673e245e11..a94a305405 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
index 03edc658c6..6be32a65e7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
index cba221c4e5..1fdcff5c2b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.parallelism.ApplicationParallelismType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
index 42a90dd622..4668b84657 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
index b37c4ed497..ac559e06e5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java
index 39bd028cdc..b75a19280c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
index 76f563c67c..8c78259d50 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
index 3216ae65bb..6142db0758 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java
index 5ad32b98cc..8f1c23f679 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
index ff9fdc6965..8bacbb089e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
index aaddf8b6b1..babd441cd3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
index 739ddaecd3..644c56da15 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
index 69f1f7be9c..bbcea3b995 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java
index 8fcde474b0..7f6ce23c60 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java
@@ -20,7 +20,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* The persistent class for the ssh_account_provisioner_config database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
index ba4919f80f..f5f2ee7f33 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
index db7beeb6bb..6839fd1034 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
index f39982dbb0..985aaedce2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
index 8031b8fd03..1bbab9d984 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
index c097fa3324..2c790d8082 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
index 1533f652f2..602914277c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
@@ -22,12 +22,12 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
index 61754e455e..33a95c8f9d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java
index 3250b69393..68eaf8c838 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.sql.Timestamp;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java
index 2756219271..c55f964197 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java
@@ -21,7 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.sql.Timestamp;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserStoragePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserStoragePreferenceEntity.java
index 8d73eafa24..78fa9863b5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserStoragePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserStoragePreferenceEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* The persistent class for the user_storage_preference database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
index 4321397b69..69bed11152 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
@@ -1,6 +1,6 @@
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index b38fa3aa05..ccdd8066a1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.experiment.ExperimentType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
index f2167c0db3..b383b2a993 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index db10e7db0b..7e66abf593 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.application.io.DataType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
index 6e11e7b68f..051f32b229 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.application.io.DataType;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
index 5ef5a0a069..01a2fb8e4f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.status.ExperimentState;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
index 3a19dcbca6..ecdd53e213 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
index 70e9cd6358..a6059ff42c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.workspace.GatewayApprovalStatus;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
index 1beeb3453c..51ab550969 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
index 332b7b76af..8b5d58d111 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
index a8e297be5a..d22b355cae 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
index a91a0195e4..82d301b252 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.status.JobState;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
index e89bb5ad6b..6c4d329623 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
@@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import org.apache.airavata.model.workspace.NotificationPriority;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index 94a2175e94..d7428c6fa2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -21,7 +21,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Collection;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
index cdd946f195..7fc3655019 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.*;
... 1161 lines suppressed ...
(airavata) 09/09: gather all dependency versions to /pom.xml. fix bugs.
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 89de03740ebdc5f15c4011070d0fab430a0e9e2c
Author: yasithdev <ya...@icloud.com>
AuthorDate: Tue Apr 29 13:10:17 2025 -0500
gather all dependency versions to /pom.xml. fix bugs.
---
airavata-api/airavata-api-server/pom.xml | 55 +-
airavata-api/airavata-api-stubs/pom.xml | 4 +-
airavata-api/airavata-base-api/pom.xml | 9 +-
.../airavata-client-sdks/airavata-cpp-sdk/pom.xml | 4 +-
.../airavata-client-sdks/airavata-php-sdk/pom.xml | 2 -
.../java-client-samples/pom.xml | 1 -
airavata-api/airavata-data-models/pom.xml | 30 +-
airavata-api/airavata-model-utils/pom.xml | 11 +-
.../profile-service-commons/pom.xml | 4 -
.../profile-service/profile-user-core/pom.xml | 2 -
airavata-services/services-security/pom.xml | 61 +-
modules/agent-framework/agent-service/pom.xml | 25 -
modules/airavata-helix/agent-api/pom.xml | 1 -
.../airavata-helix/agent-impl/ssh-agent/pom.xml | 2 -
.../airavata-helix/agent-impl/sshj-agent/pom.xml | 1 -
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 1 +
modules/airavata-helix/helix-spectator/pom.xml | 87 +-
modules/airavata-helix/task-api/pom.xml | 4 -
.../metadata-analyzer/pom.xml | 1 -
.../metascheduler-core/pom.xml | 1 -
.../process-scheduler/pom.xml | 1 -
modules/cluster-monitoring/pom.xml | 12 +-
modules/commons/pom.xml | 115 ++-
.../common/utils/DBConnectionProvider.java | 72 --
modules/compute-account-provisioning/pom.xml | 3 -
.../computer-resource-monitoring-service/pom.xml | 1 -
.../credential-store-service/pom.xml | 61 +-
modules/distribution/agent-service-dist/pom.xml | 3 -
modules/distribution/api-server-dist/pom.xml | 3 -
modules/distribution/controller-dist/pom.xml | 3 -
modules/distribution/email-monitor-dist/pom.xml | 3 -
modules/distribution/file-server-dist/pom.xml | 2 -
modules/distribution/parser-wm-dist/pom.xml | 2 -
modules/distribution/participant-dist/pom.xml | 3 -
modules/distribution/pom.xml | 26 -
modules/distribution/post-wm-dist/pom.xml | 3 -
modules/distribution/pre-wm-dist/pom.xml | 3 -
modules/distribution/realtime-monitor-dist/pom.xml | 2 -
modules/distribution/research-service-dist/pom.xml | 2 -
modules/file-server/pom.xml | 3 -
modules/ide-integration/pom.xml | 1 -
.../app/tests/selenium/pom.xml | 21 -
modules/job-monitor/email-monitor/pom.xml | 2 -
modules/job-monitor/job-monitor-api/pom.xml | 10 +-
modules/job-monitor/pom.xml | 23 -
modules/messaging/client/pom.xml | 18 +-
modules/messaging/core/pom.xml | 21 +-
modules/platform-monitoring/pom.xml | 8 -
modules/registry/registry-core/pom.xml | 32 +-
.../research-framework/research-service/pom.xml | 38 +-
modules/security/pom.xml | 15 +-
modules/server/pom.xml | 11 +-
.../sharing-registry/sharing-data-migrator/pom.xml | 3 -
.../sharing-registry-server/pom.xml | 3 -
.../sharing-registry-stubs/pom.xml | 1 -
pom.xml | 1061 ++++++++++++--------
tools/load-client/pom.xml | 17 +-
57 files changed, 902 insertions(+), 1012 deletions(-)
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index 661c72faa4..47703066cf 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -37,7 +37,18 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-stubs</artifactId>
@@ -45,27 +56,27 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
+ <artifactId>airavata-credential-store-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store-stubs</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
+ <artifactId>airavata-model-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -75,53 +86,41 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>airavata-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-security</artifactId>
+ <artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>compute-account-provisioning</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>services-security</artifactId>
+ <artifactId>profile-service-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>compute-account-provisioning</artifactId>
+ <artifactId>registry-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>services-security</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-stubs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
diff --git a/airavata-api/airavata-api-stubs/pom.xml b/airavata-api/airavata-api-stubs/pom.xml
index 87f9adc7db..54b0f6481c 100644
--- a/airavata-api/airavata-api-stubs/pom.xml
+++ b/airavata-api/airavata-api-stubs/pom.xml
@@ -44,12 +44,12 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-credential-store-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store-stubs</artifactId>
+ <artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/airavata-api/airavata-base-api/pom.xml b/airavata-api/airavata-base-api/pom.xml
index 62ca3828b6..edc16f7d7d 100644
--- a/airavata-api/airavata-base-api/pom.xml
+++ b/airavata-api/airavata-base-api/pom.xml
@@ -14,10 +14,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
@@ -25,7 +21,10 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
index 77dd5b2954..438ea30cd4 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
@@ -36,10 +36,9 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
index fef35b610e..33e40d72af 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack</id>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index 4bb34ace55..79df863ad5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>${json-simple.version}</version>
</dependency>
</dependencies>
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index 98c5cb95d4..cbb2816c6a 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -37,10 +37,6 @@
<url>http://airavata.apache.org/</url>
<dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
@@ -48,8 +44,32 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/airavata-api/airavata-model-utils/pom.xml b/airavata-api/airavata-model-utils/pom.xml
index dbd53b65df..150cfc8470 100644
--- a/airavata-api/airavata-model-utils/pom.xml
+++ b/airavata-api/airavata-model-utils/pom.xml
@@ -37,17 +37,16 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-data-models</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 2b57061cbe..28c98e82b8 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
- <version>${dozer.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -61,7 +60,6 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
- <version>${mysql.connector.version}</version>
</dependency>
</dependencies>
@@ -70,7 +68,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -78,7 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<inherited>true</inherited>
<configuration>
<failIfNoTests>false</failIfNoTests>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index 42c7f51353..01147056fa 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -59,7 +58,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<inherited>true</inherited>
<configuration>
<failIfNoTests>false</failIfNoTests>
diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml
index 5c2b032fe7..8920a51049 100644
--- a/airavata-services/services-security/pom.xml
+++ b/airavata-services/services-security/pom.xml
@@ -36,6 +36,18 @@
<url>http://airavata.apache.org/</url>
<dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
@@ -53,36 +65,22 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
+ <artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>platform-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>${spring.security.oauth2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.oauth2.version}</version>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api-stubs</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -96,14 +94,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
@@ -114,9 +104,16 @@
<artifactId>json</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>platform-monitoring</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index 8a4ae0dff2..361308d59a 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -38,18 +38,6 @@
<agent.service.dist.name>Agent-Service-0.01</agent.service.dist.name>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
@@ -94,17 +82,14 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>${grpc-server-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
@@ -118,19 +103,10 @@
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
-
<plugins>
<plugin>
<groupId>io.github.ascopes</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-maven-plugin.version}</version>
<configuration>
<protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
@@ -148,7 +124,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory>
diff --git a/modules/airavata-helix/agent-api/pom.xml b/modules/airavata-helix/agent-api/pom.xml
index 48e5c1b0b5..86fc8dadaf 100644
--- a/modules/airavata-helix/agent-api/pom.xml
+++ b/modules/airavata-helix/agent-api/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.slf4j.impl}</version>
</dependency>
</dependencies>
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
index d7aebd024e..a818e24b6c 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
@@ -14,7 +14,6 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -33,7 +32,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<!-- get all project dependencies -->
<descriptorRefs>
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
index aa517ba0a0..8b4214f214 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/sshj-agent/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
- <version>${sshj.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
index 74c08c205b..7de0bcd243 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
+++ b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
@@ -24,6 +24,7 @@ import net.schmizz.sshj.DefaultConfig;
import net.schmizz.sshj.connection.ConnectionException;
import net.schmizz.sshj.connection.channel.direct.Session;
import net.schmizz.sshj.sftp.FileAttributes;
+import net.schmizz.sshj.sftp.FileMode.Type;
import net.schmizz.sshj.sftp.RemoteResourceInfo;
import net.schmizz.sshj.transport.verification.HostKeyVerifier;
import net.schmizz.sshj.userauth.keyprovider.KeyProvider;
diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml
index 028f96e020..0a94bed267 100644
--- a/modules/airavata-helix/helix-spectator/pom.xml
+++ b/modules/airavata-helix/helix-spectator/pom.xml
@@ -33,19 +33,34 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>task-core</artifactId>
- <version>${project.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java</artifactId>
<exclusions>
<exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-service</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -53,11 +68,21 @@
<artifactId>airavata-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>job-monitor-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>profile-service-stubs</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>services-security</artifactId>
@@ -65,8 +90,14 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>task-core</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -76,55 +107,23 @@
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>job-monitor-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.github.docker-java</groupId>
- <artifactId>docker-java</artifactId>
- <version>${docker-java.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>2.21.1</version>
- </dependency>
</dependencies>
</project>
diff --git a/modules/airavata-helix/task-api/pom.xml b/modules/airavata-helix/task-api/pom.xml
index 53945d2ae1..63e09e7ae2 100644
--- a/modules/airavata-helix/task-api/pom.xml
+++ b/modules/airavata-helix/task-api/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.apache.helix</groupId>
<artifactId>helix-core</artifactId>
- <version>${helix.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -73,17 +72,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
index da1db41afc..326806644a 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml
+++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml
index 8b9a2829f9..4a26f228ab 100644
--- a/modules/airavata-metascheduler/metascheduler-core/pom.xml
+++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml
index e4cb478e20..a35f2f7afc 100644
--- a/modules/airavata-metascheduler/process-scheduler/pom.xml
+++ b/modules/airavata-metascheduler/process-scheduler/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml
index 4a3528a851..f853ad308f 100644
--- a/modules/cluster-monitoring/pom.xml
+++ b/modules/cluster-monitoring/pom.xml
@@ -55,17 +55,18 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -76,11 +77,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${google.gson.version}</version>
- </dependency>
</dependencies>
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 18727cf1ef..b04f7754d2 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -37,115 +37,114 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>com.github.dozermapper</groupId>
- <artifactId>dozer-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-base-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-model-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.common</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
- <!-- Testing -->
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-base-api</artifactId>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<properties>
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
index 62fbc713b7..de1c23ec78 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
@@ -5,10 +5,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.UnknownKeyFor;
import org.hibernate.HibernateException;
-import org.hibernate.dialect.DatabaseVersion;
-import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.Stoppable;
@@ -17,7 +14,6 @@ import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.SQLException;
-import java.text.MessageFormat;
import java.time.Duration;
import java.util.Map;
@@ -114,72 +110,4 @@ public class DBConnectionProvider implements ConnectionProvider, Configurable, S
}
throw new UnknownUnwrapTypeException(unwrapType);
}
-
- /**
- * Provides connection info for Hibernate to display or use internally.
- * If you wish, you can parse the DB name from the URL or set it to null.
- */
- @Override
- public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
- return new DatabaseConnectionInfo() {
- @Override
- public String getJdbcUrl() {
- return dataSource.getUrl();
- }
-
- @Override
- public String getJdbcDriver() {
- return dataSource.getDriverClassName();
- }
-
- @Override
- public DatabaseVersion getDialectVersion() {
- return DatabaseVersion.make(8, 0);
- }
-
- @Override
- public String getAutoCommitMode() {
- boolean autoCommit = dataSource.getDefaultAutoCommit();
- return Boolean.toString(autoCommit);
- }
-
- @Override
- public String getIsolationLevel() {
- int isolation = dataSource.getDefaultTransactionIsolation();
- return switch (isolation) {
- case Connection.TRANSACTION_NONE -> "TRANSACTION_NONE";
- case Connection.TRANSACTION_READ_UNCOMMITTED -> "TRANSACTION_READ_UNCOMMITTED";
- case Connection.TRANSACTION_READ_COMMITTED -> "TRANSACTION_READ_COMMITTED";
- case Connection.TRANSACTION_REPEATABLE_READ -> "TRANSACTION_REPEATABLE_READ";
- case Connection.TRANSACTION_SERIALIZABLE -> "TRANSACTION_SERIALIZABLE";
- default -> "UNKNOWN_ISOLATION_LEVEL";
- };
- }
-
- @Override
- public Integer getPoolMinSize() {
- return dataSource.getConnectionPool().getMinIdle();
- }
-
- @Override
- public Integer getPoolMaxSize() {
- return dataSource.getConnectionPool().getMaxTotal();
- }
-
- @Override
- public String toInfoString() {
- return MessageFormat.format(dataSourceAsString,
- dataSource.getDriverClassName(),
- dataSource.getUrl(),
- dataSource.getUserName(),
- dataSource.getValidationQuery(),
- dataSource.getInitialSize(),
- dataSource.getMaxTotal(),
- dataSource.getMaxIdle(),
- dataSource.getMinIdle(),
- dataSource.getMaxWaitDuration()
- );
- }
- };
- }
}
\ No newline at end of file
diff --git a/modules/compute-account-provisioning/pom.xml b/modules/compute-account-provisioning/pom.xml
index 9332c06e70..faced80777 100644
--- a/modules/compute-account-provisioning/pom.xml
+++ b/modules/compute-account-provisioning/pom.xml
@@ -45,13 +45,11 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
</dependency>
<!-- apache directory ldap api! -->
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
- <version>${directory.api.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -61,7 +59,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${google.gson.version}</version>
</dependency>
</dependencies>
diff --git a/modules/computer-resource-monitoring-service/pom.xml b/modules/computer-resource-monitoring-service/pom.xml
index 78b58e66e9..648043ab93 100644
--- a/modules/computer-resource-monitoring-service/pom.xml
+++ b/modules/computer-resource-monitoring-service/pom.xml
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index ff61805c7a..be834479e0 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -35,25 +35,37 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store-stubs</artifactId>
- <version>${project.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>${spring.security.oauth2.version}</version>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.oauth2.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-credential-store-stubs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
@@ -70,40 +82,21 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>2.0.9</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
</dependency>
</dependencies>
diff --git a/modules/distribution/agent-service-dist/pom.xml b/modules/distribution/agent-service-dist/pom.xml
index adece4adf0..7759cf08a7 100644
--- a/modules/distribution/agent-service-dist/pom.xml
+++ b/modules/distribution/agent-service-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${agent.service.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-agent-service-configuration</id>
@@ -96,7 +94,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/api-server-dist/pom.xml b/modules/distribution/api-server-dist/pom.xml
index eac90d1b90..ba44f9986b 100644
--- a/modules/distribution/api-server-dist/pom.xml
+++ b/modules/distribution/api-server-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${api.server.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-api-server-configuration</id>
@@ -96,7 +94,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/controller-dist/pom.xml b/modules/distribution/controller-dist/pom.xml
index f3bc5bfd9d..7a9c21edad 100644
--- a/modules/distribution/controller-dist/pom.xml
+++ b/modules/distribution/controller-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${controller.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-controller-assembly</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/email-monitor-dist/pom.xml b/modules/distribution/email-monitor-dist/pom.xml
index e88bca8c68..f440301748 100644
--- a/modules/distribution/email-monitor-dist/pom.xml
+++ b/modules/distribution/email-monitor-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${email.monitor.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-email-monitor-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/file-server-dist/pom.xml b/modules/distribution/file-server-dist/pom.xml
index 876ae0855a..62111da02e 100644
--- a/modules/distribution/file-server-dist/pom.xml
+++ b/modules/distribution/file-server-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${file.server.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-file-server-resources</id>
diff --git a/modules/distribution/parser-wm-dist/pom.xml b/modules/distribution/parser-wm-dist/pom.xml
index 82d8df1931..7c14072366 100644
--- a/modules/distribution/parser-wm-dist/pom.xml
+++ b/modules/distribution/parser-wm-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${parser.wm.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-parser-wm-resources</id>
diff --git a/modules/distribution/participant-dist/pom.xml b/modules/distribution/participant-dist/pom.xml
index 3b7f90c849..b72f05c3c1 100644
--- a/modules/distribution/participant-dist/pom.xml
+++ b/modules/distribution/participant-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${participant.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-participant-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 0bf69076c4..e2cb2beaed 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -61,30 +61,4 @@
<agent.service.dist.name>apache-airavata-agent-service-${project.version}</agent.service.dist.name>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <descriptors>
- <descriptor>src/main/assembly/distribution-assembly.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/modules/distribution/post-wm-dist/pom.xml b/modules/distribution/post-wm-dist/pom.xml
index 4d2360df01..4acb404bfc 100644
--- a/modules/distribution/post-wm-dist/pom.xml
+++ b/modules/distribution/post-wm-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${post.wm.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-post-wm-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/pre-wm-dist/pom.xml b/modules/distribution/pre-wm-dist/pom.xml
index df598f3874..e21b8aa418 100644
--- a/modules/distribution/pre-wm-dist/pom.xml
+++ b/modules/distribution/pre-wm-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${pre.wm.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-pre-wm-resources</id>
@@ -80,7 +78,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
<configuration>
<verbose>true</verbose>
<images>
diff --git a/modules/distribution/realtime-monitor-dist/pom.xml b/modules/distribution/realtime-monitor-dist/pom.xml
index b55b6c3753..7d32a80127 100644
--- a/modules/distribution/realtime-monitor-dist/pom.xml
+++ b/modules/distribution/realtime-monitor-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${realtime.monitor.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-realtime-monitor-resources</id>
diff --git a/modules/distribution/research-service-dist/pom.xml b/modules/distribution/research-service-dist/pom.xml
index efcd64f6fc..7b39a1230f 100644
--- a/modules/distribution/research-service-dist/pom.xml
+++ b/modules/distribution/research-service-dist/pom.xml
@@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<finalName>${research.service.dist.name}</finalName>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
<executions>
<execution>
<id>copy-research-service-resources</id>
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index 261f1369b8..d319c10a27 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -14,7 +14,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -49,12 +48,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index 9a8eac19dc..a42f4caa87 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
index 8c1f827a3d..8fe6893276 100755
--- a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
+++ b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
@@ -13,7 +13,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -21,7 +20,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
<configuration>
<includes>
<include>**/RunAllTests.java</include>
@@ -56,18 +54,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <version>${selenium-maven-plugin.version}</version>
- <!--executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>false</background>
- </configuration>
- </execution>
- </executions -->
</plugin>
</plugins>
</build>
@@ -75,13 +61,11 @@
<dependency>
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>${selenium-java-client-driver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
- <version>${selenium-firefox-driver.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -90,23 +74,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>${commons-exec.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
- <version>${selenium-remote-driver.version}</version>
</dependency>
-
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>${selenium-java.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/modules/job-monitor/email-monitor/pom.xml b/modules/job-monitor/email-monitor/pom.xml
index 21837db680..2abfb58818 100644
--- a/modules/job-monitor/email-monitor/pom.xml
+++ b/modules/job-monitor/email-monitor/pom.xml
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>${jakarta.mail.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/job-monitor-api/pom.xml b/modules/job-monitor/job-monitor-api/pom.xml
index 18c29e1fd1..255df34cd7 100644
--- a/modules/job-monitor/job-monitor-api/pom.xml
+++ b/modules/job-monitor/job-monitor-api/pom.xml
@@ -34,14 +34,16 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>task-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index bdea010d88..8f44bd064a 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -35,27 +35,4 @@
<module>email-monitor</module>
<module>real-time-monitor</module>
</modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>jakarta.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>task-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml
index 5cdf1fa61a..9abdb40cfb 100644
--- a/modules/messaging/client/pom.xml
+++ b/modules/messaging/client/pom.xml
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -50,28 +50,28 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-data-models</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<configuration>
<archive>
<manifest>
diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml
index 426029e504..99d570715c 100644
--- a/modules/messaging/core/pom.xml
+++ b/modules/messaging/core/pom.xml
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -46,13 +46,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.slf4j.impl}</version>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-commons</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -63,8 +58,12 @@
<artifactId>airavata-server-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
diff --git a/modules/platform-monitoring/pom.xml b/modules/platform-monitoring/pom.xml
index d9629f4e3e..e53b4166a2 100644
--- a/modules/platform-monitoring/pom.xml
+++ b/modules/platform-monitoring/pom.xml
@@ -33,29 +33,21 @@
<dependencies>
- <!-- The client -->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
- <version>${prometheus.version}</version>
</dependency>
- <!-- Hotspot JVM metrics-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
- <version>${prometheus.version}</version>
</dependency>
- <!-- Exposition HTTPServer-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
- <version>${prometheus.version}</version>
</dependency>
- <!-- Pushgateway exposition-->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_pushgateway</artifactId>
- <version>${prometheus.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index 7ae26269c6..b1cccc0caa 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -34,22 +34,10 @@
<artifactId>airavata-registry-core</artifactId>
<dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
@@ -65,18 +53,29 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
+ <artifactId>airavata-data-models</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-cpi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
</dependency>
- <!-- For MariaDB based schema migrations -->
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
@@ -89,7 +88,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -97,7 +95,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<configuration>
<executable>java</executable>
<classpathScope>runtime</classpathScope>
@@ -187,7 +184,6 @@
<plugin>
<groupId>com.dkanejs.maven.plugins</groupId>
<artifactId>docker-compose-maven-plugin</artifactId>
- <version>${docker-compose-maven-plugin.version}</version>
<executions>
<execution>
<id>mysql-up</id>
diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml
index b37d3a1dcf..336bc9dbd9 100644
--- a/modules/research-framework/research-service/pom.xml
+++ b/modules/research-framework/research-service/pom.xml
@@ -29,32 +29,6 @@
<artifactId>research-service</artifactId>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-bom</artifactId>
- <version>${grpc.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-bom</artifactId>
- <version>${protobuf-java.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
@@ -141,22 +115,14 @@
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- </extension>
- </extensions>
-
<plugins>
<plugin>
<groupId>io.github.ascopes</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-maven-plugin.version}</version>
<configuration>
<protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
- <sourceDirectory>src/main/proto</sourceDirectory>
+ <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory>
</sourceDirectories>
<outputDirectory>${project.build.directory}/generated-sources/protobuf/java</outputDirectory>
</configuration>
@@ -171,7 +137,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -179,7 +144,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.maven.plugin.version}</version>
</plugin>
</plugins>
</build>
diff --git a/modules/security/pom.xml b/modules/security/pom.xml
index 8dd805adb2..05c9c83496 100644
--- a/modules/security/pom.xml
+++ b/modules/security/pom.xml
@@ -34,24 +34,23 @@
<description>Module for managing security features in Airavata</description>
<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro-core.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 6ae4fcccd9..dbc27f0c25 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -37,7 +37,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -52,20 +51,20 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <artifactId>airavata-api-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
+ <artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api-server</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
<version>${project.version}</version>
diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml
index bcbfe0caf2..4917771923 100644
--- a/modules/sharing-registry/sharing-data-migrator/pom.xml
+++ b/modules/sharing-registry/sharing-data-migrator/pom.xml
@@ -38,7 +38,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -46,7 +45,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -104,7 +102,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb-java-client.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 10e1e3a51b..6a33a6c98f 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -66,7 +66,6 @@
<dependency>
<groupId>org.databene</groupId>
<artifactId>contiperf</artifactId>
- <version>${contiperf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -93,7 +91,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
</plugin>
</plugins>
<resources>
diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml
index 75a9cd4cdc..7902dd627b 100644
--- a/modules/sharing-registry/sharing-registry-stubs/pom.xml
+++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
diff --git a/pom.xml b/pom.xml
index c29886fb64..4a6e4fa38a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,139 +103,138 @@
</modules>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <project.version>0.21-SNAPSHOT</project.version>
- <spring.boot.maven.plugin.version>3.2.4</spring.boot.maven.plugin.version>
- <org.slf4j.version>2.0.16</org.slf4j.version>
- <log4j2.version>2.24.3</log4j2.version>
- <log4j2.slf4j.impl>2.24.3</log4j2.slf4j.impl>
- <surefire.version>3.0.0-M4</surefire.version>
- <junit.version>4.13.2</junit.version>
- <curator.version>5.6.0</curator.version>
- <groovy.version>4.0.26</groovy.version>
- <xpp3.version>1.1.6</xpp3.version>
- <xpp5.version>1.2.8</xpp5.version>
- <xsul.version>2.10.7</xsul.version>
- <xsul5.version>1.2.7</xsul5.version>
- <atomixmiser.version>0.9.4</atomixmiser.version>
- <fasterxml.jackson.version>2.18.1</fasterxml.jackson.version>
- <jakarta.activation.api.version>2.1.2</jakarta.activation.api.version>
- <jersey.version>1.13</jersey.version>
- <cargo.version>1.3.1</cargo.version>
- <oa4mp.version>4.3</oa4mp.version>
- <antrun.version>1.8</antrun.version>
- <bouncy.castle.version>1.77</bouncy.castle.version>
- <ebay.cors.filter>1.0.0</ebay.cors.filter>
- <thrift.version>0.21.0</thrift.version>
- <mysql.connector.version>8.2.0</mysql.connector.version>
- <skipTests>false</skipTests>
- <google.gson.version>2.10.1</google.gson.version>
- <zk.version>3.9.3</zk.version>
- <amqp-client.version>5.25.0</amqp-client.version>
- <snakeyaml.version>2.2</snakeyaml.version>
- <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
- <maven.javadoc.skip>false</maven.javadoc.skip>
- <maven.deploy.skip>false</maven.deploy.skip>
- <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
- <maven.assembly.plugin>3.3.0</maven.assembly.plugin>
- <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
- <kafka-clients.version>3.7.1</kafka-clients.version>
- <json.version>20231013</json.version>
- <google.guava.version>33.0.0-jre</google.guava.version>
- <jacoco.version>0.8.1</jacoco.version>
- <dozer.version>6.5.2</dozer.version>
- <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
- <javax.annotation.version>1.3.2</javax.annotation.version>
- <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
- <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
- <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
+ <amqp-client.version>5.20.0</amqp-client.version>
<angus-activation.version>2.0.1</angus-activation.version>
- <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
- <jmockit.version>1.49</jmockit.version>
- <helix.version>1.4.3</helix.version>
- <keycloak.client.version>26.0.5</keycloak.client.version>
- <spring.boot.version>3.2.4</spring.boot.version>
- <spring.security.oauth2.version>6.3.5</spring.security.oauth2.version>
+ <antrun.version>3.1.0</antrun.version>
<aopalliance.version>1.0</aopalliance.version>
- <jsch.version>0.1.55</jsch.version>
- <sshj.version>0.39.0</sshj.version>
- <quartz.version>2.4.0</quartz.version>
- <directory.api.version>1.0.0</directory.api.version>
- <mariadb-java-client.version>3.5.2</mariadb-java-client.version>
- <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
- <grpc-server-spring-boot-starter.version>2.15.0.RELEASE</grpc-server-spring-boot-starter.version>
- <commons-beanutils.version>1.9.4</commons-beanutils.version>
- <commons-io.version>2.15.1</commons-io.version>
- <commons-pool2.version>2.12.1</commons-pool2.version>
- <commons-dbcp2.version>2.13.0</commons-dbcp2.version>
- <commons-cli.version>1.9.0</commons-cli.version>
- <commons-email.version>1.5</commons-email.version>
+ <bouncy.castle.version>1.77</bouncy.castle.version>
+ <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
+ <cargo.version>1.10.12</cargo.version>
+ <commons-cli.version>1.6.0</commons-cli.version>
<commons-collections4.version>4.4</commons-collections4.version>
- <commons-lang3.version>3.14.0</commons-lang3.version>
<commons-configuration2.version>2.9.0</commons-configuration2.version>
+ <commons-dbcp2.version>2.11.0</commons-dbcp2.version>
+ <commons-email.version>1.6.0</commons-email.version>
<commons-exec.version>1.4.0</commons-exec.version>
- <commons-codec.version>1.16.1</commons-codec.version>
- <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+ <commons-io.version>2.15.1</commons-io.version>
+ <commons-lang3.version>3.14.0</commons-lang3.version>
+ <commons-logging.version>1.3.0</commons-logging.version>
+ <commons-pool2.version>2.12.1</commons-pool2.version>
+ <contiperf.version>2.3.4</contiperf.version>
+ <curator.version>5.6.0</curator.version>
+ <derby.version>10.17.1.0</derby.version>
+ <directory.api.version>1.0.0</directory.api.version>
+ <distribution.plugin.version>3.3.1</distribution.plugin.version>
<docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
- <ibatis-sqlmap.version>2.3.0</ibatis-sqlmap.version>
- <testng.version>7.7.0</testng.version>
- <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
- <shiro-core.version>2.0.2</shiro-core.version>
- <tomcat-embed-core.version>11.0.3</tomcat-embed-core.version>
- <tomcat-embed-logging-juli.version>8.5.2</tomcat-embed-logging-juli.version>
+ <docker-java.version>3.3.5</docker-java.version>
+ <docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
+ <dozer.version>6.5.2</dozer.version>
+ <ebay.cors.filter>1.0.1</ebay.cors.filter>
+ <exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
+ <fasterxml.jackson.version>2.17.0</fasterxml.jackson.version>
+ <google.gson.version>2.10.1</google.gson.version>
+ <google.guava.version>33.0.0-jre</google.guava.version>
+ <groovy.version>4.0.19</groovy.version>
+ <grpc-server-spring-boot-starter.version>2.15.0.RELEASE</grpc-server-spring-boot-starter.version>
+ <grpc.version>1.62.2</grpc.version>
<guice.version>7.0.0</guice.version>
- <templating.maven.version>1.0.0</templating.maven.version>
- <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
- <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
- <contiperf.version>2.3.4</contiperf.version>
- <docker-java.version>3.4.2</docker-java.version>
- <prometheus.version>0.16.0</prometheus.version>
- <jakarta.mail.version>2.0.2</jakarta.mail.version>
- <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
- <servlet-api.version>2.5</servlet-api.version>
- <jets3t.version>0.8.0</jets3t.version>
- <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
- <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
- <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
- <maven-surefire-plugin.version>2.12.4</maven-surefire-plugin.version>
- <json-simple.version>1.1</json-simple.version>
- <xerces.version>2.12.2</xerces.version>
- <icu4j.version>3.4.4</icu4j.version>
- <hamcrest.version>1.1</hamcrest.version>
- <mockito.version>1.8.5</mockito.version>
- <jopt-simple.version>3.2</jopt-simple.version>
- <selenium-maven-plugin.version>2.3</selenium-maven-plugin.version>
- <selenium-java-client-driver.version>1.0.1</selenium-java-client-driver.version>
- <selenium-firefox-driver.version>2.44.0</selenium-firefox-driver.version>
- <selenium-remote-driver.version>2.44.0</selenium-remote-driver.version>
- <selenium-java.version>2.44.0</selenium-java.version>
- <jackson-core-asl.version>1.9.13</jackson-core-asl.version>
- <snappy-java.version>1.1.10.7</snappy-java.version>
- <netty.version>4.2.0.Final</netty.version>
- <logback.version>1.4.14</logback.version>
- <hibernate-core.version>6.6.13.Final</hibernate-core.version>
- <hibernate-commons-annotations.version>7.0.3.Final</hibernate-commons-annotations.version>
- <protobuf-java.version>3.25.5</protobuf-java.version>
- <protobuf-maven-plugin.version>3.1.2</protobuf-maven-plugin.version>
- <grpc.version>1.61.1</grpc.version>
+ <hamcrest.version>2.2</hamcrest.version>
+ <helix.version>1.4.3</helix.version>
+ <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version>
+ <hibernate-core.version>6.4.4.Final</hibernate-core.version>
+ <httpclient.version>4.5.14</httpclient.version>
+ <httpclient5.version>5.3.1</httpclient5.version>
+ <ibatis-sqlmap.version>2.3.4.726</ibatis-sqlmap.version>
+ <icu4j.version>74.2</icu4j.version>
<j2objc-annotations.version>2.8</j2objc-annotations.version>
+ <jacoco.version>0.8.11</jacoco.version>
+ <jackson.version>2.17.0</jackson.version>
+ <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
+ <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
- <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
- <springdoc.version>2.5.0</springdoc.version>
- <slf4j.version>2.0.9</slf4j.version>
+ <jakarta.mail.version>2.0.3</jakarta.mail.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
- <spring-boot.version>3.2.3</spring-boot.version>
- <jackson.version>2.17.2</jackson.version>
- <netty.version>4.1.106.Final</netty.version>
+ <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
+ <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+ <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
+ <jaxb-api.version>2.3.1</jaxb-api.version>
+ <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
+ <javax.annotation.version>1.3.2</javax.annotation.version>
+ <jmockit.version>1.49</jmockit.version>
+ <jopt-simple.version>5.0.4</jopt-simple.version>
+ <json-simple.version>1.1.1</json-simple.version>
+ <json.version>20240205</json.version>
+ <jsch.version>0.1.55</jsch.version>
+ <junit.version>4.13.2</junit.version>
+ <kafka-clients.version>3.7.0</kafka-clients.version>
+ <keycloak.client.version>24.0.1</keycloak.client.version>
+ <log4j-to-slf4j.version>2.23.1</log4j-to-slf4j.version>
+ <log4j2.slf4j.impl>2.23.1</log4j2.slf4j.impl>
+ <log4j2.version>2.23.1</log4j2.version>
+ <logback.version>1.4.14</logback.version>
+ <mariadb-java-client.version>3.3.3</mariadb-java-client.version>
+ <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
+ <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+ <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+ <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+ <maven-remote-resources-plugin.version>3.1.0</maven-remote-resources-plugin.version>
+ <maven-assembly-plugin.version>3.7.0</maven-assembly-plugin.version>
+ <maven.deploy.skip>false</maven.deploy.skip>
+ <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+ <maven.javadoc.skip>false</maven.javadoc.skip>
+ <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
+ <mockito-core.version>5.11.0</mockito-core.version>
+ <mockito.version>5.11.0</mockito.version>
+ <mysql.connector.version>8.3.0</mysql.connector.version>
+ <netty.version>4.1.107.Final</netty.version>
+ <oa4mp.version>4.3</oa4mp.version>
+ <org.slf4j.version>2.0.12</org.slf4j.version>
+ <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <project.version>0.21-SNAPSHOT</project.version>
+ <prometheus.version>0.16.0</prometheus.version>
+ <protobuf-java.version>3.25.3</protobuf-java.version>
+ <protobuf-maven-plugin.version>3.1.2</protobuf-maven-plugin.version>
+ <quartz.version>2.5.0-rc1</quartz.version>
<reactor.version>3.6.3</reactor.version>
- <httpclient.version>4.5.14</httpclient.version>
- <httpclient5.version>5.4.3</httpclient5.version>
- <maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
- <derby.version>10.16.1.1</derby.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <shiro-core.version>2.0.0</shiro-core.version>
+ <skipTests>false</skipTests>
+ <slf4j.version>2.0.12</slf4j.version>
+ <snakeyaml.version>2.4</snakeyaml.version>
+ <snappy-java.version>1.1.10.5</snappy-java.version>
+ <spring.boot.maven.plugin.version>3.4.5</spring.boot.maven.plugin.version>
+ <spring.boot.version>3.4.5</spring.boot.version>
+ <spring.security.oauth2.version>6.2.2</spring.security.oauth2.version>
+ <springdoc.version>2.3.0</springdoc.version>
+ <sshj.version>0.38.0</sshj.version>
+ <surefire.version>3.2.5</surefire.version>
+ <templating.maven.version>1.0.0</templating.maven.version>
+ <testng.version>7.9.0</testng.version>
+ <thrift.version>0.21.0</thrift.version>
+ <tomcat-embed-core.version>11.0.0-M17</tomcat-embed-core.version>
+ <tomcat-embed-logging-juli.version>9.0.0.M6</tomcat-embed-logging-juli.version>
+ <xerces.version>2.12.2</xerces.version>
+ <zk.version>3.9.2</zk.version>
+ <checker-qual.version>3.41.0</checker-qual.version>
+ <rest.easy.client.version>6.2.12.Final</rest.easy.client.version>
</properties>
<dependencies>
+ <!-- Alphabetically sorted dependencies -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -244,116 +243,75 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-common</artifactId>
- <version>${springdoc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>${aopalliance.version}</version>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.4</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>${netty.version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>${netty.version}</version>
- <classifier>linux-x86_64</classifier>
+ <groupId>org.databene</groupId>
+ <artifactId>contiperf</artifactId>
+ <version>${contiperf.version}</version>
</dependency>
<dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-core</artifactId>
- <version>${reactor.version}</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat-embed-core.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java</artifactId>
+ <version>${docker-java.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>${bouncy.castle.version}</version>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
+ <version>${dozer.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- <version>${bouncy.castle.version}</version>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -361,44 +319,41 @@
<version>${google.gson.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.20.0</version>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- <version>${curator.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google.guava.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${j2objc-annotations.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-bom</artifactId>
+ <version>${protobuf-java.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections4.version}</version>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>${mysql.connector.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -406,55 +361,56 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons-configuration2.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${commons-pool2.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
- <scope>test</scope>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf-lite</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${json.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-services</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.helix</groupId>
- <artifactId>helix-core</artifactId>
- <version>${helix.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy-java.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-util</artifactId>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -463,53 +419,53 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
+ <artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
+ <artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
+ <artifactId>netty-common</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
+ <artifactId>netty-resolver</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
+ <artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
+ <artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>com.github.docker-java</groupId>
- <artifactId>docker-java</artifactId>
- <version>${docker-java.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation.version}</version>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ <version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
@@ -517,64 +473,189 @@
<version>${jakarta.activation-api.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jakarta.xml.bind-api.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs-api.version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta.persistence-api.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version>
</dependency>
<dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
- <version>${jakarta.persistence-api.version}</version>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs-api.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta.mail.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>${mysql.connector.version}</version>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>net.devh</groupId>
+ <artifactId>grpc-server-spring-boot-starter</artifactId>
+ <version>${grpc-server-spring-boot-starter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons-configuration2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>${commons-email.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.helix</groupId>
+ <artifactId>helix-core</artifactId>
+ <version>${helix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>${httpclient5.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ibatis</groupId>
+ <artifactId>ibatis-sqlmap</artifactId>
+ <version>${ibatis-sqlmap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>${kafka-clients.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${log4j-to-slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${thrift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zk.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bouncy.castle.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>${bouncy.castle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>${checker-qual.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
@@ -582,14 +663,9 @@
<version>${angus-activation.version}</version>
</dependency>
<dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>2.20.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- <version>${j2objc-annotations.version}</version>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${jakarta.mail.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -606,160 +682,204 @@
<artifactId>txw2</artifactId>
<version>${jaxb-runtime.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>${hibernate-commons-annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <version>${jmockit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-admin-client</artifactId>
+ <version>${keycloak.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-authz-client</artifactId>
+ <version>${keycloak.client.version}</version>
+ </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-bom</artifactId>
- <version>${grpc.version}</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-bom</artifactId>
- <version>${protobuf-java.version}</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
+ <version>${quartz.version}</version>
</dependency>
<dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
- <version>${springdoc.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>net.devh</groupId>
- <artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>${grpc-server-spring-boot-starter.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>com.github.dozermapper</groupId>
- <artifactId>dozer-core</artifactId>
- <version>${dozer.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-common</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate.common</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>${hibernate-commons-annotations.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ibatis</groupId>
- <artifactId>ibatis-sqlmap</artifactId>
- <version>${ibatis-sqlmap.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
+ <version>${spring.security.oauth2.version}</version>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp-client.version}</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
+ <version>${spring.security.oauth2.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <!-- Internal dependencies -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
+ <artifactId>airavata-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-configuration</artifactId>
+ <artifactId>airavata-base-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
+ <artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
+ <artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>airavata-credential-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
+ <artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
+ <artifactId>airavata-messaging-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-base-api</artifactId>
+ <artifactId>airavata-model-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api-stubs</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
+ <artifactId>airavata-orchestrator-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-client</artifactId>
+ <artifactId>airavata-orchestrator-cpi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store</artifactId>
+ <artifactId>airavata-registry-cpi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>cluster-monitoring</artifactId>
+ <artifactId>airavata-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>metascheduler-core</artifactId>
+ <artifactId>airavata-server-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>process-scheduler</artifactId>
+ <artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>metadata-analyzer</artifactId>
+ <artifactId>cluster-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -769,133 +889,181 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-server</artifactId>
+ <artifactId>metadata-analyzer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
+ <artifactId>metascheduler-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-core</artifactId>
+ <artifactId>process-scheduler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-cpi</artifactId>
+ <artifactId>profile-service-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
+ <artifactId>registry-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>${quartz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>${spring.security.oauth2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring.security.oauth2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-authz-client</artifactId>
- <version>${keycloak.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro-core.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.3.4</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_hotspot</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <version>${grpc.version}</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_httpserver</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- <version>${grpc.version}</version>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_pushgateway</artifactId>
+ <version>${prometheus.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf-lite</artifactId>
- <version>${grpc.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-services</artifactId>
- <version>${grpc.version}</version>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>${directory.api.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-util</artifactId>
- <version>${grpc.version}</version>
+ <groupId>com.hierynomus</groupId>
+ <artifactId>sshj</artifactId>
+ <version>${sshj.version}</version>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-core</artifactId>
- <version>${grpc.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf-java.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>${httpclient5.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core-spi</artifactId>
+ <version>${rest.easy.client.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>${selenium-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.maven.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.dkanejs.maven.plugins</groupId>
+ <artifactId>docker-compose-maven-plugin</artifactId>
+ <version>${docker-compose-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>templating-maven-plugin</artifactId>
+ <version>${templating.maven.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>io.github.ascopes</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf-maven-plugin.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId>
- <version>${templating.maven.version}</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -909,7 +1077,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>${maven-remote-resources-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -949,7 +1116,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -957,7 +1123,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<failIfNoTests>false</failIfNoTests>
<skipTests>${skipTests}</skipTests>
@@ -993,6 +1158,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.dkanejs.maven.plugins</groupId>
+ <artifactId>docker-compose-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/tools/load-client/pom.xml b/tools/load-client/pom.xml
index 8d23be03eb..0bf75845bc 100644
--- a/tools/load-client/pom.xml
+++ b/tools/load-client/pom.xml
@@ -14,6 +14,10 @@
<url>http://airavata.apache.org/</url>
<dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-stubs</artifactId>
@@ -25,12 +29,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -41,8 +41,8 @@
<artifactId>keycloak-authz-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
</dependency>
</dependencies>
<build>
@@ -50,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
<executions>
<execution>
<id>load-client-distribution-package</id>
(airavata) 06/09: fix issues with helix participant and job engine starter
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 4adcfa0320dff56b34c89aa4e9ba66748b187663
Author: yasithdev <ya...@icloud.com>
AuthorDate: Fri Mar 21 23:27:03 2025 +0000
fix issues with helix participant and job engine starter
---
.../helix/impl/controller/HelixController.java | 60 ++++++--------
.../helix/impl/participant/GlobalParticipant.java | 5 +-
.../helix/core/participant/HelixParticipant.java | 93 ++++++++++++----------
.../airavata/ide/integration/JobEngineStarter.java | 26 ++----
pom.xml | 2 +-
5 files changed, 85 insertions(+), 101 deletions(-)
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
index ee4656ea1c..be3c11fbe9 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
@@ -23,15 +23,12 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.helix.controller.HelixControllerMain;
import org.apache.helix.manager.zk.ZKHelixAdmin;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
-import org.apache.helix.manager.zk.ZkClient;
+import org.apache.helix.model.BuiltInStateModelDefinitions;
+import org.apache.helix.model.IdealState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
/**
* TODO: Class level comments please
@@ -43,13 +40,13 @@ public class HelixController implements Runnable {
private final static Logger logger = LoggerFactory.getLogger(HelixController.class);
- private String clusterName;
- private String controllerName;
- private String zkAddress;
+ private final String clusterName;
+ private final String controllerName;
+ private final String zkAddress;
private org.apache.helix.HelixManager zkHelixManager;
- private CountDownLatch startLatch = new CountDownLatch(1);
- private CountDownLatch stopLatch = new CountDownLatch(1);
+ private final CountDownLatch startLatch = new CountDownLatch(1);
+ private final CountDownLatch stopLatch = new CountDownLatch(1);
@SuppressWarnings("WeakerAccess")
public HelixController() throws ApplicationSettingsException {
@@ -60,50 +57,43 @@ public class HelixController implements Runnable {
public void run() {
try {
- ZkClient zkClient = new ZkClient(ServerSettings.getZookeeperConnection(), ZkClient.DEFAULT_SESSION_TIMEOUT,
- ZkClient.DEFAULT_CONNECTION_TIMEOUT, new ZNRecordSerializer());
- ZKHelixAdmin zkHelixAdmin = new ZKHelixAdmin(zkClient);
-
- // Creates the zk cluster if not available
- if (! zkHelixAdmin.getClusters().contains(clusterName)) {
- zkHelixAdmin.addCluster(clusterName, true);
- }
-
+ logger.info("Zookeeper connection string: {}", zkAddress);
+ logger.info("Helix cluster: {}", clusterName);
+ logger.info("Helix controller: {}", controllerName);
+ ZKHelixAdmin zkHelixAdmin = new ZKHelixAdmin.Builder().setZkAddress(this.zkAddress).build();
+ logger.info("[zkAdmin] started");
+ logger.info("[zkAdmin] Cluster: {} adding if not available...", clusterName);
+ zkHelixAdmin.addCluster(this.clusterName, true);
+ logger.info("[zkAdmin] Cluster: {} now available!", clusterName);
zkHelixAdmin.close();
- zkClient.close();
+ logger.info("[zkAdmin] closed");
- logger.info("Connection to helix cluster : " + clusterName + " with name : " + controllerName);
- logger.info("Zookeeper connection string " + zkAddress);
-
- zkHelixManager = HelixControllerMain.startHelixController(zkAddress, clusterName,
- controllerName, HelixControllerMain.STANDALONE);
+ logger.info("helix controller - starting...");
+ zkHelixManager = HelixControllerMain.startHelixController(zkAddress, clusterName, controllerName, HelixControllerMain.STANDALONE);
+ logger.info("Helix controller - started");
startLatch.countDown();
stopLatch.await();
} catch (Exception ex) {
- logger.error("Error in run() for Controller: " + controllerName + ", reason: " + ex, ex);
+ logger.error("Error in run() for Controller: {}, reason: {}", controllerName, ex, ex);
} finally {
disconnect();
}
}
+ @SuppressWarnings("RedundantThrows")
public void startServer() throws Exception {
- //WorkflowCleanupAgent cleanupAgent = new WorkflowCleanupAgent();
- //cleanupAgent.init();
- //ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
- //executor.scheduleWithFixedDelay(cleanupAgent, 10, 120, TimeUnit.SECONDS);
-
new Thread(this).start();
try {
startLatch.await();
- logger.info("Controller: " + controllerName + ", has connected to cluster: " + clusterName);
+ logger.info("Controller: {}, has connected to cluster: {}", controllerName, clusterName);
Runtime.getRuntime().addShutdownHook(
new Thread(this::disconnect)
);
} catch (InterruptedException ex) {
- logger.error("Controller: " + controllerName + ", is interrupted! reason: " + ex, ex);
+ logger.error("Controller: {}, is interrupted! reason: {}", controllerName, ex, ex);
}
}
@@ -114,12 +104,12 @@ public class HelixController implements Runnable {
private void disconnect() {
if (zkHelixManager != null) {
- logger.info("Controller: " + controllerName + ", has disconnected from cluster: " + clusterName);
+ logger.info("Controller: {}, has disconnected from cluster: {}", controllerName, clusterName);
zkHelixManager.disconnect();
}
}
- public static void main(String args[]) {
+ public static void main(String[] args) {
try {
logger.info("Starting helix controller");
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
index fb439f45e7..54a657315b 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
@@ -62,18 +62,19 @@ public class GlobalParticipant extends HelixParticipant<AbstractTask> {
t.start();
}
+ @SuppressWarnings("unused")
public void stopServer() {
}
- public static void main(String args[]) {
+ public static void main(String[] args) {
logger.info("Starting global participant");
try {
ArrayList<Class<? extends AbstractTask>> taskClasses = new ArrayList<>();
for (String taskClassName : TASK_CLASS_NAMES) {
- logger.debug("Adding task class: " + taskClassName + " to the global participant");
+ logger.debug("Adding task class: {} to the global participant", taskClassName);
taskClasses.add(Class.forName(taskClassName).asSubclass(AbstractTask.class));
}
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
index 378e678020..8bf040f513 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
@@ -23,22 +23,22 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.helix.core.support.TaskHelperImpl;
import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.util.PropertyResolver;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.helix.InstanceType;
import org.apache.helix.examples.OnlineOfflineStateModelFactory;
-import org.apache.helix.manager.zk.ZKHelixAdmin;
-import org.apache.helix.manager.zk.ZKHelixManager;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
-import org.apache.helix.manager.zk.ZkClient;
import org.apache.helix.model.BuiltInStateModelDefinitions;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.participant.StateMachineEngine;
import org.apache.helix.task.TaskFactory;
import org.apache.helix.task.TaskStateModelFactory;
+import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
+import org.apache.helix.zookeeper.impl.client.ZkClient;
+import org.apache.helix.manager.zk.ZKHelixAdmin;
+import org.apache.helix.manager.zk.ZKHelixManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.InvocationTargetException;
import java.util.*;
/**
@@ -54,15 +54,16 @@ public class HelixParticipant<T extends AbstractTask> implements Runnable {
private int shutdownGracePeriod = 30000;
private int shutdownGraceRetries = 2;
- private String zkAddress;
- private String clusterName;
- private String participantName;
+ private final String zkAddress;
+ private final String clusterName;
+ private final String participantName;
+ private final String taskTypeName;
+
private ZKHelixManager zkHelixManager;
- private String taskTypeName;
- private List<Class<? extends T>> taskClasses;
- private final List<String> runningTasks = Collections.synchronizedList(new ArrayList<String>());
+ private final List<Class<? extends T>> taskClasses;
+ private final List<String> runningTasks = Collections.synchronizedList(new ArrayList<>());
public HelixParticipant(List<Class<? extends T>> taskClasses, String taskTypeName) throws ApplicationSettingsException {
@@ -75,38 +76,41 @@ public class HelixParticipant<T extends AbstractTask> implements Runnable {
this.taskTypeName = taskTypeName;
this.taskClasses = taskClasses;
- logger.info("Zookeeper connection URL " + zkAddress);
- logger.info("Cluster name " + clusterName);
- logger.info("Participant name " + participantName);
- logger.info("Task type " + taskTypeName);
+ logger.info("Zookeeper connection URL {}", zkAddress);
+ logger.info("Cluster name {}", clusterName);
+ logger.info("Participant name {}", participantName);
+ logger.info("Task type {}", taskTypeName);
if (taskClasses != null) {
for (Class<? extends T> taskClass : taskClasses) {
- logger.info("Task classes include: " + taskClass.getCanonicalName());
+ logger.info("Task classes include: {}", taskClass.getCanonicalName());
}
}
}
+ @SuppressWarnings({"WeakerAccess", "unused"})
public HelixParticipant(Class<T> taskClass, String taskTypeName) throws ApplicationSettingsException {
this(taskClass != null ? Collections.singletonList(taskClass) : null, taskTypeName);
}
+ @SuppressWarnings({"WeakerAccess", "unused"})
public void setShutdownGracePeriod(int shutdownGracePeriod) {
this.shutdownGracePeriod = shutdownGracePeriod;
}
+ @SuppressWarnings({"WeakerAccess", "unused"})
public void setShutdownGraceRetries(int shutdownGraceRetries) {
this.shutdownGraceRetries = shutdownGraceRetries;
}
public void registerRunningTask(AbstractTask task) {
runningTasks.add(task.getTaskId());
- logger.info("Registered Task " + task.getTaskId() + ". Currently available " + runningTasks.size());
+ logger.info("Registered Task {}. Currently available {}", task.getTaskId(), runningTasks.size());
}
public void unregisterRunningTask(AbstractTask task) {
runningTasks.remove(task.getTaskId());
- logger.info("Un registered Task " + task.getTaskId() + ". Currently available " + runningTasks.size());
+ logger.info("Un registered Task {}. Currently available {}", task.getTaskId(), runningTasks.size());
}
@SuppressWarnings("WeakerAccess")
@@ -116,54 +120,58 @@ public class HelixParticipant<T extends AbstractTask> implements Runnable {
for (Class<? extends T> taskClass : taskClasses) {
TaskFactory taskFac = context -> {
try {
- return AbstractTask.class.cast(taskClass.newInstance())
+ return taskClass.getDeclaredConstructor().newInstance()
.setParticipant(HelixParticipant.this)
.setCallbackContext(context)
.setTaskHelper(new TaskHelperImpl());
- } catch (InstantiationException | IllegalAccessException e) {
- logger.error("Failed to initialize the task: " + context.getTaskConfig().getId(), e);
+ } catch (InstantiationException | IllegalAccessException | NoSuchMethodException |
+ InvocationTargetException e) {
+ logger.error("Failed to initialize the task: {}", context.getTaskConfig().getId(), e);
return null;
}
};
TaskDef taskDef = taskClass.getAnnotation(TaskDef.class);
- taskRegistry.put(taskDef.name(), taskFac);
+ if (taskDef != null) {
+ taskRegistry.put(taskDef.name(), taskFac);
+ } else {
+ logger.warn("Task class {} is not annotated with @TaskDef", taskClass.getCanonicalName());
+ }
}
return taskRegistry;
}
public void run() {
- ZkClient zkClient = null;
+ ZkClient zkClient = null;
try {
zkClient = new ZkClient(zkAddress, ZkClient.DEFAULT_SESSION_TIMEOUT,
ZkClient.DEFAULT_CONNECTION_TIMEOUT, new ZNRecordSerializer());
- ZKHelixAdmin zkHelixAdmin = new ZKHelixAdmin(zkClient);
+ ZKHelixAdmin zkHelixAdmin = new ZKHelixAdmin.Builder().setZkAddress(zkAddress).build();
List<String> nodesInCluster = zkHelixAdmin.getInstancesInCluster(clusterName);
if (!nodesInCluster.contains(participantName)) {
InstanceConfig instanceConfig = new InstanceConfig(participantName);
instanceConfig.setHostName("localhost");
- instanceConfig.setInstanceEnabled(true);
if (taskTypeName != null) {
instanceConfig.addTag(taskTypeName);
}
zkHelixAdmin.addInstance(clusterName, instanceConfig);
- logger.info("Participant: " + participantName + " has been added to cluster: " + clusterName);
+ logger.info("Participant: {} has been added to cluster: {}", participantName, clusterName);
} else {
if (taskTypeName != null) {
zkHelixAdmin.addInstanceTag(clusterName, participantName, taskTypeName);
}
- zkHelixAdmin.enableInstance(clusterName, participantName, true);
- logger.debug("Participant: " + participantName + " has been re-enabled at the cluster: " + clusterName);
+ zkHelixAdmin.enableResource(clusterName, participantName, true);
+ logger.debug("Participant: {} has been re-enabled at the cluster: {}", participantName, clusterName);
}
Runtime.getRuntime().addShutdownHook(
new Thread(() -> {
- logger.debug("Participant: " + participantName + " shutdown hook called");
+ logger.debug("Participant: {} shutdown hook called", participantName);
try {
- zkHelixAdmin.enableInstance(clusterName, participantName, false);
+ zkHelixAdmin.enableResource(clusterName, participantName, false);
} catch (Exception e) {
- logger.warn("Participant: " + participantName + " was not disabled normally", e);
+ logger.warn("Participant: {} was not disabled normally", participantName, e);
}
disconnect();
})
@@ -172,7 +180,7 @@ public class HelixParticipant<T extends AbstractTask> implements Runnable {
// connect the participant manager
connect();
} catch (Exception ex) {
- logger.error("Error in run() for Participant: " + participantName + ", reason: " + ex, ex);
+ logger.error("Error in run() for Participant: {}, reason: {}", participantName, ex, ex);
} finally {
if (zkClient != null) {
zkClient.close();
@@ -191,38 +199,39 @@ public class HelixParticipant<T extends AbstractTask> implements Runnable {
// register task model
machineEngine.registerStateModelFactory("Task", new TaskStateModelFactory(zkHelixManager, getTaskFactory()));
- logger.debug("Participant: " + participantName + ", registered state model factories.");
+ logger.debug("Participant: {}, registered state model factories.", participantName);
zkHelixManager.connect();
- logger.info("Participant: " + participantName + ", has connected to cluster: " + clusterName);
+ logger.info("Participant: {}, has connected to cluster: {}", participantName, clusterName);
Thread.currentThread().join();
} catch (InterruptedException ex) {
- logger.error("Participant: " + participantName + ", is interrupted! reason: " + ex, ex);
+ logger.error("Participant: {}, is interrupted! reason: {}", participantName, ex, ex);
} catch (Exception ex) {
- logger.error("Error in connect() for Participant: " + participantName + ", reason: " + ex, ex);
+ logger.error("Error in connect() for Participant: {}, reason: {}", participantName, ex, ex);
} finally {
disconnect();
}
}
private void disconnect() {
- logger.info("Shutting down participant. Currently available tasks " + runningTasks.size());
+ logger.info("Shutting down participant. Currently available tasks {}", runningTasks.size());
if (zkHelixManager != null) {
- if (runningTasks.size() > 0) {
+ if (!runningTasks.isEmpty()) {
for (int i = 0; i <= shutdownGraceRetries; i++) {
- logger.info("Shutting down gracefully [RETRY " + i + "]");
+ logger.info("Shutting down gracefully [RETRY {}]", i);
try {
+ //noinspection BusyWait
Thread.sleep(shutdownGracePeriod);
} catch (InterruptedException e) {
- logger.warn("Waiting for running tasks failed [RETRY " + i + "]", e);
+ logger.warn("Waiting for running tasks failed [RETRY {}]", i, e);
}
- if (runningTasks.size() == 0) {
+ if (runningTasks.isEmpty()) {
break;
}
}
}
- logger.info("Participant: " + participantName + ", has disconnected from cluster: " + clusterName);
+ logger.info("Participant: {}, has disconnected from cluster: {}", participantName, clusterName);
zkHelixManager.disconnect();
}
}
diff --git a/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/JobEngineStarter.java b/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/JobEngineStarter.java
index cc15a118af..f9f4b81ab0 100644
--- a/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/JobEngineStarter.java
+++ b/modules/ide-integration/src/main/java/org/apache/airavata/ide/integration/JobEngineStarter.java
@@ -1,53 +1,37 @@
package org.apache.airavata.ide.integration;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.helix.core.AbstractTask;
import org.apache.airavata.helix.impl.controller.HelixController;
import org.apache.airavata.helix.impl.participant.GlobalParticipant;
import org.apache.airavata.helix.impl.workflow.PostWorkflowManager;
import org.apache.airavata.helix.impl.workflow.PreWorkflowManager;
-import org.apache.airavata.monitor.email.EmailBasedMonitor;
-import org.apache.helix.manager.zk.ZKHelixAdmin;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
-import org.apache.helix.manager.zk.ZkClient;
import java.util.ArrayList;
public class JobEngineStarter {
- public static void main(String args[]) throws Exception {
-
- ZkClient zkClient = new ZkClient(ServerSettings.getZookeeperConnection(), ZkClient.DEFAULT_SESSION_TIMEOUT,
- ZkClient.DEFAULT_CONNECTION_TIMEOUT, new ZNRecordSerializer());
- ZKHelixAdmin zkHelixAdmin = new ZKHelixAdmin(zkClient);
-
- zkHelixAdmin.addCluster(ServerSettings.getSetting("helix.cluster.name"), true);
+ public static void main(String[] args) throws Exception {
System.out.println("Starting Helix Controller .......");
- // Starting helix controller
HelixController controller = new HelixController();
controller.startServer();
+ Thread.sleep(5000);
+ System.out.println("Starting Helix Participant .......");
ArrayList<Class<? extends AbstractTask>> taskClasses = new ArrayList<>();
-
for (String taskClassName : GlobalParticipant.TASK_CLASS_NAMES) {
taskClasses.add(Class.forName(taskClassName).asSubclass(AbstractTask.class));
}
-
- System.out.println("Starting Helix Participant .......");
-
- // Starting helix participant
GlobalParticipant participant = new GlobalParticipant(taskClasses, null);
participant.startServer();
+ Thread.sleep(5000);
System.out.println("Starting Pre Workflow Manager .......");
-
PreWorkflowManager preWorkflowManager = new PreWorkflowManager();
preWorkflowManager.startServer();
+ Thread.sleep(5000);
System.out.println("Starting Post Workflow Manager .......");
-
PostWorkflowManager postWorkflowManager = new PostWorkflowManager();
postWorkflowManager.startServer();
}
diff --git a/pom.xml b/pom.xml
index d49e1e0ad1..14770240e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
<angus-activation.version>2.0.2</angus-activation.version>
<jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
<jmockit.version>1.44</jmockit.version>
- <helix.version>1.4.0</helix.version>
+ <helix.version>1.4.3</helix.version>
<keycloak.admin.client.version>24.0.4</keycloak.admin.client.version>
<resteasy.version>6.2.12.Final</resteasy.version>
<httpclient.version>4.5.14</httpclient.version>
(airavata) 04/09: migrate openjpa to hibernate, update pool and dbcp deps to pool2 and dbcp2.
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 0845d49707bf637f0832d3f807310a3d7c370340
Author: yasithdev <ya...@icloud.com>
AuthorDate: Fri Mar 21 03:23:36 2025 +0000
migrate openjpa to hibernate, update pool and dbcp deps to pool2 and dbcp2.
---
.vscode/launch.json | 3 +-
.../profile-service-commons/pom.xml | 33 +--------
.../src/main/resources/META-INF/persistence.xml | 6 +-
.../profile-service/profile-user-core/pom.xml | 20 ------
.../service/controllers/ExperimentController.java | 7 +-
modules/commons/pom.xml | 14 ++--
.../org/apache/airavata/common/utils/DBUtil.java | 2 +-
.../org/apache/airavata/common/utils/JPAUtils.java | 39 +++++-----
.../credential-store-service/pom.xml | 6 +-
modules/distribution/pom.xml | 14 +---
.../src/main/assembly/controller-bin-assembly.xml | 6 +-
.../main/assembly/email-monitor-bin-assembly.xml | 1 -
.../src/main/assembly/parser-wm-bin-assembly.xml | 5 +-
.../src/main/assembly/participant-bin-assembly.xml | 6 +-
.../src/main/assembly/post-wm-bin-assembly.xml | 5 +-
.../src/main/assembly/pre-wm-bin-assembly.xml | 5 +-
.../assembly/realtime-monitor-bin-assembly.xml | 5 +-
.../src/main/resources/airavata-server.properties | 4 +-
.../ide-integration/src/main/resources/log4j2.xml | 4 +-
modules/registry/registry-core/pom.xml | 33 +--------
.../entities/appcatalog/AppEnvironmentEntity.java | 6 +-
.../appcatalog/ApplicationInputEntity.java | 5 +-
.../appcatalog/ApplicationOutputEntity.java | 5 +-
.../appcatalog/BatchQueueResourcePolicyEntity.java | 14 +---
.../appcatalog/ComputeResourcePolicyEntity.java | 17 +----
.../ComputeResourceReservationEntity.java | 6 +-
.../appcatalog/GroupComputeResourcePrefEntity.java | 5 +-
.../GroupSSHAccountProvisionerConfig.java | 6 +-
.../appcatalog/LibraryApendPathEntity.java | 6 +-
.../appcatalog/LibraryPrependPathEntity.java | 6 +-
.../entities/appcatalog/ModuleLoadCmdEntity.java | 7 +-
.../entities/appcatalog/PostjobCommandEntity.java | 6 +-
.../entities/appcatalog/PrejobCommandEntity.java | 6 +-
.../core/utils/migration/MappingToolRunner.java | 83 +++++++++++++++-------
.../src/main/resources/META-INF/persistence.xml | 17 +++--
.../mysql/airavata-server.properties | 6 +-
.../main/java/generators/JPAClassGenerator.java | 4 +-
modules/security/pom.xml | 6 +-
.../sharing-registry-distribution/pom.xml | 6 +-
.../sharing-registry-server/pom.xml | 33 +--------
.../src/main/resources/META-INF/persistence.xml | 5 +-
pom.xml | 52 +++++++++++---
42 files changed, 199 insertions(+), 326 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9a39c30cdc..4f0156fb07 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,8 +5,7 @@
"name": "Start API Server",
"request": "launch",
"cwd": "${workspaceFolder}/modules/ide-integration",
- "mainClass": "org.apache.airavata.ide.integration.APIServerStarter",
- "vmArgs": "-javaagent:/home/vscode/.m2/repository/org/apache/openjpa/openjpa/4.0.1/openjpa-4.0.1.jar",
+ "mainClass": "org.apache.airavata.ide.integration.APIServerStarter"
},
{
"type": "java",
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index b1217453d5..d6be72e59d 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -56,9 +56,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
@@ -97,33 +97,6 @@
<release>17</release>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.maven.plugin.version}</version>
- <configuration>
- <includes>**/entities/*.class</includes>
- <excludes>**/entities/XML*.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml b/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml
index 08c9bed003..e02cca810e 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml
+++ b/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml
@@ -21,16 +21,14 @@
* -->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
<persistence-unit name="profile_service">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.airavata.service.profile.commons.user.entities.UserProfileEntity</class>
<class>org.apache.airavata.service.profile.commons.user.entities.NSFDemographicsEntity</class>
<class>org.apache.airavata.service.profile.commons.user.entities.CustomizedDashboardEntity</class>
<class>org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
-
<properties>
- <property name="openjpa.jdbc.MappingDefaults"
- value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" />
+ <property name="hibernate.cascade" value="all"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index d187dfd8cf..c50b37af0c 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -61,26 +61,6 @@
<fork>true</fork>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.maven.plugin.version}</version>
- <configuration>
- <includes>**/entities/*.class</includes>
- <excludes>**/entities/XML*.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
index f2fd6688f0..f59fc882f1 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
@@ -18,6 +18,8 @@
*/
package org.apache.airavata.agent.connection.service.controllers;
+import java.util.List;
+
import org.apache.airavata.agent.connection.service.handlers.AgentManagementHandler;
import org.apache.airavata.agent.connection.service.models.AgentLaunchRequest;
import org.apache.airavata.agent.connection.service.models.AgentLaunchResponse;
@@ -28,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -35,10 +38,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-
-import org.springframework.validation.annotation.Validated;
-
@RestController
@RequestMapping("/api/v1/exp")
public class ExperimentController {
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 299b0eb097..53c1fe9f1f 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -52,9 +52,9 @@
<version>${xpp5.version}</version>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -112,9 +112,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
</dependency>
<!-- Testing -->
<dependency>
@@ -161,7 +161,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
+ <version>${jaxb-api.version}</version>
</dependency>
</dependencies>
<properties>
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBUtil.java
index 87757326eb..0b8ee26dbc 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBUtil.java
@@ -20,7 +20,7 @@
package org.apache.airavata.common.utils;
import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
index b71d3f7ae7..7d770f5f04 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
@@ -18,20 +18,14 @@ public class JPAUtils {
private final static Logger logger = LoggerFactory.getLogger(JPAUtils.class);
private final static Map<String, String> DEFAULT_ENTITY_MANAGER_FACTORY_PROPERTIES;
static {
- Map<String, String> properties = new HashMap<String, String>();
- properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp.BasicDataSource");
- properties.put("openjpa.DynamicEnhancementAgent", "true");
- properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
- properties.put("openjpa.RemoteCommitProvider", "sjvm");
- properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
- // use the following to enable logging of all SQL statements
- // properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO,
- // SQL=TRACE");
- properties.put("openjpa.jdbc.SynchronizeMappings", "validate");
- properties.put("openjpa.jdbc.QuerySQLCache", "false");
- properties.put("openjpa.DetachState", "all");
- properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72,"
- + " PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true");
+ Map<String, String> properties = new HashMap<>();
+ properties.put("hibernate.dialect", "org.hibernate.dialect.MySQLDialect");
+ properties.put("hibernate.hbm2ddl.auto", "validate");
+ properties.put("hibernate.dbcp2.initialSize", "5");
+ properties.put("hibernate.dbcp2.maxTotal", "20");
+ properties.put("hibernate.dbcp2.maxIdle", "10");
+ properties.put("hibernate.dbcp2.minIdle", "2");
+ properties.put("hibernate.dbcp2.maxWaitMillis", "5000");
DEFAULT_ENTITY_MANAGER_FACTORY_PROPERTIES = properties;
}
@@ -43,7 +37,6 @@ public class JPAUtils {
* @return {@link EntityManagerFactory}
*/
public static EntityManagerFactory getEntityManagerFactory(String persistenceUnitName, JDBCConfig jdbcConfig) {
-
return getEntityManagerFactory(persistenceUnitName, jdbcConfig, DEFAULT_ENTITY_MANAGER_FACTORY_PROPERTIES);
}
@@ -59,17 +52,23 @@ public class JPAUtils {
public static EntityManagerFactory getEntityManagerFactory(String persistenceUnitName, JDBCConfig jdbcConfig,
Map<String, String> properties) {
- Map<String, String> finalProperties = new HashMap<>(DEFAULT_ENTITY_MANAGER_FACTORY_PROPERTIES);
+ Map<String, String> finalProperties = new HashMap<>();
finalProperties.putAll(createConnectionProperties(jdbcConfig));
finalProperties.putAll(properties);
return Persistence.createEntityManagerFactory(persistenceUnitName, finalProperties);
}
public static Map<String, String> createConnectionProperties(JDBCConfig jdbcConfig) {
- String connectionProperties = "DriverClassName=" + jdbcConfig.getDriver() + "," + "Url=" + jdbcConfig.getURL()
- + "?autoReconnect=true," + "Username=" + jdbcConfig.getUser() + "," + "Password="
- + jdbcConfig.getPassword() + ",validationQuery=" + jdbcConfig.getValidationQuery();
+ Map<String, String> connectionProperties = new HashMap<>();
+ connectionProperties.put("hibernate.connection.provider_class", "org.apache.commons.dbcp2.BasicDataSource");
+ connectionProperties.put("hibernate.connection.driver_class", jdbcConfig.getDriver());
+ connectionProperties.put("hibernate.connection.url", jdbcConfig.getURL() + "?autoReconnect=true");
+ connectionProperties.put("hibernate.connection.username", jdbcConfig.getUser());
+ connectionProperties.put("hibernate.connection.password", jdbcConfig.getPassword());
+ if (jdbcConfig.getValidationQuery() != null && !jdbcConfig.getValidationQuery().isEmpty()) {
+ connectionProperties.put("hibernate.connection.validationQuery", jdbcConfig.getValidationQuery());
+ }
logger.debug("Connection properties={}", connectionProperties);
- return Collections.singletonMap("openjpa.ConnectionProperties", connectionProperties);
+ return connectionProperties;
}
}
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 062a2bcf16..bcf5ea8ca6 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -109,9 +109,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index ec7cef4dcc..2b7982a745 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -194,9 +194,9 @@
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
</dependency>
<dependency>
@@ -428,14 +428,6 @@
<artifactId>realtime-monitor</artifactId>
<version>${project.version}</version>
</dependency>
-
- <!-- For thrift client pool -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- </dependency>
-
- <!-- For Helix -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index ff3919e8af..d266014715 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -90,12 +90,12 @@
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
- <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>org.apache.commons:commons-dbcp2:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.commons:commons-math:jar</include>
- <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
@@ -161,8 +161,6 @@
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
-
- <include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index 116dc2245e..abc4584f15 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -88,7 +88,6 @@
<include>org.apache.airavata:airavata-commons:jar</include>
<include>commons-cli:commons-cli</include>
- <include>commons-pool:commons-pool</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index 3374be8b95..aee16e42bf 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -90,12 +90,12 @@
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
- <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>org.apache.commons:commons-dbcp2:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.commons:commons-math:jar</include>
- <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
@@ -160,7 +160,6 @@
<include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>com.github.docker-java:docker-java:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index 1fd4fa32e9..0c07619ab7 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -92,12 +92,12 @@
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
- <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>org.apache.commons:commons-dbcp2:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.commons:commons-math:jar</include>
- <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
@@ -208,8 +208,6 @@
<include>io.netty:netty-common:jar</include>
<include>io.netty:netty-transport-native-unix-common:jar</include>
<include>io.netty:netty-transport-native-kqueue:jar</include>
-
- <include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 5e179aa199..5a486eef9a 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -90,12 +90,12 @@
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
- <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>org.apache.commons:commons-dbcp2:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.commons:commons-math:jar</include>
- <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
@@ -166,7 +166,6 @@
<include>io.netty:netty-handler:jar</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index 8ac2782c03..8931e9c43e 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -90,12 +90,12 @@
<include>commons-cli:commons-cli:jar</include>
<include>commons-codec:commons-codec:jar</include>
<include>commons-collections:commons-collections:jar</include>
- <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>org.apache.commons:commons-dbcp2:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.commons:commons-math:jar</include>
- <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
@@ -166,7 +166,6 @@
<include>org.apache.airavata:services-security:jar</include>
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
<include>io.prometheus:simpleclient:jar</include>
diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
index 0d32b253cd..e347e9e832 100644
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -88,7 +88,6 @@
<include>org.apache.airavata:airavata-commons:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>commons-cli:commons-cli</include>
- <include>commons-pool:commons-pool</include>
<include>org.apache.thrift:libthrift:jar</include>
<!-- kafka specific jars -->
@@ -115,10 +114,8 @@
<include>org.apache.logging.log4j:log4j-core</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
<include>org.apache.logging.log4j:log4j-1.2-api</include>
-
- <include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
-
+ <include>org.apache.commons:commons-pool2:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
diff --git a/modules/ide-integration/src/main/resources/airavata-server.properties b/modules/ide-integration/src/main/resources/airavata-server.properties
index 95fe8ef53b..560a522b55 100644
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ b/modules/ide-integration/src/main/resources/airavata-server.properties
@@ -37,7 +37,7 @@ registry.jdbc.password=123456
start.derby.server.mode=false
validationQuery=SELECT 1 from CONFIGURATION
cache.enable=false
-jpa.cache.size=-1
+#jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
enable.sharing=true
@@ -190,7 +190,7 @@ rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
+experiment.launch.queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
diff --git a/modules/ide-integration/src/main/resources/log4j2.xml b/modules/ide-integration/src/main/resources/log4j2.xml
index a06ff13d8a..39273e6d1f 100644
--- a/modules/ide-integration/src/main/resources/log4j2.xml
+++ b/modules/ide-integration/src/main/resources/log4j2.xml
@@ -44,9 +44,7 @@
<logger name="org.apache.helix" level="WARN"/>
<logger name="org.apache.zookeeper" level="ERROR"/>
<logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <logger name="org.apache.openjpa" level="DEBUG"/>
- <logger name="org.apache.openjpa.enhance" level="DEBUG"/>
+ <logger name="org.hibernate" level="INFO"/>
<Root level="INFO">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFileAppender"/>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index 558ffc6b4e..93ac0a4af0 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -62,11 +62,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
</dependency>
-
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
@@ -223,32 +222,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.maven.plugin.version}</version>
- <configuration>
- <includes>**/model/*.class</includes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
index 6678c8adcd..7f8d1b98cb 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
@@ -20,9 +20,6 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.*;
import java.io.Serializable;
@@ -49,9 +46,8 @@ public class AppEnvironmentEntity implements Serializable {
@Column(name = "ENV_ORDER")
private int envPathOrder;
- @ManyToOne(targetEntity = ApplicationDeploymentEntity.class)
+ @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "DEPLOYMENT_ID", nullable = false, updatable = false)
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationDeploymentEntity applicationDeployment;
public AppEnvironmentEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
index 469b6cb559..422b8f3091 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -21,8 +21,6 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.application.io.DataType;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
import jakarta.persistence.*;
import java.io.Serializable;
@@ -83,9 +81,8 @@ public class ApplicationInputEntity implements Serializable {
@Column(name = "OVERRIDE_FILENAME")
private String overrideFilename;
- @ManyToOne(targetEntity = ApplicationInterfaceEntity.class)
+ @ManyToOne(targetEntity = ApplicationInterfaceEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "INTERFACE_ID", nullable = false, updatable = false)
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationInterfaceEntity applicationInterface;
public ApplicationInputEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
index 23f7c0db7b..1b85b8ba5c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
@@ -21,8 +21,6 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.application.io.DataType;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
import jakarta.persistence.*;
import java.io.Serializable;
@@ -75,9 +73,8 @@ public class ApplicationOutputEntity implements Serializable {
@Column(name = "METADATA", length = 4096)
private String metaData;
- @ManyToOne(targetEntity = ApplicationInterfaceEntity.class)
+ @ManyToOne(targetEntity = ApplicationInterfaceEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "INTERFACE_ID", nullable = false, updatable = false)
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationInterfaceEntity applicationInterface;
public ApplicationOutputEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
index 4fb190f0f1..a71db03771 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
@@ -20,15 +20,8 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+
import java.io.Serializable;
/**
@@ -62,9 +55,8 @@ public class BatchQueueResourcePolicyEntity implements Serializable {
@Column(name = "MAX_ALLOWED_WALLTIME")
private Integer maxAllowedWalltime;
- @ManyToOne(targetEntity = GroupResourceProfileEntity.class)
+ @ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private GroupResourceProfileEntity groupResourceProfile;
public BatchQueueResourcePolicyEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
index 6da5d37fe0..714fdc5667 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
@@ -20,18 +20,8 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+
import java.io.Serializable;
import java.util.List;
@@ -61,9 +51,8 @@ public class ComputeResourcePolicyEntity implements Serializable {
@Column(name = "QUEUE_NAME")
private List<String> allowedBatchQueues;
- @ManyToOne(targetEntity = GroupResourceProfileEntity.class)
+ @ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private GroupResourceProfileEntity groupResourceProfile;
public ComputeResourcePolicyEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
index 4ad124c3e1..61681e2bfe 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
@@ -35,9 +35,6 @@ import jakarta.persistence.JoinColumns;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
/**
* The persistent class for the COMPUTE_RESOURCE_RESERVATION database table.
*/
@@ -67,12 +64,11 @@ public class ComputeResourceReservationEntity implements Serializable {
// TODO: FK queue table to BatchQueueEntity?
- @ManyToOne(targetEntity = GroupComputeResourcePrefEntity.class)
+ @ManyToOne(targetEntity = GroupComputeResourcePrefEntity.class, cascade = CascadeType.ALL)
@JoinColumns({
@JoinColumn(name = "RESOURCE_ID", referencedColumnName = "RESOURCE_ID", nullable = false, updatable = false),
@JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", referencedColumnName = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
})
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private GroupComputeResourcePrefEntity groupComputeResourcePref;
public ComputeResourceReservationEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
index f910d86ae7..696a3e7df3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
@@ -21,8 +21,6 @@ package org.apache.airavata.registry.core.entities.appcatalog;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
@@ -104,9 +102,8 @@ public class GroupComputeResourcePrefEntity implements Serializable {
@OrderBy("startTime ASC")
private List<ComputeResourceReservationEntity> reservations;
- @ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.PERSIST)
+ @ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private GroupResourceProfileEntity groupResourceProfile;
public GroupComputeResourcePrefEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
index e1f6d6488d..074904523b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
@@ -19,9 +19,6 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -58,12 +55,11 @@ public class GroupSSHAccountProvisionerConfig implements Serializable{
@Column(name = "CONFIG_VALUE")
private String configValue;
- @ManyToOne(targetEntity = GroupComputeResourcePrefEntity.class)
+ @ManyToOne(targetEntity = GroupComputeResourcePrefEntity.class, cascade = CascadeType.ALL)
@JoinColumns({
@JoinColumn(name = "RESOURCE_ID", referencedColumnName = "RESOURCE_ID", nullable = false),
@JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", referencedColumnName = "GROUP_RESOURCE_PROFILE_ID", nullable = false)
})
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private GroupComputeResourcePrefEntity groupComputeResourcePref;
public GroupSSHAccountProvisionerConfig() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
index cac0909c33..5074cfb797 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
@@ -20,9 +20,6 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.*;
import java.io.Serializable;
@@ -47,9 +44,8 @@ public class LibraryApendPathEntity implements Serializable {
@Column(name = "NAME")
private String name;
- @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE)
+ @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "DEPLOYMENT_ID")
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationDeploymentEntity applicationDeployment;
public LibraryApendPathEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
index 7c6b01b70b..9538894f0a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
@@ -20,9 +20,6 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.*;
import java.io.Serializable;
@@ -48,9 +45,8 @@ public class LibraryPrependPathEntity implements Serializable {
@Column(name="NAME")
private String name;
- @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE)
+ @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "DEPLOYMENT_ID")
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationDeploymentEntity applicationDeployment;
public LibraryPrependPathEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
index 6be32a65e7..b63e9410e4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
@@ -19,10 +19,6 @@
*
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.*;
import java.io.Serializable;
@@ -46,9 +42,8 @@ public class ModuleLoadCmdEntity implements Serializable {
@Column(name = "COMMAND_ORDER")
private int commandOrder;
- @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE)
+ @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "APP_DEPLOYMENT_ID")
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationDeploymentEntity applicationDeployment;
public ModuleLoadCmdEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
index babd441cd3..971d98767c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
@@ -20,9 +20,6 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.*;
import java.io.Serializable;
@@ -47,9 +44,8 @@ public class PostjobCommandEntity implements Serializable {
@Column(name = "COMMAND_ORDER")
private int commandOrder;
- @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE)
+ @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "APPDEPLOYMENT_ID")
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationDeploymentEntity applicationDeployment;
public PostjobCommandEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
index 644c56da15..e227f90395 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
@@ -20,9 +20,6 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
import jakarta.persistence.*;
import java.io.Serializable;
@@ -47,9 +44,8 @@ public class PrejobCommandEntity implements Serializable {
@Column(name = "COMMAND_ORDER")
private int commandOrder;
- @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE)
+ @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.ALL)
@JoinColumn(name = "APPDEPLOYMENT_ID")
- @ForeignKey(deleteAction = ForeignKeyAction.CASCADE)
private ApplicationDeploymentEntity applicationDeployment;
public PrejobCommandEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java
index 97bba99300..04fa5d8004 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java
@@ -1,46 +1,77 @@
package org.apache.airavata.registry.core.utils.migration;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.metamodel.Type;
import org.apache.airavata.common.utils.JDBCConfig;
import org.apache.airavata.common.utils.JPAUtils;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
-import org.apache.openjpa.jdbc.meta.MappingTool;
-import org.apache.openjpa.lib.util.Options;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
+import org.hibernate.dialect.MySQLDialect;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Properties;
+
public class MappingToolRunner {
private static Logger logger = LoggerFactory.getLogger(MappingToolRunner.class);
public static void run(JDBCConfig jdbcConfig, String outputFile, String persistenceUnitName) {
- run(jdbcConfig, outputFile, persistenceUnitName, MappingTool.ACTION_ADD);
+ run(jdbcConfig, outputFile, persistenceUnitName, "create");
}
- // schemaAction is one of MappingTool's supported actions: http://openjpa.apache.org/builds/2.4.3/apache-openjpa/docs/ref_guide_mapping.html#ref_guide_mapping_mappingtool
public static void run(JDBCConfig jdbcConfig, String outputFile, String persistenceUnitName, String schemaAction) {
- JDBCConfiguration jdbcConfiguration = new JDBCConfigurationImpl();
- jdbcConfiguration.fromProperties(JPAUtils.createConnectionProperties(jdbcConfig));
- jdbcConfiguration.setConnectionDriverName("org.apache.commons.dbcp.BasicDataSource");
-
- Options options = new Options();
- options.put("sqlFile", outputFile);
- // schemaAction "add" brings the schema up to date by adding missing schema elements
- // schemaAction "build" creates the entire schema as if the database is empty
- options.put("schemaAction", schemaAction);
- options.put("foreignKeys", "true");
- options.put("indexes", "true");
- options.put("primaryKeys", "true");
- // Specify persistence-unit name using it's anchor in the persistence.xml file
- // http://openjpa.apache.org/builds/2.4.3/apache-openjpa/docs/ref_guide_conf_devtools.html
- options.put("properties", "persistence.xml#" + persistenceUnitName);
+ Properties properties = new Properties();
+ properties.putAll(JPAUtils.createConnectionProperties(jdbcConfig));
+ properties.put("hibernate.dialect", MySQLDialect.class.getName());
+ properties.put("hibernate.hbm2ddl.auto", schemaAction);
+ StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+ .applySettings(properties)
+ .build();
+ MetadataSources metadataSources = new MetadataSources(registry);
+ Arrays.stream(getEntityClasses(persistenceUnitName)).forEach(metadataSources::addAnnotatedClass);
+
+ Metadata metadata = metadataSources.buildMetadata();
+ try (FileWriter fileWriter = new FileWriter(outputFile)) {
+ String schemaScript = generateSchema(metadata, registry);
+ fileWriter.write(schemaScript);
+ logger.info("Generated schema script at: {}", outputFile);
+ } catch (IOException e) {
+ logger.error("Failed to write schema script to file", e);
+ throw new RuntimeException("Failed to write schema script to file", e);
+ } finally {
+ StandardServiceRegistryBuilder.destroy(registry);
+ }
+ }
+
+ private static String generateSchema(Metadata metadata, StandardServiceRegistry registry) {
+ StringBuilder schemaScript = new StringBuilder();
+ SchemaCreatorImpl schemaCreator = new SchemaCreatorImpl(registry);
+ schemaCreator.generateCreationCommands(metadata, true).forEach(query -> {
+ schemaScript.append(query).append(";\n");
+ });
+ return schemaScript.toString();
+ }
+
+ private static Class<?>[] getEntityClasses(String persistenceUnitName) {
try {
- MappingTool.run(jdbcConfiguration, new String[] {}, options, null);
- } catch (Exception mappingToolEx) {
- logger.error("Failed to run MappingTool", mappingToolEx);
- throw new RuntimeException(
- "Failed to run MappingTool to generate migration script", mappingToolEx);
+ return Persistence.createEntityManagerFactory(persistenceUnitName)
+ .getMetamodel()
+ .getEntities()
+ .stream()
+ .map(Type::getJavaType)
+ .toArray(Class<?>[]::new);
+ } catch (Exception e) {
+ logger.error("Failed to load entity classes from persistence unit: {}", persistenceUnitName, e);
+ throw new RuntimeException("Failed to load entity classes from persistence unit", e);
}
}
}
diff --git a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
index f3b4ef035c..0dc11b6650 100644
--- a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
@@ -21,7 +21,7 @@
* -->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
<persistence-unit name="appcatalog_data_new">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.airavata.registry.core.entities.appcatalog.GridftpDataMovementEntity</class>
<class>org.apache.airavata.registry.core.entities.appcatalog.ResourceJobManagerEntity</class>
<class>org.apache.airavata.registry.core.entities.appcatalog.ComputeResourceEntity</class>
@@ -82,11 +82,11 @@
<class>org.apache.airavata.registry.core.entities.appcatalog.ComputeResourceReservationEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
- <property name="openjpa.jdbc.MappingDefaults"
- value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" />
+ <property name="hibernate.cascade" value="all"/>
</properties>
</persistence-unit>
<persistence-unit name="replicacatalog_data_new">
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.airavata.registry.core.entities.replicacatalog.ConfigurationEntity</class>
<class>org.apache.airavata.registry.core.entities.replicacatalog.DataProductEntity</class>
<class>org.apache.airavata.registry.core.entities.replicacatalog.DataProductMetadataEntity</class>
@@ -94,11 +94,11 @@
<class>org.apache.airavata.registry.core.entities.replicacatalog.DataReplicaMetadataEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
- <property name="openjpa.jdbc.MappingDefaults"
- value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" />
+ <property name="hibernate.cascade" value="all"/>
</properties>
</persistence-unit>
<persistence-unit name="workflowcatalog_data_new">
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.AiravataWorkflowEntity</class>
<class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.AiravataWorkflowErrorEntity</class>
<class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.AiravataWorkflowStatusEntity</class>
@@ -114,11 +114,11 @@
<class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.WorkflowHandlerEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
- <property name="openjpa.jdbc.MappingDefaults"
- value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" />
+ <property name="hibernate.cascade" value="all"/>
</properties>
</persistence-unit>
<persistence-unit name="experiment_data_new">
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentErrorEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentInputEntity</class>
@@ -149,8 +149,7 @@
<class>org.apache.airavata.registry.core.entities.expcatalog.UserEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
- <property name="openjpa.jdbc.MappingDefaults"
- value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" />
+ <property name="hibernate.cascade" value="all"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties b/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties
index ed79857f8d..6fe17b5fac 100644
--- a/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties
+++ b/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties
@@ -32,7 +32,7 @@
#for derby [AiravataJPARegistry]
registry.jdbc.driver=org.mariadb.jdbc.Driver
registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
-registry.jdbc.user=airavata
+registry.jdbc.user=root
registry.jdbc.password=123456
validationQuery=SELECT 1 from CONFIGURATION
@@ -48,7 +48,7 @@ default.registry.oauth.client.secret=client_secret
#for derby [AiravataJPARegistry]
appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
-appcatalog.jdbc.user=airavata
+appcatalog.jdbc.user=root
appcatalog.jdbc.password=123456
appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -58,6 +58,6 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
#for derby [AiravataJPARegistry]
replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
-replicacatalog.jdbc.user=airavata
+replicacatalog.jdbc.user=root
replicacatalog.jdbc.password=123456
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java
index 691ce406dd..734daf9c02 100644
--- a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java
+++ b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java
@@ -222,9 +222,9 @@ public class JPAClassGenerator extends AbstractGenerator{
public String generatePersistenceXmlEntry(JPAClassModel model){
String xmlEntry=null;
- xmlEntry=addLines(xmlEntry,"<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"1.0\">");
+ xmlEntry=addLines(xmlEntry,"<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"2.0\">");
xmlEntry=addLines(xmlEntry,tabs(1)+"<persistence-unit name=\"appcatalog_data\">");
- xmlEntry=addLines(xmlEntry,tabs(2)+"<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>");
+ xmlEntry=addLines(xmlEntry,tabs(2)+"<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>");
xmlEntry=addLines(xmlEntry,tabs(2)+"<class>"+getJpaClassPackageName()+"."+model.className+"</class>");
xmlEntry=addLines(xmlEntry,tabs(2)+"<exclude-unlisted-classes>true</exclude-unlisted-classes>");
xmlEntry=addLines(xmlEntry,tabs(1)+"</persistence-unit>");
diff --git a/modules/security/pom.xml b/modules/security/pom.xml
index a6f4c968b1..eb15c2c740 100644
--- a/modules/security/pom.xml
+++ b/modules/security/pom.xml
@@ -45,9 +45,9 @@
<version>${shiro-core.version}</version>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index aa5983f12b..bda0ba22d3 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -56,9 +56,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index b03624c8d9..12df6ede0b 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -66,9 +66,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
@@ -114,33 +114,6 @@
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.maven.plugin.version}</version>
- <configuration>
- <includes>**/entities/*.class</includes>
- <excludes>**/entities/XML*.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
<resources>
<resource>
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml b/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
index adcc54c1cb..596d3c2a92 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
<persistence-unit name="airavata-sharing-registry">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.airavata.sharing.registry.db.entities.DomainEntity</class>
<class>org.apache.airavata.sharing.registry.db.entities.EntityEntity</class>
<class>org.apache.airavata.sharing.registry.db.entities.EntityTypeEntity</class>
@@ -13,8 +13,7 @@
<class>org.apache.airavata.sharing.registry.db.entities.GroupAdminEntity</class>
<class>org.apache.airavata.sharing.registry.db.entities.UserGroupEntity</class>
<properties>
- <property name="openjpa.jdbc.MappingDefaults"
- value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" />
+ <property name="hibernate.cascade" value="all"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/pom.xml b/pom.xml
index 3fdd984a36..ca413c6163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<log4j2.slf4j.impl>2.24.3</log4j2.slf4j.impl>
<surefire.version>3.0.0-M4</surefire.version>
<junit.version>4.13.1</junit.version>
- <curator.version>5.6.0</curator.version>
+ <curator.version>5.7.1</curator.version>
<groovy.version>3.0.23</groovy.version>
<xpp3.version>1.1.6</xpp3.version>
<xpp5.version>1.2.8</xpp5.version>
@@ -141,15 +141,14 @@
<json.version>20250107</json.version>
<google.guava.version>33.2.1-jre</google.guava.version>
<jacoco.version>0.8.1</jacoco.version>
- <openjpa.maven.plugin.version>4.0.1</openjpa.maven.plugin.version>
- <openjpa.version>4.0.1</openjpa.version>
<dozer.version>5.4.0</dozer.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+ <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<angus-activation.version>2.0.2</angus-activation.version>
- <jaxb.version>2.4.0-b180830.0359</jaxb.version>
+ <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
<jmockit.version>1.44</jmockit.version>
<helix.version>1.4.3</helix.version>
<keycloak.admin.client.version>24.0.4</keycloak.admin.client.version>
@@ -171,8 +170,7 @@
<commons-beanutils.version>1.9.2</commons-beanutils.version>
<commons-io.version>2.18.0</commons-io.version>
<commons-pool2.version>2.12.1</commons-pool2.version>
- <commons-pool.version>1.6</commons-pool.version>
- <commons-dbcp.version>1.4</commons-dbcp.version>
+ <commons-dbcp2.version>2.13.0</commons-dbcp2.version>
<commons-cli.version>1.9.0</commons-cli.version>
<commons-email.version>1.5</commons-email.version>
<commons-codec.version>1.18.0</commons-codec.version>
@@ -221,11 +219,15 @@
<snappy-java.version>1.1.10.7</snappy-java.version>
<netty.version>4.1.113.Final</netty.version>
<logback.version>1.4.14</logback.version>
+ <hibernate-core.version>6.6.11.Final</hibernate-core.version>
<!-- From Agent Service -->
<protobuf-java.version>3.25.5</protobuf-java.version>
<protobuf-maven-plugin.version>2.12.1</protobuf-maven-plugin.version>
<grpc.version>1.63.0</grpc.version>
<j2objc-annotations.version>2.8</j2objc-annotations.version>
+ <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
+ <jaxb-runtime.version>4.0.5</jaxb-runtime.version>
+ <jboss-logging.version>3.5.3.Final</jboss-logging.version>
</properties>
<dependencies>
@@ -464,9 +466,9 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -482,7 +484,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
+ <version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -599,6 +601,36 @@
<artifactId>j2objc-annotations</artifactId>
<version>${j2objc-annotations.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>txw2</artifactId>
+ <version>${jaxb-runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta.transaction-api.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
(airavata) 05/09: get hibernate orm to validate against test db. manually specify catalog for conflicting entities.
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit c22eed23fe32d1617a17ba31f3efce255489732a
Author: yasithdev <ya...@icloud.com>
AuthorDate: Fri Mar 21 17:35:43 2025 +0000
get hibernate orm to validate against test db. manually specify catalog for conflicting entities.
---
.../commons/tenant/entities/GatewayEntity.java | 7 +-
.../common/utils/DBConnectionProvider.java | 185 +++++++++++++++++++++
.../org/apache/airavata/common/utils/JPAUtils.java | 3 +-
.../AiravataWorkflowErrorEntity.java | 6 +-
.../ApplicationErrorEntity.java | 6 +-
.../HandlerErrorEntity.java | 6 +-
.../HandlerInputEntity.java | 10 +-
.../HandlerOutputEntity.java | 6 +-
.../appcatalog/ApplicationInputEntity.java | 14 +-
.../appcatalog/ApplicationInterfaceEntity.java | 2 +-
.../appcatalog/ApplicationOutputEntity.java | 8 +-
.../appcatalog/BatchQueueResourcePolicyEntity.java | 2 +-
.../appcatalog/ComputeResourcePolicyEntity.java | 2 +-
.../ComputeResourcePreferenceEntity.java | 4 +-
.../entities/appcatalog/GatewayProfileEntity.java | 2 +-
.../appcatalog/GroupComputeResourcePrefEntity.java | 4 +-
.../appcatalog/JobManagerCommandEntity.java | 2 +-
.../entities/appcatalog/LocalSubmissionEntity.java | 2 +-
.../appcatalog/ParallelismCommandEntity.java | 2 +-
.../entities/appcatalog/ParserConnectorEntity.java | 6 +-
.../appcatalog/ParserConnectorInputEntity.java | 6 +-
.../entities/appcatalog/ParserInputEntity.java | 2 +-
.../entities/appcatalog/ParserOutputEntity.java | 2 +-
.../appcatalog/ParsingTemplateInputEntity.java | 4 +-
.../SSHAccountProvisionerConfiguration.java | 2 +-
.../appcatalog/SshJobSubmissionEntity.java | 2 +-
.../appcatalog/StoragePreferenceEntity.java | 2 +-
.../entities/appcatalog/StorageResourceEntity.java | 2 +-
.../core/entities/expcatalog/ExperimentEntity.java | 2 +-
.../entities/expcatalog/ExperimentErrorEntity.java | 6 +-
.../entities/expcatalog/ExperimentInputEntity.java | 12 +-
.../expcatalog/ExperimentOutputEntity.java | 8 +-
.../expcatalog/ExperimentStatusEntity.java | 2 +-
.../expcatalog/ExperimentSummaryEntity.java | 2 +-
.../core/entities/expcatalog/GatewayEntity.java | 2 +-
.../GatewayUsageReportingCommandEntity.java | 2 +-
.../core/entities/expcatalog/JobEntity.java | 6 +-
.../core/entities/expcatalog/JobStatusEntity.java | 2 +-
.../core/entities/expcatalog/ProcessEntity.java | 10 +-
.../entities/expcatalog/ProcessErrorEntity.java | 6 +-
.../entities/expcatalog/ProcessInputEntity.java | 12 +-
.../entities/expcatalog/ProcessOutputEntity.java | 8 +-
.../entities/expcatalog/ProcessStatusEntity.java | 2 +-
.../entities/expcatalog/ProcessWorkflowEntity.java | 6 +-
.../entities/expcatalog/ProcessWorkflowPK.java | 10 +-
.../entities/expcatalog/QueueStatusEntity.java | 4 +-
.../core/entities/expcatalog/TaskEntity.java | 6 +-
.../core/entities/expcatalog/TaskErrorEntity.java | 6 +-
.../core/entities/expcatalog/TaskStatusEntity.java | 2 +-
.../expcatalog/UserConfigurationDataEntity.java | 2 +-
.../entities/workflowcatalog/WorkflowEntity.java | 8 +-
.../workflowcatalog/WorkflowInputEntity.java | 12 +-
.../workflowcatalog/WorkflowOutputEntity.java | 4 +-
.../sharing/registry/db/entities/EntityEntity.java | 10 +-
.../sharing/registry/db/entities/UserEntity.java | 10 +-
pom.xml | 4 +-
56 files changed, 328 insertions(+), 139 deletions(-)
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
index b3d76aadea..20e8e6487e 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
@@ -23,12 +23,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.persistence.*;
-import java.util.Date;
+
+import java.io.Serializable;
import java.util.UUID;
@Entity
-@Table(name = "GATEWAY")
-public class GatewayEntity {
+@Table(name = "GATEWAY", catalog = "profile_service")
+public class GatewayEntity implements Serializable {
private final static Logger logger = LoggerFactory.getLogger(GatewayEntity.class);
private String airavataInternalGatewayId;
private String gatewayId;
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
new file mode 100644
index 0000000000..62fbc713b7
--- /dev/null
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBConnectionProvider.java
@@ -0,0 +1,185 @@
+package org.apache.airavata.common.utils;
+
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.checkerframework.checker.initialization.qual.Initialized;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.UnknownKeyFor;
+import org.hibernate.HibernateException;
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo;
+import org.hibernate.service.UnknownUnwrapTypeException;
+import org.hibernate.service.spi.Configurable;
+import org.hibernate.service.spi.Stoppable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.time.Duration;
+import java.util.Map;
+
+@SuppressWarnings({"unused"}) // implicitly used by the ORM
+public class DBConnectionProvider implements ConnectionProvider, Configurable, Stoppable {
+ private static final Logger logger = LoggerFactory.getLogger(DBConnectionProvider.class);
+ private static final String dataSourceAsString = """
+ BasicDataSource:
+ Driver={0},
+ URL={1},
+ Username={2},
+ ValidationQuery={3},
+ InitialSize={4},
+ MaxTotal={5},
+ MaxIdle={6},
+ MinIdle={7},
+ MaxWaitMs={8}
+ """;
+ private static BasicDataSource dataSource;
+
+ @Override
+ public void configure(Map configValues) throws HibernateException {
+ String driverClass = (String) configValues.get("hibernate.connection.driver_class");
+ String url = (String) configValues.get("hibernate.connection.url");
+ String username = (String) configValues.get("hibernate.connection.username");
+ String password = (String) configValues.get("hibernate.connection.password");
+ String validationQuery = (String) configValues.get("hibernate.connection.validationQuery");
+ int initialSize = Integer.parseInt((String) configValues.get("hibernate.dbcp2.initialSize"));
+ int maxTotal = Integer.parseInt((String) configValues.get("hibernate.dbcp2.maxTotal"));
+ int maxIdle = Integer.parseInt((String) configValues.get("hibernate.dbcp2.maxIdle"));
+ int minIdle = Integer.parseInt((String) configValues.get("hibernate.dbcp2.minIdle"));
+ int maxWaitMillis = Integer.parseInt((String) configValues.get("hibernate.dbcp2.maxWaitMillis"));
+
+ dataSource = new BasicDataSource();
+ dataSource.setDriverClassName(driverClass);
+ dataSource.setUrl(url);
+ dataSource.setUsername(username);
+ dataSource.setPassword(password);
+ if (validationQuery != null && !validationQuery.isEmpty()) {
+ dataSource.setValidationQuery(validationQuery);
+ }
+ dataSource.setInitialSize(initialSize);
+ dataSource.setMaxTotal(maxTotal);
+ dataSource.setMaxIdle(maxIdle);
+ dataSource.setMinIdle(minIdle);
+ dataSource.setMaxWait(Duration.ofMillis(maxWaitMillis));
+ logger.debug("DBCP2 DataSource configured : {}", url);
+ }
+
+ @Override
+ public Connection getConnection() throws SQLException {
+ return dataSource.getConnection();
+ }
+
+ @Override
+ public void closeConnection(Connection conn) throws SQLException {
+ conn.close();
+ }
+
+ @Override
+ public boolean supportsAggressiveRelease() {
+ return false;
+ }
+
+ /**
+ * Called by Hibernate during shutdown to close the DataSource.
+ */
+ @Override
+ public void stop() {
+ try {
+ dataSource.close();
+ logger.debug("DBCP2 DataSource closed.");
+ } catch (SQLException e) {
+ logger.error("Error closing DBCP2 DataSource", e);
+ }
+ }
+
+ /**
+ * For the Wrapped interface. Determines if this provider can be unwrapped as the given type.
+ */
+ @Override
+ public boolean isUnwrappableAs(Class<?> unwrapType) {
+ return unwrapType.isAssignableFrom(getClass()) || ConnectionProvider.class.equals(unwrapType);
+ }
+
+ /**
+ * For the Wrapped interface. Returns an instance of the specified unwrap type.
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public <@UnknownKeyFor @NonNull @Initialized T> T unwrap(@UnknownKeyFor @NonNull @Initialized Class<T> unwrapType) {
+ if (isUnwrappableAs(unwrapType)) {
+ return (T) this;
+ }
+ throw new UnknownUnwrapTypeException(unwrapType);
+ }
+
+ /**
+ * Provides connection info for Hibernate to display or use internally.
+ * If you wish, you can parse the DB name from the URL or set it to null.
+ */
+ @Override
+ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
+ return new DatabaseConnectionInfo() {
+ @Override
+ public String getJdbcUrl() {
+ return dataSource.getUrl();
+ }
+
+ @Override
+ public String getJdbcDriver() {
+ return dataSource.getDriverClassName();
+ }
+
+ @Override
+ public DatabaseVersion getDialectVersion() {
+ return DatabaseVersion.make(8, 0);
+ }
+
+ @Override
+ public String getAutoCommitMode() {
+ boolean autoCommit = dataSource.getDefaultAutoCommit();
+ return Boolean.toString(autoCommit);
+ }
+
+ @Override
+ public String getIsolationLevel() {
+ int isolation = dataSource.getDefaultTransactionIsolation();
+ return switch (isolation) {
+ case Connection.TRANSACTION_NONE -> "TRANSACTION_NONE";
+ case Connection.TRANSACTION_READ_UNCOMMITTED -> "TRANSACTION_READ_UNCOMMITTED";
+ case Connection.TRANSACTION_READ_COMMITTED -> "TRANSACTION_READ_COMMITTED";
+ case Connection.TRANSACTION_REPEATABLE_READ -> "TRANSACTION_REPEATABLE_READ";
+ case Connection.TRANSACTION_SERIALIZABLE -> "TRANSACTION_SERIALIZABLE";
+ default -> "UNKNOWN_ISOLATION_LEVEL";
+ };
+ }
+
+ @Override
+ public Integer getPoolMinSize() {
+ return dataSource.getConnectionPool().getMinIdle();
+ }
+
+ @Override
+ public Integer getPoolMaxSize() {
+ return dataSource.getConnectionPool().getMaxTotal();
+ }
+
+ @Override
+ public String toInfoString() {
+ return MessageFormat.format(dataSourceAsString,
+ dataSource.getDriverClassName(),
+ dataSource.getUrl(),
+ dataSource.getUserName(),
+ dataSource.getValidationQuery(),
+ dataSource.getInitialSize(),
+ dataSource.getMaxTotal(),
+ dataSource.getMaxIdle(),
+ dataSource.getMinIdle(),
+ dataSource.getMaxWaitDuration()
+ );
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
index 7d770f5f04..b3b295f616 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
@@ -19,7 +19,6 @@ public class JPAUtils {
private final static Map<String, String> DEFAULT_ENTITY_MANAGER_FACTORY_PROPERTIES;
static {
Map<String, String> properties = new HashMap<>();
- properties.put("hibernate.dialect", "org.hibernate.dialect.MySQLDialect");
properties.put("hibernate.hbm2ddl.auto", "validate");
properties.put("hibernate.dbcp2.initialSize", "5");
properties.put("hibernate.dbcp2.maxTotal", "20");
@@ -60,7 +59,7 @@ public class JPAUtils {
public static Map<String, String> createConnectionProperties(JDBCConfig jdbcConfig) {
Map<String, String> connectionProperties = new HashMap<>();
- connectionProperties.put("hibernate.connection.provider_class", "org.apache.commons.dbcp2.BasicDataSource");
+ connectionProperties.put("hibernate.connection.provider_class", "org.apache.airavata.common.utils.DBConnectionProvider");
connectionProperties.put("hibernate.connection.driver_class", jdbcConfig.getDriver());
connectionProperties.put("hibernate.connection.url", jdbcConfig.getURL() + "?autoReconnect=true");
connectionProperties.put("hibernate.connection.username", jdbcConfig.getUser());
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
index f26faf7471..6075873508 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
@@ -42,18 +42,18 @@ public class AiravataWorkflowErrorEntity implements Serializable {
private Timestamp creationTime;
@Lob
- @Column(name = "ACTUAL_ERROR_MESSAGE")
+ @Column(name = "ACTUAL_ERROR_MESSAGE", columnDefinition = "text")
private String actualErrorMessage;
@Lob
- @Column(name = "USER_FRIENDLY_MESSAGE")
+ @Column(name = "USER_FRIENDLY_MESSAGE", columnDefinition = "text")
private String userFriendlyMessage;
@Column(name = "TRANSIENT_OR_PERSISTENT")
private boolean transientOrPersistent;
@Lob
- @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST", columnDefinition = "text")
private String rootCauseErrorIdList;
@ManyToOne(targetEntity = AiravataWorkflowEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
index 9f94516baa..3fb368095f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
@@ -42,18 +42,18 @@ public class ApplicationErrorEntity implements Serializable {
private Timestamp creationTime;
@Lob
- @Column(name = "ACTUAL_ERROR_MESSAGE")
+ @Column(name = "ACTUAL_ERROR_MESSAGE", columnDefinition = "text")
private String actualErrorMessage;
@Lob
- @Column(name = "USER_FRIENDLY_MESSAGE")
+ @Column(name = "USER_FRIENDLY_MESSAGE", columnDefinition = "text")
private String userFriendlyMessage;
@Column(name = "TRANSIENT_OR_PERSISTENT")
private boolean transientOrPersistent;
@Lob
- @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST", columnDefinition = "text")
private String rootCauseErrorIdList;
@ManyToOne(targetEntity = WorkflowApplicationEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
index 4b9318554e..8041855b64 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
@@ -42,18 +42,18 @@ public class HandlerErrorEntity implements Serializable {
private Timestamp creationTime;
@Lob
- @Column(name = "ACTUAL_ERROR_MESSAGE")
+ @Column(name = "ACTUAL_ERROR_MESSAGE", columnDefinition = "text")
private String actualErrorMessage;
@Lob
- @Column(name = "USER_FRIENDLY_MESSAGE")
+ @Column(name = "USER_FRIENDLY_MESSAGE", columnDefinition = "text")
private String userFriendlyMessage;
@Column(name = "TRANSIENT_OR_PERSISTENT")
private boolean transientOrPersistent;
@Lob
- @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST", columnDefinition = "text")
private String rootCauseErrorIdList;
@ManyToOne(targetEntity = WorkflowHandlerEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
index f4c12f2251..06328c3c24 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
@@ -50,10 +50,10 @@ public class HandlerInputEntity implements Serializable {
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "STANDARD_INPUT")
+ @Column(name = "STANDARD_INPUT", columnDefinition = "smallint")
private boolean standardInput;
- @Column(name = "USER_FRIENDLY_DESCRIPTION")
+ @Column(name = "USER_FRIENDLY_DESCRIPTION", columnDefinition = "text")
private String userFriendlyDescription;
@Column(name = "METADATA", length = 4096)
@@ -62,19 +62,19 @@ public class HandlerInputEntity implements Serializable {
@Column(name = "INPUT_ORDER")
private int inputOrder;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "REQUIRED_TO_ADDED_TO_COMMAND_LINE")
private boolean requiredToAddedToCommandLine;
- @Column(name = "DATA_STAGED")
+ @Column(name = "DATA_STAGED", columnDefinition = "smallint")
private boolean dataStaged;
@Column(name = "STORAGE_RESOURCE_ID")
private String storageResourceId;
- @Column(name = "IS_READ_ONLY")
+ @Column(name = "IS_READ_ONLY", columnDefinition = "smallint")
private boolean isReadOnly;
@ManyToOne(targetEntity = WorkflowHandlerEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
index 1d97d78f4c..dc0140b293 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
@@ -50,13 +50,13 @@ public class HandlerOutputEntity implements Serializable {
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "REQUIRED_TO_ADDED_TO_COMMAND_LINE")
private boolean requiredToAddedToCommandLine;
- @Column(name = "DATA_MOVEMENT")
+ @Column(name = "DATA_MOVEMENT", columnDefinition = "smallint")
private boolean dataMovement;
@Column(name = "LOCATION")
@@ -65,7 +65,7 @@ public class HandlerOutputEntity implements Serializable {
@Column(name = "SEARCH_QUERY")
private String searchQuery;
- @Column(name = "OUTPUT_STREAMING")
+ @Column(name = "OUTPUT_STREAMING", columnDefinition = "tinyint")
private boolean outputStreaming;
@Column(name = "STORAGE_RESOURCE_ID")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
index 422b8f3091..709d1a3916 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -46,7 +46,7 @@ public class ApplicationInputEntity implements Serializable {
@Column(name = "APP_ARGUMENT")
private String applicationArgument;
- @Column(name = "DATA_STAGED")
+ @Column(name = "DATA_STAGED", columnDefinition = "smallint")
private boolean dataStaged;
@Column(name = "DATA_TYPE")
@@ -56,26 +56,26 @@ public class ApplicationInputEntity implements Serializable {
@Column(name = "INPUT_ORDER")
private int inputOrder;
- @Column(name = "INPUT_VALUE")
+ @Column(name = "INPUT_VALUE", columnDefinition = "text")
private String value;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "METADATA", length = 4096)
private String metaData;
- @Column(name = "REQUIRED_TO_COMMANDLINE")
+ @Column(name = "REQUIRED_TO_COMMANDLINE", columnDefinition = "smallint")
private boolean requiredToAddedToCommandLine;
- @Column(name = "STANDARD_INPUT")
+ @Column(name = "STANDARD_INPUT", columnDefinition = "smallint")
private boolean standardInput;
@Lob
- @Column(name = "USER_FRIENDLY_DESC")
+ @Column(name = "USER_FRIENDLY_DESC", columnDefinition = "text")
private String userFriendlyDescription;
- @Column(name = "IS_READ_ONLY")
+ @Column(name = "IS_READ_ONLY", columnDefinition = "smallint")
private boolean isReadOnly;
@Column(name = "OVERRIDE_FILENAME")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
index e7cb80b60e..50255b7fff 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
@@ -45,7 +45,7 @@ public class ApplicationInterfaceEntity implements Serializable {
@Column(name="APPLICATION_NAME")
private String applicationName;
- @Column(name="ARCHIVE_WORKING_DIRECTORY")
+ @Column(name="ARCHIVE_WORKING_DIRECTORY", columnDefinition = "smallint")
private boolean archiveWorkingDirectory;
@Column(name="CREATION_TIME", nullable = false, updatable = false)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
index 1b85b8ba5c..41924b2b44 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
@@ -45,7 +45,7 @@ public class ApplicationOutputEntity implements Serializable {
@Column(name = "APP_ARGUMENT")
private String applicationArgument;
- @Column(name = "DATA_MOVEMENT")
+ @Column(name = "DATA_MOVEMENT", columnDefinition = "smallint")
private boolean dataMovement;
@Column(name = "DATA_NAME_LOCATION")
@@ -55,16 +55,16 @@ public class ApplicationOutputEntity implements Serializable {
@Enumerated(EnumType.STRING)
private DataType type;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
- @Column(name = "OUTPUT_STREAMING")
+ @Column(name = "OUTPUT_STREAMING", columnDefinition = "smallint")
private boolean outputStreaming;
@Column(name = "OUTPUT_VALUE")
private String value;
- @Column(name = "REQUIRED_TO_COMMANDLINE")
+ @Column(name = "REQUIRED_TO_COMMANDLINE", columnDefinition = "smallint")
private boolean requiredToAddedToCommandLine;
@Column(name = "SEARCH_QUERY")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
index a71db03771..6a4b55ce35 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java
@@ -56,7 +56,7 @@ public class BatchQueueResourcePolicyEntity implements Serializable {
private Integer maxAllowedWalltime;
@ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.ALL)
- @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, nullable = false, updatable = false)
private GroupResourceProfileEntity groupResourceProfile;
public BatchQueueResourcePolicyEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
index 714fdc5667..3ac496244d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java
@@ -52,7 +52,7 @@ public class ComputeResourcePolicyEntity implements Serializable {
private List<String> allowedBatchQueues;
@ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.ALL)
- @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, nullable = false, updatable = false)
private GroupResourceProfileEntity groupResourceProfile;
public ComputeResourcePolicyEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
index 484ea3be27..c855437c51 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
@@ -33,7 +33,7 @@ import java.util.List;
* The persistent class for the compute_resource_preference database table.
*/
@Entity
-@Table(name = "COMPUTE_RESOURCE_PREFERENCE")
+@Table(name = "COMPUTE_RESOURCE_PREFERENCE", catalog = "app_catalog")
@IdClass(ComputeResourcePreferencePK.class)
public class ComputeResourcePreferenceEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -52,7 +52,7 @@ public class ComputeResourcePreferenceEntity implements Serializable {
@Column(name = "LOGIN_USERNAME")
private String loginUserName;
- @Column(name = "OVERRIDE_BY_AIRAVATA")
+ @Column(name = "OVERRIDE_BY_AIRAVATA", columnDefinition = "smallint")
private boolean overridebyAiravata;
@Column(name = "PREFERED_BATCH_QUEUE")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
index 7bde137074..4835b04b59 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
@@ -30,7 +30,7 @@ import java.util.List;
* The persistent class for the gateway_profile database table.
*/
@Entity
-@Table(name = "GATEWAY_PROFILE")
+@Table(name = "GATEWAY_PROFILE", catalog = "app_catalog")
public class GatewayProfileEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
index 696a3e7df3..6632bc5f95 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
@@ -63,7 +63,7 @@ public class GroupComputeResourcePrefEntity implements Serializable {
@Column(name = "LOGIN_USERNAME")
private String loginUserName;
- @Column(name = "OVERRIDE_BY_AIRAVATA")
+ @Column(name = "OVERRIDE_BY_AIRAVATA", columnDefinition = "smallint")
private short overridebyAiravata;
@Column(name = "PREFERED_BATCH_QUEUE")
@@ -103,7 +103,7 @@ public class GroupComputeResourcePrefEntity implements Serializable {
private List<ComputeResourceReservationEntity> reservations;
@ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.ALL)
- @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, nullable = false, updatable = false)
private GroupResourceProfileEntity groupResourceProfile;
public GroupComputeResourcePrefEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
index 40c86e60a6..8940d83919 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
@@ -47,7 +47,7 @@ public class JobManagerCommandEntity implements Serializable {
private String command;
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
+ @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false, nullable = false)
private ResourceJobManagerEntity resourceJobManager;
public JobManagerCommandEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
index a94a305405..7b1570520f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
@@ -52,7 +52,7 @@ public class LocalSubmissionEntity implements Serializable {
private SecurityProtocol securityProtocol;
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
+ @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false, nullable = false)
private ResourceJobManagerEntity resourceJobManager;
public LocalSubmissionEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
index 1fdcff5c2b..993e7c798b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
@@ -47,7 +47,7 @@ public class ParallelismCommandEntity implements Serializable {
private String command;
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
+ @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false, nullable = false)
private ResourceJobManagerEntity resourceJobManager;
public ParallelismCommandEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
index 4668b84657..e49521d88a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
@@ -47,15 +47,15 @@ public class ParserConnectorEntity implements Serializable {
private List<ParserConnectorInputEntity> connectorInputs;
@ManyToOne(targetEntity = ParserEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARENT_PARSER_ID")
+ @JoinColumn(name = "PARENT_PARSER_ID", insertable = false, updatable = false, nullable = false)
private ParserEntity parentParser;
@ManyToOne(targetEntity = ParserEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "CHILD_PARSER_ID")
+ @JoinColumn(name = "CHILD_PARSER_ID", insertable = false, updatable = false, nullable = false)
private ParserEntity childParser;
@ManyToOne(targetEntity = ParsingTemplateEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSING_TEMPLATE_ID")
+ @JoinColumn(name = "PARSING_TEMPLATE_ID", insertable = false, updatable = false, nullable = false)
private ParsingTemplateEntity parsingTemplate;
public String getId() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
index ac559e06e5..3e4c89cc1c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
@@ -45,15 +45,15 @@ public class ParserConnectorInputEntity implements Serializable {
private String parserConnectorId;
@ManyToOne(targetEntity = ParserInputEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSER_INPUT_ID")
+ @JoinColumn(name = "PARSER_INPUT_ID", insertable = false, updatable = false, nullable = false)
private ParserInputEntity input;
@ManyToOne(targetEntity = ParserOutputEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSER_OUTPUT_ID")
+ @JoinColumn(name = "PARSER_OUTPUT_ID", insertable = false, updatable = false, nullable = false)
private ParserOutputEntity output;
@ManyToOne(targetEntity = ParserConnectorEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSER_CONNECTOR_ID")
+ @JoinColumn(name = "PARSER_CONNECTOR_ID", insertable = false, updatable = false, nullable = false)
private ParserConnectorEntity parserConnector;
public String getId() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
index 8c78259d50..22ed5f051a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
@@ -42,7 +42,7 @@ public class ParserInputEntity implements Serializable {
private String parserId;
@ManyToOne(targetEntity = ParserEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSER_ID")
+ @JoinColumn(name = "PARSER_ID", insertable = false, updatable = false, nullable = false)
private ParserEntity parser;
@Column(name = "INPUT_TYPE")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
index 6142db0758..e34fe408d4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
@@ -42,7 +42,7 @@ public class ParserOutputEntity implements Serializable {
private String parserId;
@ManyToOne(targetEntity = ParserEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSER_ID")
+ @JoinColumn(name = "PARSER_ID", insertable = false, updatable = false, nullable = false)
private ParserEntity parser;
@Column(name = "OUTPUT_TYPE")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
index 8bacbb089e..341e435553 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
@@ -45,11 +45,11 @@ public class ParsingTemplateInputEntity implements Serializable {
private String parsingTemplateId;
@ManyToOne(targetEntity = ParserInputEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "TARGET_PARSER_INPUT_ID")
+ @JoinColumn(name = "TARGET_PARSER_INPUT_ID", insertable = false, updatable = false, nullable = false)
private ParserInputEntity input;
@ManyToOne(targetEntity = ParsingTemplateEntity.class, cascade = CascadeType.MERGE)
- @JoinColumn(name = "PARSING_TEMPLATE_ID")
+ @JoinColumn(name = "PARSING_TEMPLATE_ID", insertable = false, updatable = false, nullable = false)
private ParsingTemplateEntity parsingTemplate;
public String getId() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java
index 7f6ce23c60..f6323ddcd1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SSHAccountProvisionerConfiguration.java
@@ -27,7 +27,7 @@ import jakarta.persistence.*;
*
*/
@Entity
-@Table(name = "SSH_ACCOUNT_PROVISIONER_CONFIG")
+@Table(name = "SSH_ACCOUNT_PROVISIONER_CONFIG", catalog = "app_catalog")
@IdClass(SSHAccountProvisionerConfigurationPK.class)
public class SSHAccountProvisionerConfiguration {
@Id
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
index 6839fd1034..2f7a554b4e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
@@ -42,7 +42,7 @@ public class SshJobSubmissionEntity implements Serializable {
private String jobSubmissionInterfaceId;
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, nullable = false, updatable = false)
private ResourceJobManagerEntity resourceJobManager;
@Column(name="ALTERNATIVE_SSH_HOSTNAME")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
index 1bbab9d984..65062a5dd1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
@@ -27,7 +27,7 @@ import java.io.Serializable;
* The persistent class for the storage_preference database table.
*/
@Entity
-@Table(name = "STORAGE_PREFERENCE")
+@Table(name = "STORAGE_PREFERENCE", catalog = "app_catalog")
@IdClass(StoragePreferencePK.class)
public class StoragePreferenceEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
index 2c790d8082..f517b37b21 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
@@ -43,7 +43,7 @@ public class StorageResourceEntity implements Serializable {
@Column(name = "DESCRIPTION")
private String storageResourceDescription;
- @Column(name = "ENABLED")
+ @Column(name = "ENABLED", columnDefinition = "smallint")
private boolean enabled;
@Column(name = "HOST_NAME")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index ccdd8066a1..f4259ef470 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -74,7 +74,7 @@ public class ExperimentEntity implements Serializable {
public boolean enableEmailNotification;
@Lob
- @Column(name = "EMAIL_ADDRESSES")
+ @Column(name = "EMAIL_ADDRESSES", columnDefinition = "text")
public String emailAddresses;
@OneToOne(targetEntity = UserConfigurationDataEntity.class, cascade = CascadeType.ALL,
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
index b383b2a993..5b8c3fcf81 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
@@ -46,18 +46,18 @@ public class ExperimentErrorEntity implements Serializable {
private Timestamp creationTime;
@Lob
- @Column(name = "ACTUAL_ERROR_MESSAGE")
+ @Column(name = "ACTUAL_ERROR_MESSAGE", columnDefinition = "text")
private String actualErrorMessage;
@Lob
- @Column(name = "USER_FRIENDLY_MESSAGE")
+ @Column(name = "USER_FRIENDLY_MESSAGE", columnDefinition = "text")
private String userFriendlyMessage;
@Column(name = "TRANSIENT_OR_PERSISTENT")
private boolean transientOrPersistent;
@Lob
- @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST", columnDefinition = "text")
private String rootCauseErrorIdList;
@ManyToOne(targetEntity = ExperimentEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index 7e66abf593..ddfe9d93d7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -43,7 +43,7 @@ public class ExperimentInputEntity implements Serializable {
private String name;
@Lob
- @Column(name = "INPUT_VALUE")
+ @Column(name = "INPUT_VALUE", columnDefinition = "text")
private String value;
@Column(name = "DATA_TYPE")
@@ -53,11 +53,11 @@ public class ExperimentInputEntity implements Serializable {
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "STANDARD_INPUT")
+ @Column(name = "STANDARD_INPUT", columnDefinition = "smallint")
private boolean standardInput;
@Lob
- @Column(name = "USER_FRIENDLY_DESCRIPTION")
+ @Column(name = "USER_FRIENDLY_DESCRIPTION", columnDefinition = "text")
private String userFriendlyDescription;
@Column(name = "METADATA", length = 4096)
@@ -66,19 +66,19 @@ public class ExperimentInputEntity implements Serializable {
@Column(name = "INPUT_ORDER")
private int inputOrder;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "REQUIRED_TO_ADDED_TO_CMD")
private boolean requiredToAddedToCommandLine;
- @Column(name = "DATA_STAGED")
+ @Column(name = "DATA_STAGED", columnDefinition = "smallint")
private boolean dataStaged;
@Column(name = "STORAGE_RESOURCE_ID")
private String storageResourceId;
- @Column(name = "IS_READ_ONLY")
+ @Column(name = "IS_READ_ONLY", columnDefinition = "smallint")
private boolean isReadOnly;
@Column(name = "OVERRIDE_FILENAME")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
index 051f32b229..1eb50a1e9f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -43,7 +43,7 @@ public class ExperimentOutputEntity implements Serializable {
private String name;
@Lob
- @Column(name = "OUTPUT_VALUE")
+ @Column(name = "OUTPUT_VALUE", columnDefinition = "text")
private String value;
@Column(name = "DATA_TYPE")
@@ -53,13 +53,13 @@ public class ExperimentOutputEntity implements Serializable {
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "REQUIRED_TO_ADDED_TO_CMD")
private boolean requiredToAddedToCommandLine;
- @Column(name = "DATA_MOVEMENT")
+ @Column(name = "DATA_MOVEMENT", columnDefinition = "smallint")
private boolean dataMovement;
@Column(name = "LOCATION")
@@ -68,7 +68,7 @@ public class ExperimentOutputEntity implements Serializable {
@Column(name = "SEARCH_QUERY")
private String searchQuery;
- @Column(name = "OUTPUT_STREAMING")
+ @Column(name = "OUTPUT_STREAMING", columnDefinition = "smallint")
private boolean outputStreaming;
@Column(name = "STORAGE_RESOURCE_ID")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
index 01a2fb8e4f..7fd47159b0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
@@ -51,7 +51,7 @@ public class ExperimentStatusEntity implements Serializable {
private Timestamp timeOfStateChange;
@Lob
- @Column(name = "REASON")
+ @Column(name = "REASON", columnDefinition = "longtext")
private String reason;
@ManyToOne(targetEntity = ExperimentEntity.class, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
index ecdd53e213..28a4dcf99d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
@@ -26,7 +26,7 @@ import java.sql.Timestamp;
/**
* The class for the experiment_summary view.
*/
-@Entity
+//@Entity // @yasithdev EXPERIMENT_SUMMARY not in db. commenting to skip validation.
@Table(name = "EXPERIMENT_SUMMARY")
public class ExperimentSummaryEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
index a6059ff42c..42ca12e5d9 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
@@ -30,7 +30,7 @@ import java.sql.Timestamp;
* The persistent class for the gateway database table.
*/
@Entity
-@Table(name="GATEWAY")
+@Table(name = "GATEWAY", catalog = "experiment_catalog")
public class GatewayEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
index 51ab550969..6e7371e752 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
@@ -37,7 +37,7 @@ public class GatewayUsageReportingCommandEntity implements Serializable {
private String computeResourceId;
@Lob
- @Column(name = "COMMAND")
+ @Column(name = "COMMAND", columnDefinition = "longtext")
private String command;
public String getGatewayId() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
index d22b355cae..176ccfefc3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -46,7 +46,7 @@ public class JobEntity implements Serializable {
private String processId;
@Lob
- @Column(name = "JOB_DESCRIPTION")
+ @Column(name = "JOB_DESCRIPTION", columnDefinition = "longtext")
private String jobDescription;
@Column(name = "CREATION_TIME")
@@ -62,11 +62,11 @@ public class JobEntity implements Serializable {
private String workingDir;
@Lob
- @Column(name = "STD_OUT")
+ @Column(name = "STD_OUT", columnDefinition = "longtext")
private String stdOut;
@Lob
- @Column(name = "STD_ERR")
+ @Column(name = "STD_ERR", columnDefinition = "longtext")
private String stdErr;
@Column(name = "EXIT_CODE")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
index 82d301b252..e6d74846ad 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
@@ -55,7 +55,7 @@ public class JobStatusEntity implements Serializable {
private Timestamp timeOfStateChange;
@Lob
- @Column(name = "REASON")
+ @Column(name = "REASON", columnDefinition = "longtext")
private String reason;
@ManyToOne(targetEntity = JobEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index d7428c6fa2..90e4570958 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -49,7 +49,7 @@ public class ProcessEntity implements Serializable {
private Timestamp lastUpdateTime;
@Lob
- @Column(name = "PROCESS_DETAIL")
+ @Column(name = "PROCESS_DETAIL", columnDefinition = "text")
private String processDetail;
@Column(name = "APPLICATION_INTERFACE_ID")
@@ -62,7 +62,7 @@ public class ProcessEntity implements Serializable {
private String computeResourceId;
@Lob
- @Column(name = "TASK_DAG")
+ @Column(name = "TASK_DAG", columnDefinition = "text")
private String taskDag;
@Column(name = "GATEWAY_EXECUTION_ID")
@@ -72,7 +72,7 @@ public class ProcessEntity implements Serializable {
private boolean enableEmailNotification;
@Lob
- @Column(name = "EMAIL_ADDRESSES")
+ @Column(name = "EMAIL_ADDRESSES", columnDefinition = "text")
private String emailAddresses;
@Column(name = "STORAGE_RESOURCE_ID")
@@ -81,7 +81,7 @@ public class ProcessEntity implements Serializable {
@Column(name = "USER_DN")
private String userDn;
- @Column(name = "GENERATE_CERT")
+ @Column(name = "GENERATE_CERT", columnDefinition = "smallint")
private boolean generateCert;
@Column(name = "EXPERIMENT_DATA_DIR", length = 512)
@@ -122,7 +122,7 @@ public class ProcessEntity implements Serializable {
private List<TaskEntity> tasks;
@ManyToOne(targetEntity = ExperimentEntity.class, fetch = FetchType.LAZY)
- @JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID", insertable = false, nullable = false, updatable = false)
private ExperimentEntity experiment;
@OneToMany(targetEntity = ProcessWorkflowEntity.class, cascade = CascadeType.ALL,
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
index 7fc3655019..7a1d2ad716 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
@@ -46,18 +46,18 @@ public class ProcessErrorEntity implements Serializable {
private Timestamp creationTime;
@Lob
- @Column(name = "ACTUAL_ERROR_MESSAGE")
+ @Column(name = "ACTUAL_ERROR_MESSAGE", columnDefinition = "text")
private String actualErrorMessage;
@Lob
- @Column(name = "USER_FRIENDLY_MESSAGE")
+ @Column(name = "USER_FRIENDLY_MESSAGE", columnDefinition = "text")
private String userFriendlyMessage;
@Column(name = "TRANSIENT_OR_PERSISTENT")
private boolean transientOrPersistent;
@Lob
- @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST", columnDefinition = "text")
private String rootCauseErrorIdList;
@ManyToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
index c876d98862..d2f1a7ea41 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -43,7 +43,7 @@ public class ProcessInputEntity implements Serializable {
private String name;
@Lob
- @Column(name = "INPUT_VALUE")
+ @Column(name = "INPUT_VALUE", columnDefinition = "text")
private String value;
@Column(name = "DATA_TYPE")
@@ -53,11 +53,11 @@ public class ProcessInputEntity implements Serializable {
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "STANDARD_INPUT")
+ @Column(name = "STANDARD_INPUT", columnDefinition = "smallint")
private boolean standardInput;
@Lob
- @Column(name = "USER_FRIENDLY_DESCRIPTION")
+ @Column(name = "USER_FRIENDLY_DESCRIPTION", columnDefinition = "text")
private String userFriendlyDescription;
@Column(name = "METADATA", length = 4096)
@@ -66,19 +66,19 @@ public class ProcessInputEntity implements Serializable {
@Column(name = "INPUT_ORDER")
private int inputOrder;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "REQUIRED_TO_ADDED_TO_CMD")
private boolean requiredToAddedToCommandLine;
- @Column(name = "DATA_STAGED")
+ @Column(name = "DATA_STAGED", columnDefinition = "smallint")
private boolean dataStaged;
@Column(name = "STORAGE_RESOURCE_ID")
private String storageResourceId;
- @Column(name = "IS_READ_ONLY")
+ @Column(name = "IS_READ_ONLY", columnDefinition = "smallint")
private boolean isReadOnly;
@Column(name = "OVERRIDE_FILENAME")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
index 1746a9d539..c8c7ccec33 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
@@ -43,7 +43,7 @@ public class ProcessOutputEntity implements Serializable {
private String name;
@Lob
- @Column(name = "OUTPUT_VALUE")
+ @Column(name = "OUTPUT_VALUE", columnDefinition = "longtext")
private String value;
@Column(name = "DATA_TYPE")
@@ -53,13 +53,13 @@ public class ProcessOutputEntity implements Serializable {
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "REQUIRED_TO_ADDED_TO_CMD")
private boolean requiredToAddedToCommandLine;
- @Column(name = "DATA_MOVEMENT")
+ @Column(name = "DATA_MOVEMENT", columnDefinition = "smallint")
private boolean dataMovement;
@Column(name = "LOCATION")
@@ -68,7 +68,7 @@ public class ProcessOutputEntity implements Serializable {
@Column(name = "SEARCH_QUERY")
private String searchQuery;
- @Column(name = "OUTPUT_STREAMING")
+ @Column(name = "OUTPUT_STREAMING", columnDefinition = "smallint")
private boolean outputStreaming;
@Column(name = "STORAGE_RESOURCE_ID")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
index f223b654f3..b33dc6e6c8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
@@ -51,7 +51,7 @@ public class ProcessStatusEntity implements Serializable {
private Timestamp timeOfStateChange;
@Lob
- @Column(name = "REASON")
+ @Column(name = "REASON", columnDefinition = "longtext")
private String reason;
@ManyToOne(targetEntity = ProcessEntity.class, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java
index d35c065e4e..de9f731e46 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowEntity.java
@@ -1,12 +1,14 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
+import java.io.Serializable;
import java.sql.Timestamp;
@Entity
@Table(name = "PROCESS_WORKFLOW")
@IdClass(ProcessWorkflowPK.class)
-public class ProcessWorkflowEntity {
+public class ProcessWorkflowEntity implements Serializable {
@Id
@Column(name = "PROCESS_ID")
@@ -23,7 +25,7 @@ public class ProcessWorkflowEntity {
private String type;
@ManyToOne(targetEntity = ProcessEntity.class, fetch = FetchType.LAZY)
- @JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID", insertable = false, nullable = false, updatable = false)
private ProcessEntity process;
public String getProcessId() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
index fbd26e88eb..7436e560be 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
@@ -9,8 +9,10 @@ public class ProcessWorkflowPK implements Serializable {
private String processId;
private String workflowId;
- @Id
- @Column(name = "PROCESS_ID")
+ public ProcessWorkflowPK() {}
+
+// @Id
+// @Column(name = "PROCESS_ID")
public String getProcessId() {
return processId;
}
@@ -19,8 +21,8 @@ public class ProcessWorkflowPK implements Serializable {
this.processId = processId;
}
- @Id
- @Column(name = "WORKFLOW_ID")
+// @Id
+// @Column(name = "WORKFLOW_ID")
public String getWorkflowId() {
return workflowId;
}
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
index f6e76921d2..4f93fe16e5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
@@ -43,13 +43,13 @@ public class QueueStatusEntity implements Serializable {
private String queueName;
@Id
- @Column(name = "CREATED_TIME")
+ @Column(name = "CREATED_TIME", columnDefinition = "bigint")
private BigInteger time;
@Column(name = "QUEUE_UP")
private boolean queueUp;
- @Column(name = "RUNNING_JOBS")
+ @Column(name = "RUNNING_JOBS", columnDefinition = "int")
private boolean runningJobs;
@Column(name = "QUEUED_JOBS")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
index ce17df8ce5..03904b0cee 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
@@ -53,11 +53,11 @@ public class TaskEntity implements Serializable {
private Timestamp lastUpdateTime;
@Lob
- @Column(name = "TASK_DETAIL")
+ @Column(name = "TASK_DETAIL", columnDefinition = "text")
private String taskDetail;
@Lob
- @Column(name = "SUB_TASK_MODEL")
+ @Column(name = "SUB_TASK_MODEL", columnDefinition = "blob")
private byte[] subTaskModel;
@OneToMany(targetEntity = TaskStatusEntity.class, cascade = CascadeType.ALL,
@@ -74,7 +74,7 @@ public class TaskEntity implements Serializable {
private List<JobEntity> jobs;
@ManyToOne(targetEntity = ProcessEntity.class, fetch = FetchType.LAZY)
- @JoinColumn(name = "PARENT_PROCESS_ID", referencedColumnName = "PROCESS_ID", nullable = false, updatable = false)
+ @JoinColumn(name = "PARENT_PROCESS_ID", referencedColumnName = "PROCESS_ID", insertable = false, nullable = false, updatable = false)
private ProcessEntity process;
public TaskEntity() {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
index 79c8eb2631..32cd7e5d75 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
@@ -46,18 +46,18 @@ public class TaskErrorEntity implements Serializable {
private Timestamp creationTime;
@Lob
- @Column(name = "ACTUAL_ERROR_MESSAGE")
+ @Column(name = "ACTUAL_ERROR_MESSAGE", columnDefinition = "text")
private String actualErrorMessage;
@Lob
- @Column(name = "USER_FRIENDLY_MESSAGE")
+ @Column(name = "USER_FRIENDLY_MESSAGE", columnDefinition = "text")
private String userFriendlyMessage;
@Column(name = "TRANSIENT_OR_PERSISTENT")
private boolean transientOrPersistent;
@Lob
- @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST", columnDefinition = "text")
private String rootCauseErrorIdList;
@ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
index ba8ff2b496..4e0bb568fe 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
@@ -51,7 +51,7 @@ public class TaskStatusEntity implements Serializable {
private Timestamp timeOfStateChange;
@Lob
- @Column(name = "REASON")
+ @Column(name = "REASON", columnDefinition = "longtext")
private String reason;
@ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
index 2126e99c68..629c62158a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
@@ -51,7 +51,7 @@ public class UserConfigurationDataEntity implements Serializable {
@Column(name = "USER_DN")
private String userDN;
- @Column(name = "GENERATE_CERT")
+ @Column(name = "GENERATE_CERT", columnDefinition = "smallint")
private boolean generateCert;
@Column(name = "RESOURCE_HOST_ID")
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
index eb498b67d1..3f75cfec31 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.workflowcatalog;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
-import java.nio.ByteBuffer;
+//import java.nio.ByteBuffer;
import java.util.List;
import jakarta.persistence.*;
import java.io.Serializable;
@@ -54,7 +54,7 @@ public class WorkflowEntity implements Serializable {
private String graph;
@Column(name = "IMAGE")
- private ByteBuffer image;
+ private byte[] image;
@Column(name = "UPDATE_TIME")
private Timestamp updateTime;
@@ -123,12 +123,12 @@ public class WorkflowEntity implements Serializable {
this.graph = graph;
}
- public ByteBuffer getImage() {
+ public byte[] getImage() {
return this.image;
}
- public void setImage(ByteBuffer image) {
+ public void setImage(byte[] image) {
this.image = image;
}
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
index f7d7accef8..5777584ae5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
@@ -43,7 +43,7 @@ public class WorkflowInputEntity implements Serializable {
@Column(name = "APP_ARGUMENT")
private String applicationArgument;
- @Column(name = "DATA_STAGED")
+ @Column(name = "DATA_STAGED", columnDefinition = "smallint")
private boolean dataStaged;
@Column(name = "DATA_TYPE")
@@ -52,22 +52,22 @@ public class WorkflowInputEntity implements Serializable {
@Column(name = "INPUT_ORDER")
private int inputOrder;
- @Column(name = "INPUT_VALUE")
+ @Column(name = "INPUT_VALUE", columnDefinition = "text")
private String inputValue;
- @Column(name = "IS_REQUIRED")
+ @Column(name = "IS_REQUIRED", columnDefinition = "smallint")
private boolean isRequired;
@Column(name = "METADATA")
private String metaData;
- @Column(name = "REQUIRED_TO_COMMANDLINE")
+ @Column(name = "REQUIRED_TO_COMMANDLINE", columnDefinition = "smallint")
private boolean requiredToAddedToCommandLine;
- @Column(name = "STANDARD_INPUT")
+ @Column(name = "STANDARD_INPUT", columnDefinition = "smallint")
private boolean standardInput;
- @Column(name = "USER_FRIENDLY_DESC")
+ @Column(name = "USER_FRIENDLY_DESC", columnDefinition = "text")
private String userFriendlyDescription;
@ManyToOne(targetEntity = WorkflowEntity.class, cascade = CascadeType.MERGE)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java
index a80cf9c73c..f6c3dadf04 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java
@@ -53,7 +53,7 @@ public class WorkflowOutputEntity implements Serializable {
@Column(name="DATA_TYPE")
private String type;
- @Column(name="IS_REQUIRED")
+ @Column(name="IS_REQUIRED", columnDefinition = "smallint")
private short isRequired;
@Column(name="OUTPUT_STREAMING")
@@ -62,7 +62,7 @@ public class WorkflowOutputEntity implements Serializable {
@Column(name="OUTPUT_VALUE")
private String value;
- @Column(name="REQUIRED_TO_COMMANDLINE")
+ @Column(name="REQUIRED_TO_COMMANDLINE", columnDefinition = "smallint")
private short requiredToAddedToCommandLine;
@Column(name="SEARCH_QUERY")
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
index 0b914388a4..6c764ed494 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.persistence.*;
-import java.nio.ByteBuffer;
+//import java.nio.ByteBuffer;
@Entity
@Table(name = "ENTITY", schema = "")
@@ -37,7 +37,7 @@ public class EntityEntity {
private String parentEntityId;
private String name;
private String description;
- private ByteBuffer binaryData;
+ private byte[] binaryData;
private String fullText;
private Long originalEntityCreationTime;
private Long sharedCount;
@@ -115,12 +115,12 @@ public class EntityEntity {
}
@Lob
- @Column(name="BINARY_DATA")
- public ByteBuffer getBinaryData() {
+ @Column(name="BINARY_DATA", columnDefinition = "blob")
+ public byte[] getBinaryData() {
return binaryData;
}
- public void setBinaryData(ByteBuffer binaryData) {
+ public void setBinaryData(byte[] binaryData) {
this.binaryData = binaryData;
}
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
index 903456e506..965f4155e8 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.persistence.*;
-import java.nio.ByteBuffer;
+//import java.nio.ByteBuffer;
@Entity
@Table(name = "SHARING_USER", schema = "") // USER is a reserved term in derby
@@ -36,7 +36,7 @@ public class UserEntity {
private String firstName;
private String lastName;
private String email;
- private ByteBuffer icon;
+ private byte[] icon;
private Long createdTime;
private Long updatedTime;
@@ -101,12 +101,12 @@ public class UserEntity {
}
@Lob
- @Column(name = "ICON")
- public ByteBuffer getIcon() {
+ @Column(name = "ICON", columnDefinition = "blob")
+ public byte[] getIcon() {
return icon;
}
- public void setIcon(ByteBuffer icon) {
+ public void setIcon(byte[] icon) {
this.icon = icon;
}
diff --git a/pom.xml b/pom.xml
index ca413c6163..d49e1e0ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
<mysql.connector.version>8.2.0</mysql.connector.version>
<skipTests>false</skipTests>
<google.gson.version>2.10.1</google.gson.version>
- <zk.version>3.9.2</zk.version>
+ <zk.version>3.9.3</zk.version>
<amqp.client.version>4.12.0</amqp.client.version>
<snakeyaml.version>2.2</snakeyaml.version>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
@@ -150,7 +150,7 @@
<angus-activation.version>2.0.2</angus-activation.version>
<jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
<jmockit.version>1.44</jmockit.version>
- <helix.version>1.4.3</helix.version>
+ <helix.version>1.4.0</helix.version>
<keycloak.admin.client.version>24.0.4</keycloak.admin.client.version>
<resteasy.version>6.2.12.Final</resteasy.version>
<httpclient.version>4.5.14</httpclient.version>
(airavata) 07/09: fix deprecations, cleanup code. add placeholders for job monitor email/pw in airavata-server.properties
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit d5f575c940305b365c25f14eb197f55bbdaf834e
Author: yasithdev <ya...@icloud.com>
AuthorDate: Fri Mar 21 23:43:19 2025 +0000
fix deprecations, cleanup code. add placeholders for job monitor email/pw in airavata-server.properties
---
airavata-api/airavata-api-server/pom.xml | 21 -
.../api/server/handler/AiravataServerHandler.java | 23 +-
airavata-api/airavata-api-stubs/pom.xml | 27 -
.../airavata/api/client/AiravataClientFactory.java | 3 +-
airavata-api/airavata-base-api/pom.xml | 2 -
.../java-client-samples/pom.xml | 11 -
.../airavata/client/samples/CancelExperiments.java | 7 +-
.../tools/RegisterSampleApplicationsUtils.java | 3 +-
airavata-api/airavata-data-models/pom.xml | 29 -
airavata-api/airavata-model-utils/pom.xml | 2 -
.../airavata/model/util/ComputeResourceUtil.java | 4 -
.../GroupComputeResourcePreferenceUtilTest.java | 8 +-
airavata-services/pom.xml | 2 -
.../iam-admin-services-core/pom.xml | 36 +-
airavata-services/profile-service/pom.xml | 1 -
.../profile/client/samples/UserProfileSample.java | 3 -
.../profile-service-commons/pom.xml | 28 +-
.../commons/repositories/AbstractRepository.java | 16 +-
.../commons/tenant/entities/GatewayEntity.java | 3 +-
.../user/entities/NSFDemographicsEntity.java | 1 +
.../commons/user/entities/UserProfileEntity.java | 1 +
.../service/profile/commons/utils/JPAUtils.java | 1 -
.../commons/utils/ObjectMapperSingleton.java | 18 +-
.../commons/utils/ProfileServiceJDBCConfig.java | 1 -
.../handlers/GroupManagerServiceHandler.java | 8 +-
.../profile/handlers/IamAdminServicesHandler.java | 6 +-
.../handlers/UserProfileServiceHandler.java | 3 +-
.../profile/server/ProfileServiceServer.java | 6 +-
.../profile-service/profile-tenant-core/pom.xml | 1 -
.../profile-service/profile-user-core/pom.xml | 8 +-
.../core/repositories/UserProfileRepository.java | 4 +-
airavata-services/services-security/pom.xml | 60 +-
modules/agent-framework/agent-service/pom.xml | 20 +-
.../service/controllers/AgentController.java | 7 +-
.../service/controllers/ExperimentController.java | 11 +-
.../service/controllers/PlanController.java | 8 +-
.../service/db/entity/AgentExecution.java | 3 +-
.../service/handlers/AgentConnectionHandler.java | 18 +-
.../service/handlers/AgentManagementHandler.java | 10 +-
.../service/models/AgentLaunchRequest.java | 4 +-
.../service/services/AiravataFileService.java | 24 +-
.../service/services/AiravataService.java | 13 +-
modules/airavata-helix/agent-api/pom.xml | 33 +-
.../apache/airavata/agents/api/AdaptorParams.java | 2 +-
.../apache/airavata/agents/api/AgentAdaptor.java | 3 -
.../apache/airavata/agents/api/CommandOutput.java | 2 -
.../airavata-helix/agent-impl/ssh-agent/pom.xml | 1 -
.../airavata/helix/agent/ssh/SshAdaptorParams.java | 4 +-
.../airavata/helix/agent/ssh/SshAgentAdaptor.java | 4 +-
.../helix/agent/ssh/StandardOutReader.java | 5 +-
.../airavata/helix/adaptor/PoolingSSHJClient.java | 4 +-
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 9 +-
modules/airavata-helix/helix-spectator/pom.xml | 26 +-
.../helix/impl/controller/HelixController.java | 2 -
.../airavata/helix/impl/task/AiravataTask.java | 41 +-
.../airavata/helix/impl/task/TaskContext.java | 19 +-
.../impl/task/cancel/CancelCompletingTask.java | 1 -
.../helix/impl/task/completing/CompletingTask.java | 2 -
.../helix/impl/task/parsing/DataParsingTask.java | 6 +-
.../impl/task/parsing/ParsingTriggeringTask.java | 8 +-
.../impl/task/staging/OutputDataStagingTask.java | 4 -
.../task/submission/DefaultJobSubmissionTask.java | 17 +-
.../impl/task/submission/JobSubmissionTask.java | 3 +-
.../task/submission/LocalJobSubmissionTask.java | 8 -
.../task/submission/config/GroovyMapBuilder.java | 6 +-
.../config/app/ForkJobConfiguration.java | 4 +-
.../config/app/HTCondorJobConfiguration.java | 6 +-
.../submission/config/app/LSFJobConfiguration.java | 4 +-
.../submission/config/app/PBSJobConfiguration.java | 4 +-
.../config/app/SlurmJobConfiguration.java | 8 +-
.../submission/config/app/UGEJobConfiguration.java | 4 +-
.../config/app/parser/HTCondorOutputParser.java | 1 -
.../helix/impl/workflow/ParserWorkflowManager.java | 3 +-
.../helix/impl/workflow/PostWorkflowManager.java | 14 +-
.../helix/impl/workflow/PreWorkflowManager.java | 4 +-
modules/airavata-helix/task-api/pom.xml | 43 +-
.../helix/task/api/support/AdaptorSupport.java | 6 +-
.../task-api/src/main/resources/logback.xml | 28 +
modules/airavata-helix/task-core/pom.xml | 14 -
.../org/apache/airavata/helix/core/OutPort.java | 1 -
.../helix/core/participant/HelixParticipant.java | 6 +-
.../core/support/adaptor/AdaptorSupportImpl.java | 4 +-
.../helix/core/support/adaptor/AgentStore.java | 1 -
.../apache/airavata/helix/core/util/TaskUtil.java | 5 +-
modules/airavata-helix/workflow-impl/pom.xml | 16 -
.../metadata/analyzer/impl/DataAnalyzerImpl.java | 1 -
.../metascheduler/core/api/ProcessScheduler.java | 4 -
.../airavata/metascheduler/core/utils/Utils.java | 1 -
.../scheduling/api/ProcessSchedulerImpl.java | 1 -
.../ComputeResourceSelectionPolicyImpl.java | 1 -
.../DefaultComputeResourceSelectionPolicy.java | 1 -
.../selection/MultipleComputeResourcePolicy.java | 6 +-
.../rescheduler/ExponentialBackOffReScheduler.java | 1 -
.../engine/rescheduler/ProcessScannerImpl.java | 2 -
.../monitoring/ClusterStatusMonitorJob.java | 2 +-
.../ClusterStatusMonitorJobScheduler.java | 12 +-
modules/commons/pom.xml | 70 +--
.../airavata/common/utils/ApplicationSettings.java | 6 +-
.../common/utils/DBEventManagerConstants.java | 2 -
.../airavata/common/utils/DatabaseCreator.java | 7 +-
.../airavata/common/utils/DerbyTestUtil.java | 16 +-
.../apache/airavata/common/utils/DerbyUtil.java | 8 +-
.../org/apache/airavata/common/utils/IOUtil.java | 14 +-
.../org/apache/airavata/common/utils/JPAUtils.java | 8 +-
.../org/apache/airavata/common/utils/JSONUtil.java | 13 +-
.../apache/airavata/common/utils/StringUtil.java | 147 ++---
.../apache/airavata/common/utils/SwingUtil.java | 18 +-
.../airavata/common/utils/ThriftClientPool.java | 6 +-
.../apache/airavata/common/utils/WSConstants.java | 7 -
.../org/apache/airavata/common/utils/WSDLUtil.java | 525 +++-------------
.../airavata/common/utils/SecurityUtilTest.java | 1 -
.../common/utils/ThriftClientPoolTest.java | 12 +-
.../ComputationalResourceMonitoringService.java | 1 -
.../monitoring/job/ComputeResourceMonitor.java | 2 -
.../resource/monitoring/job/MonitoringJob.java | 1 -
.../src/main/resources/airavata-server.properties | 299 ++++-----
.../server/src/main/resources/logback.xml | 53 ++
.../credential-store-service/pom.xml | 78 +--
.../impl/certificate/CertificateCredential.java | 1 +
.../store/credential/impl/ssh/SSHCredential.java | 1 +
.../store/notifier/NotifierBootstrap.java | 5 +-
.../store/notifier/impl/EmailNotifier.java | 5 +-
.../store/server/CredentialStoreServerHandler.java | 7 +-
.../store/servlet/CredentialBootstrapper.java | 34 +-
.../servlet/CredentialStoreCallbackServlet.java | 280 ++++-----
.../store/servlet/CredentialStoreStartServlet.java | 181 +++---
.../store/impl/CertificateCredentialWriter.java | 4 +-
.../store/store/impl/CredentialReaderImpl.java | 2 +-
.../store/store/impl/SSHCredentialWriter.java | 6 +-
.../credential/store/store/impl/db/ParentDAO.java | 1 -
.../credential/store/util/TokenGenerator.java | 1 -
.../store/notifier/impl/EmailNotifierTest.java | 1 -
.../credential-store-stubs/pom.xml | 38 --
.../store/client/CredentialStoreClientFactory.java | 2 -
.../credential/store/client/TestSSLClient.java | 5 +-
.../db/event/manager/DBEventManagerRunner.java | 6 +-
.../messaging/DBEventManagerMessagingFactory.java | 1 -
.../messaging/impl/DBEventMessageHandler.java | 4 -
.../airavata/db/event/manager/utils/Constants.java | 4 -
.../event/manager/utils/DbEventManagerZkUtils.java | 1 -
modules/distribution/pom.xml | 88 +--
.../src/main/assembly/api-server-bin-assembly.xml | 60 +-
.../src/main/assembly/api-server-src-assembly.xml | 78 ---
.../src/main/assembly/controller-bin-assembly.xml | 75 +--
.../main/assembly/email-monitor-bin-assembly.xml | 17 +-
.../src/main/assembly/parser-wm-bin-assembly.xml | 73 +--
.../src/main/assembly/participant-bin-assembly.xml | 77 +--
.../src/main/assembly/post-wm-bin-assembly.xml | 55 +-
.../src/main/assembly/pre-wm-bin-assembly.xml | 50 +-
.../assembly/realtime-monitor-bin-assembly.xml | 20 +-
modules/file-server/pom.xml | 8 +-
.../file/server/FileServerApplication.java | 1 -
.../file/server/FileServerConfiguration.java | 1 -
modules/ide-integration/pom.xml | 4 +
.../app/tests/selenium/pom.xml | 21 +-
.../src/main/resources/airavata-server.properties | 5 +-
modules/job-monitor/email-monitor/pom.xml | 1 +
.../airavata/monitor/email/EmailBasedMonitor.java | 15 +-
.../email/parser/AiravataCustomMailParser.java | 4 +-
.../airavata/monitor/email/parser/EmailParser.java | 5 +-
.../monitor/email/parser/HTCondorEmailParser.java | 5 +-
.../monitor/email/parser/LSFEmailParser.java | 4 +-
.../monitor/email/parser/PBSEmailParser.java | 5 +-
.../monitor/email/parser/SLURMEmailParser.java | 4 +-
.../monitor/email/parser/UGEEmailParser.java | 4 +-
modules/job-monitor/job-monitor-api/pom.xml | 1 -
.../apache/airavata/monitor/JobStateValidator.java | 10 +-
.../monitor/kafka/JobStatusResultDeserializer.java | 2 +-
modules/job-monitor/pom.xml | 2 -
.../src/main/resources/log4j.properties | 28 -
.../src/main/resources/log4j2.xml | 53 --
.../src/main/resources/logback.xml | 35 ++
modules/messaging/client/pom.xml | 8 +-
.../messaging/client/RabbitMQListener.java | 12 +-
.../airavata/messaging/client/TestReader.java | 3 -
modules/messaging/core/pom.xml | 12 +-
.../airavata/messaging/core/MessagingFactory.java | 9 +-
.../apache/airavata/messaging/core/TestClient.java | 1 -
.../messaging/core/impl/ExperimentConsumer.java | 30 +-
.../messaging/core/impl/MessageConsumer.java | 29 +-
.../messaging/core/impl/ProcessConsumer.java | 28 +-
.../messaging/core/impl/RabbitMQPublisher.java | 7 +-
.../messaging/core/impl/RabbitMQSubscriber.java | 9 +-
.../messaging/core/impl/StatusConsumer.java | 16 +-
.../messaging/core/stats/LatencyWriterTask.java | 1 -
.../airavata/messaging/core/stats/StatCounter.java | 2 +-
.../messaging/core/util/DBEventPublisherUtils.java | 8 +-
modules/orchestrator/orchestrator-client/pom.xml | 13 +-
modules/orchestrator/orchestrator-core/pom.xml | 26 -
.../orchestrator/core/schedule/HostScheduler.java | 4 +-
.../orchestrator/core/utils/OrchestratorUtils.java | 5 +-
.../core/validator/JobMetadataValidator.java | 1 -
.../core/validator/impl/BatchQueueValidator.java | 3 +-
modules/orchestrator/orchestrator-service/pom.xml | 16 +-
.../server/OrchestratorServerHandler.java | 2 +-
.../util/OrchestratorServerThreadPoolExecutor.java | 7 +-
modules/platform-monitoring/pom.xml | 2 +-
modules/registry/registry-core/pom.xml | 65 +-
.../AiravataWorkflowEntity.java | 1 +
.../AiravataWorkflowErrorEntity.java | 1 +
.../AiravataWorkflowStatusEntity.java | 2 +-
.../ApplicationErrorEntity.java | 1 +
.../ApplicationStatusEntity.java | 2 +-
.../HandlerErrorEntity.java | 1 +
.../HandlerInputEntity.java | 2 +-
.../HandlerOutputEntity.java | 2 +-
.../HandlerStatusEntity.java | 1 +
.../WorkflowApplicationEntity.java | 3 +-
.../WorkflowConnectionEntity.java | 2 +-
.../WorkflowDataBlockEntity.java | 1 +
.../WorkflowHandlerEntity.java | 2 +-
.../entities/appcatalog/AppEnvironmentEntity.java | 1 +
.../appcatalog/AppModuleMappingEntity.java | 1 +
.../appcatalog/ApplicationDeploymentEntity.java | 2 +-
.../appcatalog/ApplicationInputEntity.java | 2 +-
.../appcatalog/ApplicationInterfaceEntity.java | 1 +
.../appcatalog/ApplicationModuleEntity.java | 1 +
.../appcatalog/ApplicationOutputEntity.java | 2 +-
.../core/entities/appcatalog/BatchQueueEntity.java | 1 +
.../appcatalog/CloudJobSubmissionEntity.java | 2 +-
.../entities/appcatalog/ComputeResourceEntity.java | 2 +-
.../ComputeResourceFileSystemEntity.java | 2 +-
.../ComputeResourcePreferenceEntity.java | 2 +-
.../ComputeResourceReservationEntity.java | 14 +-
.../appcatalog/DataMovementInterfaceEntity.java | 2 +-
.../entities/appcatalog/GatewayGroupsEntity.java | 1 +
.../entities/appcatalog/GatewayProfileEntity.java | 1 +
.../appcatalog/GlobusGkEndpointEntity.java | 1 +
.../appcatalog/GlobusSubmissionEntity.java | 2 +-
.../appcatalog/GridftpDataMovementEntity.java | 2 +-
.../entities/appcatalog/GridftpEndpointEntity.java | 1 +
.../appcatalog/GroupComputeResourcePrefEntity.java | 15 +-
.../appcatalog/GroupResourceProfileEntity.java | 9 +-
.../GroupSSHAccountProvisionerConfig.java | 11 +-
.../entities/appcatalog/GsisshExportEntity.java | 1 +
.../appcatalog/GsisshPostjobcommandEntity.java | 1 +
.../appcatalog/GsisshPrejobcommandEntity.java | 1 +
.../appcatalog/GsisshSubmissionEntity.java | 1 +
.../appcatalog/JobManagerCommandEntity.java | 2 +-
.../appcatalog/JobSubmissionInterfaceEntity.java | 2 +-
.../appcatalog/LibraryApendPathEntity.java | 1 +
.../appcatalog/LibraryPrependPathEntity.java | 1 +
.../appcatalog/LocalDataMovementEntity.java | 1 +
.../entities/appcatalog/LocalSubmissionEntity.java | 2 +-
.../entities/appcatalog/ModuleLoadCmdEntity.java | 2 +
.../appcatalog/ParallelismCommandEntity.java | 2 +-
.../entities/appcatalog/ParserConnectorEntity.java | 1 +
.../appcatalog/ParserConnectorInputEntity.java | 1 +
.../core/entities/appcatalog/ParserEntity.java | 1 +
.../entities/appcatalog/ParserInputEntity.java | 1 +
.../entities/appcatalog/ParserOutputEntity.java | 1 +
.../entities/appcatalog/ParsingTemplateEntity.java | 1 +
.../appcatalog/ParsingTemplateInputEntity.java | 1 +
.../entities/appcatalog/PostjobCommandEntity.java | 1 +
.../entities/appcatalog/PrejobCommandEntity.java | 1 +
.../appcatalog/ResourceJobManagerEntity.java | 2 +-
.../entities/appcatalog/ScpDataMovementEntity.java | 2 +-
.../appcatalog/SshJobSubmissionEntity.java | 2 +-
.../appcatalog/StorageInterfaceEntity.java | 2 +-
.../appcatalog/StoragePreferenceEntity.java | 1 +
.../entities/appcatalog/StorageResourceEntity.java | 1 +
.../appcatalog/UnicoreDatamovementEntity.java | 7 +-
.../appcatalog/UnicoreSubmissionEntity.java | 2 +-
.../UserComputeResourcePreferenceEntity.java | 1 +
.../appcatalog/UserResourceProfileEntity.java | 3 +-
.../ComputationalResourceSchedulingEntity.java | 1 +
.../core/entities/expcatalog/ExperimentEntity.java | 2 +-
.../entities/expcatalog/ExperimentErrorEntity.java | 2 +-
.../entities/expcatalog/ExperimentInputEntity.java | 2 +-
.../expcatalog/ExperimentOutputEntity.java | 2 +-
.../expcatalog/ExperimentStatusEntity.java | 2 +-
.../expcatalog/ExperimentSummaryEntity.java | 5 +-
.../core/entities/expcatalog/GatewayEntity.java | 2 +-
.../GatewayUsageReportingCommandEntity.java | 1 +
.../entities/expcatalog/GatewayWorkerEntity.java | 1 +
.../core/entities/expcatalog/JobEntity.java | 1 +
.../core/entities/expcatalog/JobStatusEntity.java | 2 +-
.../entities/expcatalog/NotificationEntity.java | 2 +-
.../core/entities/expcatalog/ProcessEntity.java | 1 +
.../entities/expcatalog/ProcessErrorEntity.java | 2 +-
.../entities/expcatalog/ProcessInputEntity.java | 2 +-
.../entities/expcatalog/ProcessOutputEntity.java | 2 +-
.../expcatalog/ProcessResourceScheduleEntity.java | 1 +
.../entities/expcatalog/ProcessStatusEntity.java | 2 +-
.../entities/expcatalog/ProcessWorkflowPK.java | 2 -
.../core/entities/expcatalog/ProjectEntity.java | 7 +-
.../entities/expcatalog/ProjectUserEntity.java | 1 +
.../entities/expcatalog/QueueStatusEntity.java | 2 +-
.../core/entities/expcatalog/QueueStatusPK.java | 1 -
.../core/entities/expcatalog/TaskEntity.java | 2 +-
.../core/entities/expcatalog/TaskErrorEntity.java | 2 +-
.../core/entities/expcatalog/TaskStatusEntity.java | 2 +-
.../expcatalog/UserConfigurationDataEntity.java | 1 +
.../replicacatalog/ConfigurationEntity.java | 1 +
.../entities/replicacatalog/DataProductEntity.java | 2 +-
.../replicacatalog/DataProductMetadataEntity.java | 1 +
.../replicacatalog/DataReplicaLocationEntity.java | 2 +-
.../replicacatalog/DataReplicaMetadataEntity.java | 1 +
.../workflowcatalog/ComponentStatusEntity.java | 1 +
.../core/entities/workflowcatalog/EdgeEntity.java | 2 +-
.../core/entities/workflowcatalog/NodeEntity.java | 2 +-
.../core/entities/workflowcatalog/PortEntity.java | 2 +-
.../entities/workflowcatalog/WorkflowEntity.java | 7 +-
.../workflowcatalog/WorkflowInputEntity.java | 1 +
.../workflowcatalog/WorkflowOutputEntity.java | 1 +
.../workflowcatalog/WorkflowStatusEntity.java | 1 +
.../core/repositories/AbstractRepository.java | 2 +-
.../appcatalog/AppCatAbstractRepository.java | 3 +-
.../ApplicationDeploymentRepository.java | 4 +-
.../appcatalog/ApplicationInterfaceRepository.java | 4 +-
.../appcatalog/ComputeResourceRepository.java | 37 +-
.../appcatalog/DataMovementRepository.java | 2 +-
.../appcatalog/GroupResourceProfileRepository.java | 6 +-
.../appcatalog/GwyResourceProfileRepository.java | 2 +-
.../JobSubmissionInterfaceRepository.java | 2 +-
.../repositories/appcatalog/ParserRepository.java | 2 +-
.../appcatalog/ResourceJobManagerRepository.java | 6 +-
.../appcatalog/StorageResourceRepository.java | 3 +-
.../UserComputeResourcePreferenceRepository.java | 2 -
.../appcatalog/UserResourceProfileRepository.java | 8 +-
.../UserStoragePreferenceRepository.java | 2 -
.../expcatalog/ExpCatAbstractRepository.java | 3 +-
.../expcatalog/ExperimentErrorRepository.java | 2 +-
.../expcatalog/ExperimentInputRepository.java | 2 +-
.../expcatalog/ExperimentOutputRepository.java | 2 +-
.../expcatalog/ExperimentRepository.java | 4 +-
.../expcatalog/ExperimentStatusRepository.java | 2 +-
.../expcatalog/ExperimentSummaryRepository.java | 9 +-
.../repositories/expcatalog/GatewayRepository.java | 2 +-
.../GatewayUsageReportingCommandRepository.java | 2 +-
.../repositories/expcatalog/JobRepository.java | 2 +-
.../expcatalog/JobStatusRepository.java | 5 +-
.../expcatalog/NotificationRepository.java | 2 +-
.../expcatalog/ProcessErrorRepository.java | 9 +-
.../expcatalog/ProcessInputRepository.java | 4 +-
.../expcatalog/ProcessOutputRepository.java | 4 +-
.../repositories/expcatalog/ProcessRepository.java | 2 +-
.../expcatalog/ProcessStatusRepository.java | 3 +-
.../expcatalog/ProcessWorkflowRepository.java | 2 +-
.../repositories/expcatalog/ProjectRepository.java | 7 +-
.../expcatalog/QueueStatusRepository.java | 2 +-
.../expcatalog/TaskErrorRepository.java | 2 +-
.../repositories/expcatalog/TaskRepository.java | 2 +-
.../expcatalog/TaskStatusRepository.java | 2 +-
.../replicacatalog/DataProductRepository.java | 9 +-
.../DataReplicaLocationRepository.java | 2 +-
.../replicacatalog/RepCatAbstractRepository.java | 3 +-
.../WorkflowCatAbstractRepository.java | 3 +-
.../workflowcatalog/WorkflowRepository.java | 7 +-
.../core/utils/AppCatalogDBInitConfig.java | 2 -
.../registry/core/utils/CustomBeanFactory.java | 22 +-
.../utils/DozerConverter/CsvStringConverter.java | 4 +-
.../utils/DozerConverter/StorageDateConverter.java | 2 +-
.../core/utils/JPAUtil/AppCatalogJPAUtils.java | 1 -
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 1 -
.../core/utils/JPAUtil/RepCatalogJPAUtils.java | 1 -
.../utils/JPAUtil/WorkflowCatalogJPAUtils.java | 1 -
.../registry/core/utils/ObjectMapperSingleton.java | 25 +-
.../registry/core/utils/QueryConstants.java | 4 -
.../core/utils/migration/MappingToolRunner.java | 3 +-
.../utils/migration/MigrationSchemaGenerator.java | 10 +-
.../ApplicationDeploymentRepositoryTest.java | 53 +-
.../appcatalog/GatewayProfileRepositoryTest.java | 4 +-
.../GroupResourceProfileRepositoryTest.java | 12 +-
.../appcatalog/StorageResourceRepositoryTest.java | 6 +-
.../UserResourceProfileRepositoryTest.java | 4 +-
.../core/repositories/common/TestBase.java | 6 +-
.../expcatalog/ExperimentErrorRepositoryTest.java | 1 +
.../expcatalog/ExperimentInputRepositoryTest.java | 1 +
.../expcatalog/ExperimentOutputRepositoryTest.java | 1 +
.../expcatalog/GatewayRepositoryTest.java | 4 +-
.../repositories/expcatalog/JobRepositoryTest.java | 5 +-
.../expcatalog/ProcessErrorRepositoryTest.java | 1 +
.../expcatalog/ProcessInputRepositoryTest.java | 1 +
.../expcatalog/ProcessOutputRepositoryTest.java | 1 +
.../expcatalog/ProcessStatusRepositoryTest.java | 4 +-
.../expcatalog/QueueStatusRepositoryTest.java | 1 +
.../replicacatalog/DataProductRepositoryTest.java | 10 +-
.../DataReplicaLocationRepositoryTest.java | 1 -
.../core/utils/ObjectMapperSingletonTest.java | 25 +
modules/registry/registry-cpi/pom.xml | 2 -
.../airavata/registry/cpi/UsrResourceProfile.java | 3 +-
.../airavata/registry/cpi/WorkflowCatalog.java | 3 -
.../registry-server/registry-api-service/pom.xml | 8 -
.../registry/api/service/RegistryAPIServer.java | 8 +-
.../api/service/handler/RegistryServerHandler.java | 3 +-
.../registry-server/registry-api-stubs/pom.xml | 3 -
.../computeresource/BatchQueueGenerator.java | 5 +-
.../ComputeResourceDescriptionGenerator.java | 5 +-
.../DataMovementInterfaceGenerator.java | 5 +-
.../computeresource/FileSystemsGenerator.java | 5 +-
.../GridFTPDataMovementGenerator.java | 5 +-
.../computeresource/GridFTPEndpointsGenerator.java | 5 +-
.../JobManagerCommandGenerator.java | 5 +-
.../JobSubmissionInterfaceGenerator.java | 5 +-
.../LocalDataMovementGenerator.java | 5 +-
.../computeresource/LocalSubmissionGenerator.java | 5 +-
.../ResourceJobManagerGenerator.java | 5 +-
.../computeresource/SCPDataMovementGenerator.java | 5 +-
.../computeresource/SSHJobSubmissionGenerator.java | 5 +-
.../main/java/generators/JPAClassGenerator.java | 5 +-
.../java/generators/JPAResourceClassGenerator.java | 5 +-
.../src/main/java/generators/SQLGenerator.java | 6 +-
.../jpa-gen/src/main/java/test/Test.java | 5 +-
.../registry/registry-tools/registry-tool/pom.xml | 21 -
.../apache/airavata/registry/tool/DBMigrator.java | 4 +-
.../research-framework/research-service/pom.xml | 107 ++--
.../research/service/config/OpenApiConfig.java | 8 +-
.../service/handlers/ResearchHubHandler.java | 2 +-
.../research/service/model/entity/Project.java | 11 +-
.../research/service/model/entity/Resource.java | 18 +-
.../research/service/model/entity/Session.java | 12 +-
.../research/service/model/entity/Tag.java | 6 +-
modules/security/pom.xml | 2 -
.../airavata/security/AbstractAuthenticator.java | 2 -
.../security/userstore/AbstractJDBCUserStore.java | 1 -
.../airavata/security/userstore/JDBCUserStore.java | 2 +-
.../security/userstore/SessionDBUserStore.java | 2 +-
.../airavata/security/util/TrustStoreManager.java | 4 +-
modules/server/pom.xml | 3 +-
.../org/apache/airavata/server/ServerMain.java | 17 +-
.../sharing-registry/sharing-data-migrator/pom.xml | 9 +-
.../sharing-registry-distribution/pom.xml | 22 +-
.../sharing-registry-server/pom.xml | 29 +-
.../sharing/registry/db/entities/DomainEntity.java | 3 +-
.../sharing/registry/db/entities/EntityEntity.java | 3 +-
.../sharing/registry/db/entities/EntityPK.java | 4 +-
.../registry/db/entities/EntityTypeEntity.java | 3 +-
.../sharing/registry/db/entities/EntityTypePK.java | 4 +-
.../registry/db/entities/GroupAdminEntity.java | 3 +-
.../sharing/registry/db/entities/GroupAdminPK.java | 4 +-
.../db/entities/GroupMembershipEntity.java | 3 +-
.../registry/db/entities/GroupMembershipPK.java | 4 +-
.../registry/db/entities/PermissionTypeEntity.java | 3 +-
.../registry/db/entities/PermissionTypePK.java | 4 +-
.../registry/db/entities/SharingEntity.java | 3 +-
.../sharing/registry/db/entities/SharingPK.java | 4 +-
.../sharing/registry/db/entities/UserEntity.java | 3 +-
.../registry/db/entities/UserGroupEntity.java | 2 +-
.../sharing/registry/db/entities/UserGroupPK.java | 4 +-
.../sharing/registry/db/entities/UserPK.java | 4 +-
.../db/repositories/AbstractRepository.java | 14 +-
.../registry/db/repositories/EntityRepository.java | 5 +-
.../db/repositories/PermissionTypeRepository.java | 2 +-
.../db/repositories/SharingRepository.java | 3 +-
.../sharing/registry/db/utils/JPAUtils.java | 1 -
.../registry/db/utils/ObjectMapperSingleton.java | 18 +-
.../messaging/SharingServiceDBEventHandler.java | 6 +-
.../server/SharingRegistryServerHandler.java | 2 +-
.../registry/SharingRegistryServerHandlerTest.java | 2 +-
.../sharing-registry-stubs/pom.xml | 23 +-
pom.xml | 668 ++++++++++++++-------
tools/load-client/pom.xml | 27 +-
.../apache/airavata/tools/load/Configurations.java | 2 -
.../org/apache/airavata/tools/load/LoadClient.java | 8 +-
.../airavata/tools/load/SecurityManager.java | 10 +-
.../org/apache/airavata/tools/load/UnitLoad.java | 2 -
457 files changed, 2152 insertions(+), 3623 deletions(-)
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index c4d1702487..661c72faa4 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -98,45 +98,25 @@
<artifactId>compute-account-provisioning</artifactId>
<version>${project.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.airavata</groupId>-->
- <!--<artifactId>group-manager</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>${aopalliance.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oltu.oauth2</groupId>
- <artifactId>org.apache.oltu.oauth2.client</artifactId>
- <version>${oltu.oauth2.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -146,7 +126,6 @@
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index dc62989604..ca7bfcda5a 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -25,9 +25,6 @@ import org.apache.airavata.accountprovisioning.SSHAccountProvisionerFactory;
import org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.airavata_apiConstants;
-import org.apache.airavata.model.appcatalog.parser.Parser;
-import org.apache.airavata.model.appcatalog.parser.ParsingTemplate;
-import org.apache.airavata.service.security.GatewayGroupsInitializer;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.AiravataUtils;
@@ -54,6 +51,8 @@ import org.apache.airavata.model.appcatalog.groupresourceprofile.BatchQueueResou
import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
+import org.apache.airavata.model.appcatalog.parser.Parser;
+import org.apache.airavata.model.appcatalog.parser.ParsingTemplate;
import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription;
import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile;
@@ -61,9 +60,12 @@ import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePrefe
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.commons.airavata_commonsConstants;
-import org.apache.airavata.model.credential.store.*;
-import org.apache.airavata.model.data.movement.DMType;
+import org.apache.airavata.model.credential.store.CredentialSummary;
+import org.apache.airavata.model.credential.store.PasswordCredential;
+import org.apache.airavata.model.credential.store.SSHCredential;
+import org.apache.airavata.model.credential.store.SummaryType;
import org.apache.airavata.model.data.movement.*;
+import org.apache.airavata.model.data.movement.DMType;
import org.apache.airavata.model.data.replica.DataProductModel;
import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
import org.apache.airavata.model.error.*;
@@ -78,21 +80,14 @@ import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.security.AuthzToken;
-import org.apache.airavata.model.status.ExperimentState;
-import org.apache.airavata.model.status.ExperimentStatus;
-import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.model.status.JobStatus;
-import org.apache.airavata.model.status.ProcessState;
-import org.apache.airavata.model.status.ProcessStatus;
-import org.apache.airavata.model.status.QueueStatusModel;
-import org.apache.airavata.model.status.TaskState;
-import org.apache.airavata.model.status.TaskStatus;
+import org.apache.airavata.model.status.*;
import org.apache.airavata.model.task.TaskTypes;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.airavata.model.workspace.Notification;
import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
+import org.apache.airavata.service.security.GatewayGroupsInitializer;
import org.apache.airavata.service.security.interceptor.SecurityCheck;
import org.apache.airavata.sharing.registry.models.*;
import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
diff --git a/airavata-api/airavata-api-stubs/pom.xml b/airavata-api/airavata-api-stubs/pom.xml
index 29d610aca0..87f9adc7db 100644
--- a/airavata-api/airavata-api-stubs/pom.xml
+++ b/airavata-api/airavata-api-stubs/pom.xml
@@ -55,34 +55,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>${maven.replacer.plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>${basedir}/src/main/java/org/apache/airavata/**/*.java</include>
- </includes>
- <token>, date = ".*"</token>
- <value> </value>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
index 42bd38f8c3..3ddaf84406 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
@@ -20,17 +20,16 @@
package org.apache.airavata.api.client;
import org.apache.airavata.api.Airavata;
-
import org.apache.airavata.common.utils.Constants;
import org.apache.airavata.model.error.AiravataClientException;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TSSLTransportFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/airavata-api/airavata-base-api/pom.xml b/airavata-api/airavata-base-api/pom.xml
index 1884e489cd..62ca3828b6 100644
--- a/airavata-api/airavata-base-api/pom.xml
+++ b/airavata-api/airavata-base-api/pom.xml
@@ -17,12 +17,10 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index 5ff4a3dcc5..4bb34ace55 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -55,7 +55,6 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -67,16 +66,6 @@
<artifactId>airavata-security</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
index 4f5288470b..a937366f06 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
@@ -19,16 +19,17 @@
*/
package org.apache.airavata.client.samples;
-import org.apache.airavata.model.error.*;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
+import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.error.AiravataSystemException;
+import org.apache.airavata.model.error.ExperimentNotFoundException;
+import org.apache.airavata.model.error.InvalidRequestException;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.String;
-
public class CancelExperiments {
//FIXME: Read from a config file
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
index 7e9f388db1..39e8794a54 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
@@ -43,7 +43,7 @@ package org.apache.airavata.client.tools;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
-import org.apache.airavata.model.appcatalog.appinterface.*;
+import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.application.io.DataType;
@@ -55,7 +55,6 @@ import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import java.util.List;
import java.util.Map;
-import java.util.Set;
public class RegisterSampleApplicationsUtils {
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index 8fd5d8c260..98c5cb95d4 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -37,16 +37,13 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -55,30 +52,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>${maven.replacer.plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>${basedir}/src/main/java/org/apache/airavata/**/*.java</include>
- </includes>
- <token>, date = ".*"</token>
- <value> </value>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/airavata-api/airavata-model-utils/pom.xml b/airavata-api/airavata-model-utils/pom.xml
index 37be5a96d5..dbd53b65df 100644
--- a/airavata-api/airavata-model-utils/pom.xml
+++ b/airavata-api/airavata-model-utils/pom.xml
@@ -46,13 +46,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
index 28380f39f6..2e2df7eb5d 100644
--- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
+++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
@@ -19,10 +19,6 @@
*/
package org.apache.airavata.model.util;
-import org.apache.airavata.model.appcatalog.computeresource.*;
-
-import java.util.List;
-
public class ComputeResourceUtil {
// public static ComputeResourceDescription createComputeResource (String resourceName,
// String resourceDesc,
diff --git a/airavata-api/airavata-model-utils/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java b/airavata-api/airavata-model-utils/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java
index 7f9bedf363..4e9984f547 100644
--- a/airavata-api/airavata-model-utils/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java
+++ b/airavata-api/airavata-model-utils/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java
@@ -21,15 +21,15 @@
package org.apache.airavata.model.util;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourceReservation;
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
import org.junit.Assert;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
/**
* GroupComputeResourcePreferenceUtilTest
*/
diff --git a/airavata-services/pom.xml b/airavata-services/pom.xml
index c3519945db..95d27a84e9 100644
--- a/airavata-services/pom.xml
+++ b/airavata-services/pom.xml
@@ -38,13 +38,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</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>
diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml
index 9f95c5fa15..72fafcf2e1 100644
--- a/airavata-services/profile-service/iam-admin-services-core/pom.xml
+++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml
@@ -35,41 +35,7 @@
<name>Iam Admin Services</name>
<dependencies>
- <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-client -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-client</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-jackson2-provider -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson2-provider</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-admin-client -->
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak.admin.client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>angus-mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
+
</dependencies>
</project>
diff --git a/airavata-services/profile-service/pom.xml b/airavata-services/profile-service/pom.xml
index b63a338014..a65a1cd66f 100644
--- a/airavata-services/profile-service/pom.xml
+++ b/airavata-services/profile-service/pom.xml
@@ -43,7 +43,6 @@
<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/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java b/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java
index e5caf41e05..b9b5d6c090 100644
--- 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/airavata-services/profile-service/profile-service-client-sdks/java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java
@@ -21,16 +21,13 @@ package org.apache.airavata.service.profile.client.samples;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.airavata.model.user.*;
-import org.apache.airavata.model.workspace.User;
import org.apache.airavata.service.profile.client.ProfileServiceClientFactory;
import org.apache.airavata.service.profile.client.util.ProfileServiceClientUtil;
import org.apache.airavata.service.profile.user.cpi.UserProfileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Date;
import java.util.List;
-import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
/**
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index d6be72e59d..2b57061cbe 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -33,7 +33,6 @@
<description>Module to expose a profile-service-commons as a thrift service</description>
<properties>
- <derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>true</skipTests>
<mysql.connector.version>8.0.31</mysql.connector.version>
@@ -41,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
<version>${dozer.version}</version>
<exclusions>
<exclusion>
@@ -58,33 +57,12 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
</dependencies>
<build>
@@ -92,7 +70,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java
index f616a87a0f..c097b7903b 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java
@@ -19,13 +19,13 @@
*/
package org.apache.airavata.service.profile.commons.repositories;
+import com.github.dozermapper.core.Mapper;
+import jakarta.persistence.Query;
import org.apache.airavata.service.profile.commons.utils.JPAUtils;
import org.apache.airavata.service.profile.commons.utils.ObjectMapperSingleton;
-import org.dozer.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.persistence.Query;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,7 +46,7 @@ public abstract class AbstractRepository<T, E, Id> {
}
public T update(T t) {
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
E entity = mapper.map(t, dbEntityGenericClass);
E persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity));
return mapper.map(persistedCopy, thriftGenericClass);
@@ -64,13 +64,13 @@ public abstract class AbstractRepository<T, E, Id> {
public T get(Id id) {
E entity = JPAUtils.execute(entityManager -> entityManager
.find(dbEntityGenericClass, id));
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
return mapper.map(entity, thriftGenericClass);
}
public List<T> select(String query) {
List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).getResultList());
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
List<T> resultList = new ArrayList<>();
resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass)));
return resultList;
@@ -79,7 +79,7 @@ public abstract class AbstractRepository<T, E, Id> {
public List<T> select(String query, int limit, int offset) {
List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).setFirstResult(offset)
.setMaxResults(limit).getResultList());
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
List<T> resultList = new ArrayList<>();
resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass)));
return resultList;
@@ -97,7 +97,7 @@ public abstract class AbstractRepository<T, E, Id> {
return jpaQuery.setFirstResult(offset).setMaxResults(limit).getResultList();
});
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
List<T> resultList = new ArrayList<>();
resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass)));
return resultList;
@@ -115,7 +115,7 @@ public abstract class AbstractRepository<T, E, Id> {
return jpaQuery.getResultList();
});
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
List<T> resultList = new ArrayList<>();
resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass)));
return resultList;
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
index 20e8e6487e..dc6a53aec2 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
@@ -19,11 +19,10 @@
*/
package org.apache.airavata.service.profile.commons.tenant.entities;
+import jakarta.persistence.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.persistence.*;
-
import java.io.Serializable;
import java.util.UUID;
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java
index 8468189d66..382ee47897 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java
@@ -20,6 +20,7 @@
package org.apache.airavata.service.profile.commons.user.entities;
import jakarta.persistence.*;
+
import java.util.List;
@Entity
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java
index d6fac6c512..1b557c898f 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java
@@ -20,6 +20,7 @@
package org.apache.airavata.service.profile.commons.user.entities;
import jakarta.persistence.*;
+
import java.util.Date;
import java.util.List;
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
index b89851ca38..5a40fe59d6 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
@@ -21,7 +21,6 @@ package org.apache.airavata.service.profile.commons.utils;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
-
import org.apache.airavata.common.utils.JDBCConfig;
public class JPAUtils {
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
index ec54c6b5ec..d6ffd596e0 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
@@ -19,20 +19,28 @@
*/
package org.apache.airavata.service.profile.commons.utils;
-import org.dozer.DozerBeanMapper;
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
+import com.github.dozermapper.core.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ObjectMapperSingleton extends DozerBeanMapper{
+public class ObjectMapperSingleton {
private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class);
private static ObjectMapperSingleton instance;
+ private final Mapper mapper;
- private ObjectMapperSingleton(){}
+ private ObjectMapperSingleton() {
+ mapper = DozerBeanMapperBuilder.buildDefault();
+ }
- public static ObjectMapperSingleton getInstance(){
- if(instance == null)
+ public static ObjectMapperSingleton getInstance() {
+ if (instance == null)
instance = new ObjectMapperSingleton();
return instance;
}
+
+ public Mapper getMapper() {
+ return mapper;
+ }
}
\ No newline at end of file
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java
index 56d0a748b5..c5198ee6e9 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java
@@ -21,7 +21,6 @@
package org.apache.airavata.service.profile.commons.utils;
import org.apache.airavata.common.utils.JDBCConfig;
-import org.apache.airavata.service.profile.commons.utils.Utils;
public class ProfileServiceJDBCConfig implements JDBCConfig {
diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java
index ecd8f98225..bcc97cd564 100644
--- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java
+++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java
@@ -8,16 +8,12 @@ import org.apache.airavata.model.group.GroupModel;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.airavata.model.user.UserProfile;
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.groupmanager.cpi.exception.GroupManagerServiceException;
+import org.apache.airavata.service.profile.groupmanager.cpi.group_manager_cpiConstants;
import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository;
import org.apache.airavata.service.security.interceptor.SecurityCheck;
import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory;
-import org.apache.airavata.sharing.registry.models.GroupCardinality;
-import org.apache.airavata.sharing.registry.models.GroupType;
-import org.apache.airavata.sharing.registry.models.SharingRegistryException;
-import org.apache.airavata.sharing.registry.models.User;
-import org.apache.airavata.sharing.registry.models.UserGroup;
+import org.apache.airavata.sharing.registry.models.*;
import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
import org.apache.thrift.TException;
import org.slf4j.Logger;
diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java
index 4c6b6d08b3..072a93ca96 100644
--- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java
+++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java
@@ -19,8 +19,6 @@
*/
package org.apache.airavata.service.profile.handlers;
-import java.util.List;
-
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.AiravataUtils;
@@ -44,14 +42,16 @@ import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
import org.apache.airavata.service.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl;
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.iam.admin.services.cpi.exception.IamAdminServicesException;
+import org.apache.airavata.service.profile.iam.admin.services.cpi.iam_admin_services_cpiConstants;
import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository;
import org.apache.airavata.service.security.interceptor.SecurityCheck;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
public class IamAdminServicesHandler implements IamAdminServices.Iface {
private final static Logger logger = LoggerFactory.getLogger(IamAdminServicesHandler.class);
diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java
index 2308d9296f..bf0c8865df 100644
--- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java
+++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java
@@ -31,7 +31,6 @@ import org.apache.airavata.model.error.AuthorizationException;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.airavata.model.user.Status;
import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.model.user.user_profile_modelConstants;
import org.apache.airavata.security.AiravataSecurityException;
import org.apache.airavata.service.profile.client.ProfileServiceClientFactory;
import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices;
@@ -39,10 +38,10 @@ import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamA
import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository;
import org.apache.airavata.service.profile.user.cpi.UserProfileService;
import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException;
+import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants;
import org.apache.airavata.service.security.AiravataSecurityManager;
import org.apache.airavata.service.security.SecurityManagerFactory;
import org.apache.airavata.service.security.UserInfo;
-import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants;
import org.apache.airavata.service.security.interceptor.SecurityCheck;
import org.apache.thrift.TException;
import org.slf4j.Logger;
diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java
index 48819ffdc0..4ca4d7ebb1 100644
--- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java
+++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/server/ProfileServiceServer.java
@@ -27,12 +27,12 @@ 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.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.profile_tenant_cpiConstants;
import org.apache.airavata.service.profile.handlers.TenantProfileServiceHandler;
import org.apache.airavata.service.profile.handlers.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;
+import org.apache.airavata.service.profile.tenant.cpi.profile_tenant_cpiConstants;
import org.apache.airavata.service.profile.user.core.utils.UserProfileCatalogDBInitConfig;
import org.apache.airavata.service.profile.user.cpi.UserProfileService;
import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants;
diff --git a/airavata-services/profile-service/profile-tenant-core/pom.xml b/airavata-services/profile-service/profile-tenant-core/pom.xml
index baeb2f7c7c..ae1fc2f8a5 100644
--- a/airavata-services/profile-service/profile-tenant-core/pom.xml
+++ b/airavata-services/profile-service/profile-tenant-core/pom.xml
@@ -33,7 +33,6 @@
<name>Profile Gateway Core</name>
<properties>
- <derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
<mysql.connector.version>8.0.31</mysql.connector.version>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index c50b37af0c..42c7f51353 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -33,7 +33,6 @@
<name>Profile User Core</name>
<properties>
- <derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
<mysql.connector.version>8.0.31</mysql.connector.version>
@@ -52,13 +51,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
- <compilerArgs>
- <arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
- </compilerArgs>
- <fork>true</fork>
</configuration>
</plugin>
<plugin>
@@ -68,7 +63,6 @@
<inherited>true</inherited>
<configuration>
<failIfNoTests>false</failIfNoTests>
- <!--<skipTests>${skipTests}</skipTests>-->
<skipTests>true</skipTests>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
</configuration>
diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
index b39a1f060a..d194c9ccf2 100644
--- a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
+++ b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
@@ -19,13 +19,13 @@
*/
package org.apache.airavata.service.profile.user.core.repositories;
+import com.github.dozermapper.core.Mapper;
import org.apache.airavata.model.user.UserProfile;
import org.apache.airavata.service.profile.commons.repositories.AbstractRepository;
import org.apache.airavata.service.profile.commons.user.entities.UserProfileEntity;
import org.apache.airavata.service.profile.commons.utils.JPAUtils;
import org.apache.airavata.service.profile.commons.utils.ObjectMapperSingleton;
import org.apache.airavata.service.profile.commons.utils.QueryConstants;
-import org.dozer.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -95,7 +95,7 @@ public class UserProfileRepository extends AbstractRepository<UserProfile, UserP
public UserProfile updateUserProfile(UserProfile userProfile, Runnable postUpdateAction) {
- Mapper mapper = ObjectMapperSingleton.getInstance();
+ Mapper mapper = ObjectMapperSingleton.getInstance().getMapper();
UserProfileEntity entity = mapper.map(userProfile, UserProfileEntity.class);
UserProfileEntity persistedCopy = JPAUtils.execute(entityManager -> {
UserProfileEntity result = entityManager.merge(entity);
diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml
index 77ce01b352..5c2b032fe7 100644
--- a/airavata-services/services-security/pom.xml
+++ b/airavata-services/services-security/pom.xml
@@ -61,11 +61,6 @@
<artifactId>airavata-sharing-registry-stubs</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
@@ -74,28 +69,49 @@
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>${aopalliance.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.oltu.oauth2</groupId>
- <artifactId>org.apache.oltu.oauth2.client</artifactId>
- <version>${oltu.oauth2.client.version}</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
+ <version>${spring.security.oauth2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
+ <version>${spring.security.oauth2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>${json.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -103,24 +119,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
-
- <reuseForks>false</reuseForks>
- <argLine>
- -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
- </argLine>
- <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index 43c6ef67ec..4afeddab24 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -54,7 +54,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb-java-client.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -110,7 +109,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -172,7 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory>
@@ -181,22 +179,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.*</include>
- </includes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java
index a2febb0b9b..c44a587dc5 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/AgentController.java
@@ -24,12 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api/v1/agent")
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
index f59fc882f1..9bce565464 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/ExperimentController.java
@@ -18,8 +18,6 @@
*/
package org.apache.airavata.agent.connection.service.controllers;
-import java.util.List;
-
import org.apache.airavata.agent.connection.service.handlers.AgentManagementHandler;
import org.apache.airavata.agent.connection.service.models.AgentLaunchRequest;
import org.apache.airavata.agent.connection.service.models.AgentLaunchResponse;
@@ -31,12 +29,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/api/v1/exp")
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
index dbb0fd19de..a5c1eb5f09 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
@@ -27,13 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/entity/AgentExecution.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/entity/AgentExecution.java
index 1b708a368c..7115164b2b 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/entity/AgentExecution.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/db/entity/AgentExecution.java
@@ -18,12 +18,11 @@
*/
package org.apache.airavata.agent.connection.service.db.entity;
-import org.hibernate.annotations.GenericGenerator;
-
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
+import org.hibernate.annotations.GenericGenerator;
@Entity(name = "AGENT_EXECUTION")
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java
index 58226fbbba..edff558b3d 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java
@@ -18,22 +18,18 @@
*/
package org.apache.airavata.agent.connection.service.handlers;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
+import io.grpc.stub.StreamObserver;
+import net.devh.boot.grpc.server.service.GrpcService;
import org.apache.airavata.agent.*;
-import org.apache.airavata.agent.AsyncCommand;
import org.apache.airavata.agent.connection.service.models.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.grpc.stub.StreamObserver;
-import net.devh.boot.grpc.server.service.GrpcService;
-import org.springframework.beans.factory.annotation.Value;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
@GrpcService
public class AgentConnectionHandler extends AgentCommunicationServiceGrpc.AgentCommunicationServiceImplBase {
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
index f4edd7cd92..db2ab91054 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
@@ -18,11 +18,6 @@
*/
package org.apache.airavata.agent.connection.service.handlers;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
import org.apache.airavata.agent.connection.service.UserContext;
import org.apache.airavata.agent.connection.service.config.ClusterApplicationConfig;
import org.apache.airavata.agent.connection.service.models.AgentLaunchRequest;
@@ -46,6 +41,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
@Service
public class AgentManagementHandler {
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java
index 9d3dbd054d..6613d13569 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java
@@ -21,8 +21,6 @@ package org.apache.airavata.agent.connection.service.models;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-
public class AgentLaunchRequest {
private String experimentName;
@@ -104,7 +102,7 @@ public class AgentLaunchRequest {
}
public String getApplicationInterfaceName() {
- return remoteCluster + (StringUtils.isNotBlank(group) ? ("_" + group) : "");
+ return remoteCluster + (group != null && !group.trim().isEmpty() ? ("_" + group) : "");
}
public String getProjectName() {
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java
index a08101a333..69ceb01283 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataFileService.java
@@ -18,10 +18,11 @@
*/
package org.apache.airavata.agent.connection.service.services;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.protobuf.Timestamp;
+import io.grpc.Status;
+import io.grpc.stub.StreamObserver;
import org.apache.airavata.agent.ServerMessage;
import org.apache.airavata.agent.connection.service.UserContext;
import org.apache.airavata.agent.connection.service.models.DirectoryInfo;
@@ -34,20 +35,13 @@ import org.apache.airavata.fuse.ReadDirRes;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.protobuf.Timestamp;
-
-import io.grpc.Status;
-import io.grpc.stub.StreamObserver;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
@Service
public class AiravataFileService {
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
index 8c3120fcd7..f6d0d32331 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
@@ -18,12 +18,7 @@
*/
package org.apache.airavata.agent.connection.service.services;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+import io.micrometer.common.util.StringUtils;
import org.apache.airavata.agent.connection.service.UserContext;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
@@ -39,7 +34,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import io.micrometer.common.util.StringUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Service
public class AiravataService {
diff --git a/modules/airavata-helix/agent-api/pom.xml b/modules/airavata-helix/agent-api/pom.xml
index 3011a6eac1..48e5c1b0b5 100644
--- a/modules/airavata-helix/agent-api/pom.xml
+++ b/modules/airavata-helix/agent-api/pom.xml
@@ -35,7 +35,14 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -54,24 +61,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${log4j2.slf4j.impl}</version>
</dependency>
</dependencies>
- <!--<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>-->
-
</project>
diff --git a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
index beab284b45..f177282e02 100644
--- a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
+++ b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java
@@ -19,7 +19,7 @@
*/
package org.apache.airavata.agents.api;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.File;
import java.io.IOException;
diff --git a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java
index 107b9ff617..1fcd0c2423 100644
--- a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java
+++ b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java
@@ -19,11 +19,8 @@
*/
package org.apache.airavata.agents.api;
-import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
import java.util.List;
/**
diff --git a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java
index e91dcb630d..e89c5c0c0d 100644
--- a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java
+++ b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java
@@ -19,8 +19,6 @@
*/
package org.apache.airavata.agents.api;
-import java.io.OutputStream;
-
/**
* TODO: Class level comments please
*
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
index ff1d1ed4e8..d7aebd024e 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
+++ b/modules/airavata-helix/agent-impl/ssh-agent/pom.xml
@@ -24,7 +24,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
</dependency>
</dependencies>
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAdaptorParams.java b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAdaptorParams.java
index 042b818ae4..c4135efc19 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAdaptorParams.java
+++ b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAdaptorParams.java
@@ -21,7 +21,9 @@ package org.apache.airavata.helix.agent.ssh;
import org.apache.airavata.agents.api.AdaptorParams;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
/**
* TODO: Class level comments please
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java
index b7a6bad46d..97dc271ca5 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java
+++ b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/SshAgentAdaptor.java
@@ -21,14 +21,12 @@ package org.apache.airavata.helix.agent.ssh;
import com.jcraft.jsch.*;
import org.apache.airavata.agents.api.*;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
import org.apache.airavata.model.credential.store.SSHCredential;
-import org.apache.airavata.model.appcatalog.computeresource.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/StandardOutReader.java b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/StandardOutReader.java
index 263d5d05c3..4cbb33ca01 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/StandardOutReader.java
+++ b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/ssh/StandardOutReader.java
@@ -19,11 +19,12 @@
*/
package org.apache.airavata.helix.agent.ssh;
-import com.jcraft.jsch.Channel;
import org.apache.airavata.agents.api.CommandOutput;
import org.apache.commons.io.IOUtils;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
/**
* TODO: Class level comments please
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/PoolingSSHJClient.java b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/PoolingSSHJClient.java
index 8010cb5a4d..8a6533d0bf 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/PoolingSSHJClient.java
+++ b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/PoolingSSHJClient.java
@@ -39,7 +39,9 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
diff --git a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
index 1f6dc4911b..74c08c205b 100644
--- a/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
+++ b/modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
@@ -23,8 +23,8 @@ import net.schmizz.keepalive.KeepAliveProvider;
import net.schmizz.sshj.DefaultConfig;
import net.schmizz.sshj.connection.ConnectionException;
import net.schmizz.sshj.connection.channel.direct.Session;
-import net.schmizz.sshj.sftp.*;
-import net.schmizz.sshj.sftp.FileMode.Type;
+import net.schmizz.sshj.sftp.FileAttributes;
+import net.schmizz.sshj.sftp.RemoteResourceInfo;
import net.schmizz.sshj.transport.verification.HostKeyVerifier;
import net.schmizz.sshj.userauth.keyprovider.KeyProvider;
import net.schmizz.sshj.userauth.method.AuthKeyboardInteractive;
@@ -51,7 +51,10 @@ import org.apache.airavata.model.credential.store.SSHCredential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.security.PublicKey;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml
index 09dfe4909f..028f96e020 100644
--- a/modules/airavata-helix/helix-spectator/pom.xml
+++ b/modules/airavata-helix/helix-spectator/pom.xml
@@ -31,7 +31,6 @@
<name>Helix Spectator</name>
<artifactId>helix-spectator</artifactId>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -75,7 +74,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-templates</artifactId>
<version>${groovy.version}</version>
</dependency>
@@ -104,5 +103,28 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>2.21.1</version>
+ </dependency>
</dependencies>
</project>
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
index be3c11fbe9..9cae34a4ef 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
@@ -23,8 +23,6 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.helix.controller.HelixControllerMain;
import org.apache.helix.manager.zk.ZKHelixAdmin;
-import org.apache.helix.model.BuiltInStateModelDefinitions;
-import org.apache.helix.model.IdealState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
index 86dcdf7697..59aa13c8bf 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
@@ -46,8 +46,6 @@ import org.apache.airavata.registry.api.exception.RegistryServiceException;
import org.apache.airavata.service.profile.client.ProfileServiceClientFactory;
import org.apache.airavata.service.profile.user.cpi.UserProfileService;
import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.helix.HelixManager;
import org.apache.helix.task.TaskResult;
import org.json.JSONException;
@@ -58,11 +56,14 @@ import org.slf4j.MDC;
import java.io.File;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
-import java.util.UUID;
public abstract class AiravataTask extends AbstractTask {
@@ -140,18 +141,9 @@ public abstract class AiravataTask extends AbstractTask {
if (currentRetryCount >= getRetryCount() || fatal) {
ProcessStatus status = new ProcessStatus(ProcessState.FAILED);
StringWriter errors = new StringWriter();
-
- String errorCode = UUID.randomUUID().toString();
- String errorMessage = "Error Code : " + errorCode + ", Task " + getTaskId() + " failed due to " + reason +
- (error == null ? "" : ", " + error.getMessage());
-
- // wrapping from new error object with error code
- error = new TaskOnFailException(errorMessage, true, error);
-
- status.setReason(errorMessage);
- errors.write(ExceptionUtils.getStackTrace(error));
- logger.error(errorMessage, error);
-
+ PrintWriter pw = new PrintWriter(errors);
+ error.printStackTrace(pw);
+ status.setReason(errors.toString());
status.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
if (getTaskContext() != null) { // task context could be null if the initialization failed
getTaskContext().setProcessStatus(status);
@@ -192,14 +184,13 @@ public abstract class AiravataTask extends AbstractTask {
saveAndPublishProcessStatus(requeueStatus);
}
- return onFail(errorMessage, fatal);
+ return onFail(reason, fatal, error);
} else {
- return onFail("Handover back to helix engine to retry", fatal);
+ return onFail("Handover back to helix engine to retry", fatal, error);
}
}
protected void cleanup() {
-
try {
// cleaning up local data directory
String localDataPath = ServerSettings.getLocalDataLocation();
@@ -207,14 +198,24 @@ public abstract class AiravataTask extends AbstractTask {
localDataPath = localDataPath + getProcessId();
try {
- FileUtils.deleteDirectory(new File(localDataPath));
+ Path directory = Path.of(localDataPath);
+ if (Files.exists(directory)) {
+ Files.walk(directory)
+ .sorted(Comparator.reverseOrder())
+ .forEach(path -> {
+ try {
+ Files.delete(path);
+ } catch (IOException e) {
+ logger.error("Failed to delete path " + path, e);
+ }
+ });
+ }
} catch (IOException e) {
logger.error("Failed to delete local data directory " + localDataPath, e);
}
} catch (Exception e) {
logger.error("Failed to clean up", e);
}
-
}
protected void saveAndPublishProcessStatus(ProcessState state) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
index 17c48ea45f..9e2d09b72b 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
@@ -21,17 +21,10 @@ package org.apache.airavata.helix.impl.task;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ThriftUtils;
-import org.apache.airavata.helix.core.util.TaskUtil;
import org.apache.airavata.messaging.core.Publisher;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
-import org.apache.airavata.model.appcatalog.computeresource.BatchQueue;
-import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
-import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
-import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
-import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
-import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourceReservation;
@@ -65,15 +58,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
/**
* Note: process context property use lazy loading approach. In runtime you will see some properties as null
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
index e9b3b0fb65..908fbe900e 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
@@ -1,6 +1,5 @@
package org.apache.airavata.helix.impl.task.cancel;
-import org.apache.airavata.helix.core.util.MonitoringUtil;
import org.apache.airavata.helix.impl.task.AiravataTask;
import org.apache.airavata.helix.impl.task.TaskContext;
import org.apache.airavata.helix.task.api.TaskHelper;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
index 10e9790b29..53bea83afb 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
@@ -19,12 +19,10 @@
*/
package org.apache.airavata.helix.impl.task.completing;
-import org.apache.airavata.helix.core.util.MonitoringUtil;
import org.apache.airavata.helix.impl.task.AiravataTask;
import org.apache.airavata.helix.impl.task.TaskContext;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
-import org.apache.airavata.helix.task.api.annotation.TaskParam;
import org.apache.airavata.model.status.ProcessState;
import org.apache.helix.task.TaskResult;
import org.slf4j.Logger;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
index 09cfb57427..ac77faadbd 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/DataParsingTask.java
@@ -53,11 +53,7 @@ import org.apache.airavata.model.appcatalog.parser.ParserInput;
import org.apache.airavata.model.appcatalog.parser.ParserOutput;
import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import org.apache.airavata.model.data.replica.DataProductModel;
-import org.apache.airavata.model.data.replica.DataProductType;
-import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
-import org.apache.airavata.model.data.replica.ReplicaLocationCategory;
-import org.apache.airavata.model.data.replica.ReplicaPersistentType;
+import org.apache.airavata.model.data.replica.*;
import org.apache.airavata.patform.monitoring.CountMonitor;
import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java
index dc1f157d5c..44fcb4e016 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/parsing/ParsingTriggeringTask.java
@@ -4,12 +4,12 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.helix.impl.task.AiravataTask;
import org.apache.airavata.helix.impl.task.TaskContext;
+import org.apache.airavata.helix.impl.task.parsing.kafka.ProcessCompletionMessageSerializer;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.helix.task.TaskResult;
import org.apache.kafka.clients.producer.*;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.airavata.helix.impl.task.parsing.kafka.ProcessCompletionMessageSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,7 +19,7 @@ import java.util.concurrent.ExecutionException;
@TaskDef(name = "Parsing Triggering Task")
public class ParsingTriggeringTask extends AiravataTask {
- private final static Logger logger = LoggerFactory.getLogger(DataParsingTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(ParsingTriggeringTask.class);
private static Producer<String, ProcessCompletionMessage> producer;
@@ -33,7 +33,7 @@ public class ParsingTriggeringTask extends AiravataTask {
props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
StringSerializer.class.getName());
props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ProcessCompletionMessageSerializer.class.getName());
- producer = new KafkaProducer<String, ProcessCompletionMessage>(props);
+ producer = new KafkaProducer<>(props);
}
}
@@ -49,7 +49,7 @@ public class ParsingTriggeringTask extends AiravataTask {
@Override
public TaskResult onRun(TaskHelper helper, TaskContext taskContext) {
- logger.info("Starting parsing triggerring task " + getTaskId() + ", experiment id " + getExperimentId());
+ logger.info("Starting parsing triggering task {}, experiment id {}", getTaskId(), getExperimentId());
ProcessCompletionMessage completionMessage = new ProcessCompletionMessage();
completionMessage.setExperimentId(getExperimentId());
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
index ba06618f98..99a8d5c7dd 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
@@ -30,12 +30,9 @@ import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescr
import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.status.ProcessState;
-import org.apache.airavata.model.task.DataStageType;
import org.apache.airavata.model.task.DataStagingTaskModel;
-import org.apache.airavata.model.task.TaskTypes;
import org.apache.airavata.patform.monitoring.CountMonitor;
import org.apache.helix.task.TaskResult;
-import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +40,6 @@ import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
index a7f8ed9f08..06e5c666dc 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
@@ -22,26 +22,27 @@ package org.apache.airavata.helix.impl.task.submission;
import org.apache.airavata.agents.api.AgentAdaptor;
import org.apache.airavata.agents.api.JobSubmissionOutput;
import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.helix.impl.task.TaskContext;
import org.apache.airavata.helix.impl.task.submission.config.GroovyMapBuilder;
import org.apache.airavata.helix.impl.task.submission.config.GroovyMapData;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.commons.ErrorModel;
- import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.model.status.*;
+import org.apache.airavata.model.job.JobModel;
+import org.apache.airavata.model.status.JobState;
+import org.apache.airavata.model.status.JobStatus;
+import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.model.workspace.GatewayUsageReportingCommand;
import org.apache.airavata.patform.monitoring.CountMonitor;
import org.apache.helix.task.TaskResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
@TaskDef(name = "Default Job Submission")
public class DefaultJobSubmissionTask extends JobSubmissionTask {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
index 5b815b87fe..a37a81bb33 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
@@ -43,7 +43,8 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.security.SecureRandom;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public abstract class JobSubmissionTask extends AiravataTask {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java
index cc03c50d36..f0b34c9a8b 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java
@@ -19,22 +19,14 @@
*/
package org.apache.airavata.helix.impl.task.submission;
-import org.apache.airavata.agents.api.AgentAdaptor;
-import org.apache.airavata.agents.api.JobSubmissionOutput;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.impl.task.submission.config.GroovyMapBuilder;
import org.apache.airavata.helix.impl.task.submission.config.GroovyMapData;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.model.status.JobStatus;
-import org.apache.commons.io.FileUtils;
import org.apache.helix.task.TaskResult;
-import java.io.File;
-import java.util.Arrays;
import java.util.UUID;
@TaskDef(name = "Local Job Submission")
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
index b4f2814aac..9971f7818e 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
@@ -21,14 +21,16 @@ package org.apache.airavata.helix.impl.task.submission.config;
import groovy.text.GStringTemplateEngine;
import groovy.text.TemplateEngine;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.helix.impl.task.TaskContext;
import org.apache.airavata.helix.impl.task.TaskOnFailException;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
-import org.apache.airavata.model.appcatalog.computeresource.*;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+import org.apache.airavata.model.appcatalog.computeresource.MonitorMode;
+import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/ForkJobConfiguration.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/ForkJobConfiguration.java
index 9604ed9302..fe489da215 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/ForkJobConfiguration.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/ForkJobConfiguration.java
@@ -23,9 +23,9 @@ import org.apache.airavata.helix.impl.task.submission.config.JobManagerConfigura
import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.commons.io.FilenameUtils;
import java.io.File;
+import java.nio.file.Path;
import java.util.Map;
public class ForkJobConfiguration implements JobManagerConfiguration {
@@ -83,7 +83,7 @@ public class ForkJobConfiguration implements JobManagerConfiguration {
@Override
public RawCommandInfo getSubmitCommand(String workingDirectory, String forkFilePath) {
return new RawCommandInfo(this.installedPath + jobManagerCommands.get(JobManagerCommand.SUBMISSION).trim() + " " +
- workingDirectory + File.separator + FilenameUtils.getName(forkFilePath));
+ workingDirectory + File.separator + Path.of(forkFilePath).getFileName().toString());
}
@Override
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/HTCondorJobConfiguration.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/HTCondorJobConfiguration.java
index 601c625759..618c577649 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/HTCondorJobConfiguration.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/HTCondorJobConfiguration.java
@@ -23,9 +23,9 @@ import org.apache.airavata.helix.impl.task.submission.config.JobManagerConfigura
import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.commons.io.FilenameUtils;
import java.io.File;
+import java.nio.file.Path;
import java.util.Map;
public class HTCondorJobConfiguration implements JobManagerConfiguration {
@@ -70,9 +70,9 @@ public class HTCondorJobConfiguration implements JobManagerConfiguration {
return scriptExtension;
}
- public RawCommandInfo getSubmitCommand(String workingDirectory,String pbsFilePath) {
+ public RawCommandInfo getSubmitCommand(String workingDirectory, String pbsFilePath) {
return new RawCommandInfo(this.installedPath + jMCommands.get(JobManagerCommand.SUBMISSION).trim() + " " +
- workingDirectory + File.separator + FilenameUtils.getName(pbsFilePath));
+ workingDirectory + File.separator + Path.of(pbsFilePath).getFileName().toString());
}
public String getInstalledPath() {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/LSFJobConfiguration.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/LSFJobConfiguration.java
index c64376fd78..8216b617bb 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/LSFJobConfiguration.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/LSFJobConfiguration.java
@@ -23,11 +23,11 @@ import org.apache.airavata.helix.impl.task.submission.config.JobManagerConfigura
import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.commons.io.FilenameUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
+import java.nio.file.Path;
import java.util.Map;
public class LSFJobConfiguration implements JobManagerConfiguration {
@@ -85,7 +85,7 @@ public class LSFJobConfiguration implements JobManagerConfiguration {
@Override
public RawCommandInfo getSubmitCommand(String workingDirectory, String pbsFilePath) {
return new RawCommandInfo(this.installedPath + "bsub < " +
- workingDirectory + File.separator + FilenameUtils.getName(pbsFilePath));
+ workingDirectory + File.separator + Path.of(pbsFilePath).getFileName().toString());
}
@Override
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/PBSJobConfiguration.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/PBSJobConfiguration.java
index ddec477a27..898e3329fe 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/PBSJobConfiguration.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/PBSJobConfiguration.java
@@ -23,9 +23,9 @@ import org.apache.airavata.helix.impl.task.submission.config.JobManagerConfigura
import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.commons.io.FilenameUtils;
import java.io.File;
+import java.nio.file.Path;
import java.util.Map;
public class PBSJobConfiguration implements JobManagerConfiguration {
@@ -74,7 +74,7 @@ public class PBSJobConfiguration implements JobManagerConfiguration {
public RawCommandInfo getSubmitCommand(String workingDirectory, String pbsFilePath) {
return new RawCommandInfo(this.installedPath + jobManagerCommands.get(JobManagerCommand.SUBMISSION).trim() + " " +
- workingDirectory + File.separator + FilenameUtils.getName(pbsFilePath));
+ workingDirectory + File.separator + Path.of(pbsFilePath).getFileName().toString());
}
public String getInstalledPath() {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/SlurmJobConfiguration.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/SlurmJobConfiguration.java
index 7f5352c7eb..64a5cb6435 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/SlurmJobConfiguration.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/SlurmJobConfiguration.java
@@ -23,9 +23,9 @@ import org.apache.airavata.helix.impl.task.submission.config.JobManagerConfigura
import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.commons.io.FilenameUtils;
import java.io.File;
+import java.nio.file.Path;
import java.util.Map;
public class SlurmJobConfiguration implements JobManagerConfiguration {
@@ -70,9 +70,9 @@ public class SlurmJobConfiguration implements JobManagerConfiguration {
return scriptExtension;
}
- public RawCommandInfo getSubmitCommand(String workingDirectory,String pbsFilePath) {
- return new RawCommandInfo(this.installedPath + jMCommands.get(JobManagerCommand.SUBMISSION).trim() + " " +
- workingDirectory + File.separator + FilenameUtils.getName(pbsFilePath));
+ public RawCommandInfo getSubmitCommand(String workingDirectory, String pbsFilePath) {
+ return new RawCommandInfo(this.installedPath + jMCommands.get(JobManagerCommand.SUBMISSION).trim() + " " +
+ workingDirectory + File.separator + Path.of(pbsFilePath).getFileName().toString());
}
public String getInstalledPath() {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/UGEJobConfiguration.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/UGEJobConfiguration.java
index 972d276ca2..f0d30f0567 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/UGEJobConfiguration.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/UGEJobConfiguration.java
@@ -23,9 +23,9 @@ import org.apache.airavata.helix.impl.task.submission.config.JobManagerConfigura
import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.RawCommandInfo;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.commons.io.FilenameUtils;
import java.io.File;
+import java.nio.file.Path;
import java.util.Map;
public class UGEJobConfiguration implements JobManagerConfiguration {
@@ -71,7 +71,7 @@ public class UGEJobConfiguration implements JobManagerConfiguration {
public RawCommandInfo getSubmitCommand(String workingDirectory, String pbsFilePath) {
return new RawCommandInfo(this.installedPath + "qsub " +
- workingDirectory + File.separator + FilenameUtils.getName(pbsFilePath));
+ workingDirectory + File.separator + Path.of(pbsFilePath).getFileName().toString());
}
public String getInstalledPath() {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/parser/HTCondorOutputParser.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/parser/HTCondorOutputParser.java
index 5a6dfec7f1..05f7391170 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/parser/HTCondorOutputParser.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/app/parser/HTCondorOutputParser.java
@@ -23,7 +23,6 @@ import org.apache.airavata.helix.impl.task.submission.config.OutputParser;
import org.apache.airavata.helix.impl.task.submission.config.app.JobUtil;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.model.status.JobStatus;
-import org.apache.airavata.registry.core.utils.DBConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
index 1646ee1b36..d84ff20d80 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
@@ -23,9 +23,9 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.helix.core.AbstractTask;
import org.apache.airavata.helix.core.OutPort;
+import org.apache.airavata.helix.impl.task.parsing.DataParsingTask;
import org.apache.airavata.helix.impl.task.parsing.ProcessCompletionMessage;
import org.apache.airavata.helix.impl.task.parsing.kafka.ProcessCompletionMessageDeserializer;
-import org.apache.airavata.helix.impl.task.parsing.*;
import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskInput;
import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskInputs;
import org.apache.airavata.helix.impl.task.parsing.models.ParsingTaskOutput;
@@ -42,7 +42,6 @@ import org.apache.kafka.clients.consumer.*;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.thrift.TException;
-import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
index 26f915b0d7..8e9fdbb5de 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
@@ -24,29 +24,29 @@ import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.helix.core.OutPort;
-import org.apache.airavata.helix.impl.task.*;
+import org.apache.airavata.helix.impl.task.AiravataTask;
import org.apache.airavata.helix.impl.task.completing.CompletingTask;
import org.apache.airavata.helix.impl.task.parsing.ParsingTriggeringTask;
import org.apache.airavata.helix.impl.task.staging.ArchiveTask;
import org.apache.airavata.helix.impl.task.staging.JobVerificationTask;
import org.apache.airavata.helix.impl.task.staging.OutputDataStagingTask;
-import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.model.status.ProcessState;
-import org.apache.airavata.model.status.ProcessStatus;
-import org.apache.airavata.monitor.JobStateValidator;
-import org.apache.airavata.monitor.JobStatusResult;
-import org.apache.airavata.monitor.kafka.JobStatusResultDeserializer;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.model.experiment.ExperimentModel;
+import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.messaging.event.JobIdentifier;
import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.model.status.JobStatus;
+import org.apache.airavata.model.status.ProcessState;
+import org.apache.airavata.model.status.ProcessStatus;
import org.apache.airavata.model.task.DataStagingTaskModel;
import org.apache.airavata.model.task.TaskModel;
import org.apache.airavata.model.task.TaskTypes;
+import org.apache.airavata.monitor.JobStateValidator;
+import org.apache.airavata.monitor.JobStatusResult;
+import org.apache.airavata.monitor.kafka.JobStatusResultDeserializer;
import org.apache.airavata.patform.monitoring.CountMonitor;
import org.apache.airavata.patform.monitoring.MonitoringServer;
import org.apache.airavata.registry.api.RegistryService;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
index 8f509cfd0b..47a390201d 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
@@ -36,7 +36,9 @@ import org.apache.airavata.helix.impl.task.staging.OutputDataStagingTask;
import org.apache.airavata.helix.impl.task.submission.DefaultJobSubmissionTask;
import org.apache.airavata.messaging.core.*;
import org.apache.airavata.model.experiment.ExperimentModel;
-import org.apache.airavata.model.messaging.event.*;
+import org.apache.airavata.model.messaging.event.MessageType;
+import org.apache.airavata.model.messaging.event.ProcessSubmitEvent;
+import org.apache.airavata.model.messaging.event.ProcessTerminateEvent;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.process.ProcessWorkflow;
import org.apache.airavata.model.status.ProcessState;
diff --git a/modules/airavata-helix/task-api/pom.xml b/modules/airavata-helix/task-api/pom.xml
index 43801cc8c7..53945d2ae1 100644
--- a/modules/airavata-helix/task-api/pom.xml
+++ b/modules/airavata-helix/task-api/pom.xml
@@ -49,26 +49,41 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>agent-api</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${log4j2.version}</version>
</dependency>
</dependencies>
-
- <!--<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>-->
</project>
diff --git a/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java b/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
index 6d142bc3ba..3e7b3c9817 100644
--- a/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
+++ b/modules/airavata-helix/task-api/src/main/java/org/apache/airavata/helix/task/api/support/AdaptorSupport.java
@@ -19,12 +19,12 @@
*/
package org.apache.airavata.helix.task.api.support;
-import org.apache.airavata.agents.api.*;
+import org.apache.airavata.agents.api.AgentAdaptor;
+import org.apache.airavata.agents.api.AgentException;
+import org.apache.airavata.agents.api.StorageResourceAdaptor;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import java.io.File;
-
/**
* TODO: Class level comments please
*
diff --git a/modules/airavata-helix/task-api/src/main/resources/logback.xml b/modules/airavata-helix/task-api/src/main/resources/logback.xml
new file mode 100644
index 0000000000..201b726566
--- /dev/null
+++ b/modules/airavata-helix/task-api/src/main/resources/logback.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>logs/airavata-task-api.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>logs/airavata-task-api.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>30</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="CONSOLE" />
+ <appender-ref ref="FILE" />
+ </root>
+
+ <!-- Set specific package logging levels -->
+ <logger name="org.apache.airavata" level="DEBUG"/>
+ <logger name="org.apache.helix" level="INFO"/>
+</configuration>
\ No newline at end of file
diff --git a/modules/airavata-helix/task-core/pom.xml b/modules/airavata-helix/task-core/pom.xml
index f07c5d41ea..43b3efc1d6 100644
--- a/modules/airavata-helix/task-core/pom.xml
+++ b/modules/airavata-helix/task-core/pom.xml
@@ -54,18 +54,4 @@
</dependency>
</dependencies>
- <!--<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>-->
-
</project>
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/OutPort.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/OutPort.java
index ef528b1c70..229ed11ab0 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/OutPort.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/OutPort.java
@@ -20,7 +20,6 @@
package org.apache.airavata.helix.core;
import org.apache.helix.task.TaskResult;
-import org.apache.helix.task.UserContentStore;
/**
* TODO: Class level comments please
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
index 8bf040f513..80ec388d39 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
@@ -21,11 +21,13 @@ package org.apache.airavata.helix.core.participant;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.helix.core.support.TaskHelperImpl;
import org.apache.airavata.helix.core.AbstractTask;
+import org.apache.airavata.helix.core.support.TaskHelperImpl;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.helix.InstanceType;
import org.apache.helix.examples.OnlineOfflineStateModelFactory;
+import org.apache.helix.manager.zk.ZKHelixAdmin;
+import org.apache.helix.manager.zk.ZKHelixManager;
import org.apache.helix.model.BuiltInStateModelDefinitions;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.participant.StateMachineEngine;
@@ -33,8 +35,6 @@ import org.apache.helix.task.TaskFactory;
import org.apache.helix.task.TaskStateModelFactory;
import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
import org.apache.helix.zookeeper.impl.client.ZkClient;
-import org.apache.helix.manager.zk.ZKHelixAdmin;
-import org.apache.helix.manager.zk.ZKHelixManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java
index f258e4d9cc..fa054e01c2 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AdaptorSupportImpl.java
@@ -19,7 +19,9 @@
*/
package org.apache.airavata.helix.core.support.adaptor;
-import org.apache.airavata.agents.api.*;
+import org.apache.airavata.agents.api.AgentAdaptor;
+import org.apache.airavata.agents.api.AgentException;
+import org.apache.airavata.agents.api.StorageResourceAdaptor;
import org.apache.airavata.helix.adaptor.SSHJAgentAdaptor;
import org.apache.airavata.helix.adaptor.SSHJStorageAdaptor;
import org.apache.airavata.helix.task.api.support.AdaptorSupport;
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java
index b66cbe6c07..875367438b 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/support/adaptor/AgentStore.java
@@ -23,7 +23,6 @@ import org.apache.airavata.agents.api.AgentAdaptor;
import org.apache.airavata.agents.api.StorageResourceAdaptor;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import org.apache.zookeeper.Op;
import java.util.HashMap;
import java.util.Map;
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
index 5de46a7b3f..c1f46d68e3 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
@@ -30,7 +30,10 @@ import org.slf4j.LoggerFactory;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* TODO: Class level comments please
diff --git a/modules/airavata-helix/workflow-impl/pom.xml b/modules/airavata-helix/workflow-impl/pom.xml
index 8baf3a01c2..ac301659c1 100644
--- a/modules/airavata-helix/workflow-impl/pom.xml
+++ b/modules/airavata-helix/workflow-impl/pom.xml
@@ -44,20 +44,4 @@
</dependency>
</dependencies>
-<!--
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
--->
-
</project>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java b/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
index 40721707ee..572c3e94e4 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
+++ b/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
@@ -7,7 +7,6 @@ import org.apache.airavata.metascheduler.core.utils.Utils;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.model.status.JobStatus;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
diff --git a/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java b/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java
index 224bf39318..c3a636a835 100644
--- a/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java
+++ b/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java
@@ -1,9 +1,5 @@
package org.apache.airavata.metascheduler.core.api;
-import org.apache.airavata.model.process.ProcessModel;
-
-import java.util.Optional;
-
/**
* Provides interfaces for Process related scheduling operations
*/
diff --git a/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java b/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java
index 154fc1e58c..6ecdc6ae83 100644
--- a/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java
+++ b/modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java
@@ -14,7 +14,6 @@ import org.apache.airavata.model.messaging.event.ProcessStatusChangeEvent;
import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.model.status.ProcessStatus;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.apache.thrift.TException;
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
index d6dbed05e2..b3c9a54f73 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
@@ -13,7 +13,6 @@ import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel
import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.model.status.ProcessStatus;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java
index 70f56bed0d..1be46764d3 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java
@@ -5,7 +5,6 @@ import org.apache.airavata.metascheduler.core.engine.ComputeResourceSelectionPol
import org.apache.airavata.metascheduler.core.utils.Utils;
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
public abstract class ComputeResourceSelectionPolicyImpl implements ComputeResourceSelectionPolicy {
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
index 3a452e04eb..8ff26aa21d 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
@@ -8,7 +8,6 @@ import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.status.QueueStatusModel;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
index 6a2bd22f80..5bfc406dff 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
@@ -1,18 +1,14 @@
package org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
-import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResourcePolicy;
-import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.UserConfigurationDataModel;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.status.QueueStatusModel;
+import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
index 26383b6296..0f7be92a5e 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
@@ -15,7 +15,6 @@ import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel
import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.model.status.ProcessStatus;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
import org.apache.thrift.TException;
import org.slf4j.Logger;
diff --git a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
index e355b3f92d..95a3497bd1 100644
--- a/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
+++ b/modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
@@ -8,10 +8,8 @@ import org.apache.airavata.metascheduler.core.utils.Utils;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import org.quartz.impl.JobExecutionContextImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java b/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java
index b88dd5715e..c34681cb9b 100644
--- a/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java
+++ b/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJob.java
@@ -26,11 +26,11 @@ import com.jcraft.jsch.Session;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.credential.store.cpi.CredentialStoreService;
-import org.apache.airavata.model.credential.store.SSHCredential;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
+import org.apache.airavata.model.credential.store.SSHCredential;
import org.apache.airavata.model.status.QueueStatusModel;
import org.apache.airavata.registry.api.RegistryService;
import org.apache.thrift.TException;
diff --git a/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java b/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java
index 9e747d5166..009d039333 100644
--- a/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java
+++ b/modules/cluster-monitoring/src/main/java/org/apache/airavata/cluster/monitoring/ClusterStatusMonitorJobScheduler.java
@@ -21,17 +21,17 @@ package org.apache.airavata.cluster.monitoring;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
-import org.quartz.*;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
import org.quartz.impl.StdSchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-
import static org.quartz.JobBuilder.newJob;
-import static org.quartz.TriggerBuilder.*;
-import static org.quartz.SimpleScheduleBuilder.*;
+import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
+import static org.quartz.TriggerBuilder.newTrigger;
public class ClusterStatusMonitorJobScheduler {
private final static Logger logger = LoggerFactory.getLogger(ClusterStatusMonitorJobScheduler.class);
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 53c1fe9f1f..18727cf1ef 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -39,67 +39,42 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>xpp3</artifactId>
- <version>${xpp3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>xpp5</artifactId>
- <version>${xpp5.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat-embed-core.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>${dozer.version}</version>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -114,7 +89,14 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<!-- Testing -->
<dependency>
@@ -130,38 +112,40 @@
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${google.gson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-base-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
</dependency>
</dependencies>
<properties>
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index 5c0a218357..12eef9a9bc 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -20,7 +20,6 @@
package org.apache.airavata.common.utils;
import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.commons.lang3.BooleanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -349,9 +348,8 @@ public class ApplicationSettings {
}
public static boolean getBooleanSetting(String key) throws ApplicationSettingsException {
- String val = getInstance().getSettingImpl(key);
- return Optional.ofNullable(BooleanUtils.toBooleanObject(val))
- .orElseThrow(() -> new ApplicationSettingsException("Value can not be parsed to Boolean"));
+ String value = getSetting(key);
+ return Boolean.parseBoolean(value);
}
public static long getLongSetting(String key) throws ApplicationSettingsException {
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java
index 43cac5e6af..24e9ba409d 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DBEventManagerConstants.java
@@ -19,8 +19,6 @@
*/
package org.apache.airavata.common.utils;
-import org.apache.airavata.model.dbevent.EntityType;
-
/**
* Created by Ajinkya on 3/22/17.
*/
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java
index a740dc5a5f..d107d0f5d8 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java
@@ -26,12 +26,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
+import java.sql.*;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyTestUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyTestUtil.java
index 8aa85bc4b8..637af9feeb 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyTestUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyTestUtil.java
@@ -19,22 +19,16 @@
*/
package org.apache.airavata.common.utils;
-import java.sql.BatchUpdateException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
-import org.junit.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* JdbcUtil utility methods for the JUnit tests.
* Note that JSR 169 is a subset of JdbcUtil 3 and
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyUtil.java
index fba9db18dc..96a73f2a0a 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/DerbyUtil.java
@@ -19,14 +19,14 @@
*/
package org.apache.airavata.common.utils;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.sql.DriverManager;
import org.apache.derby.drda.NetworkServerControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.sql.DriverManager;
import java.sql.SQLException;
/**
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/IOUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/IOUtil.java
index 96713b44e9..1ec0f61203 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/IOUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/IOUtil.java
@@ -19,21 +19,11 @@
*/
package org.apache.airavata.common.utils;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.Writer;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.*;
+
public class IOUtil {
private static final Logger logger = LoggerFactory.getLogger(IOUtil.class);
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
index b3b295f616..4241f7b6b4 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
@@ -1,15 +1,13 @@
package org.apache.airavata.common.utils;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* JPAUtils
*/
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/JSONUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/JSONUtil.java
index f69c1add93..9e82922fd8 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/JSONUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/JSONUtil.java
@@ -19,14 +19,7 @@
*/
package org.apache.airavata.common.utils;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.stream.JsonReader;
+import com.google.gson.*;
import java.io.File;
import java.io.FileReader;
@@ -140,11 +133,11 @@ public class JSONUtil {
return false;
}
}else if (primitiveOrig.isBoolean() && primitiveNew.isBoolean()) {
- if ((Boolean.valueOf(primitiveOrig.getAsBoolean()).compareTo(primitiveNew.getAsBoolean()) != 0)) {
+ if ((Boolean.compare(primitiveOrig.getAsBoolean(), primitiveNew.getAsBoolean()) != 0)) {
return false;
}
}else if (primitiveOrig.isNumber() && primitiveNew.isNumber() ) {
- if (new Double(primitiveOrig.getAsDouble()).compareTo(primitiveNew.getAsDouble()) != 0) {
+ if (Double.compare(primitiveOrig.getAsDouble(), primitiveNew.getAsDouble()) != 0) {
return false;
}
}else {
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/StringUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/StringUtil.java
index 80844b2f44..fe6a7cddd1 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/StringUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/StringUtil.java
@@ -22,21 +22,12 @@ package org.apache.airavata.common.utils;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-
public class StringUtil {
public static final String DELIMETER=",";
public static final String QUOTE="\"";
@@ -373,106 +364,54 @@ public class StringUtil {
return byteArrayOutputStream.toString();
}
- private static Options deriveCommandLineOptions(String[] args){
- Options options = new Options();
- String[] argCopy = getChangedList(args);
- int i=0;
- for (String arg : argCopy) {
- if (arg.startsWith("--")){
- arg=arg.substring(2);
- int pos = arg.indexOf('=');
- String opt;
- boolean hasArgs=true;
- if (pos==-1){ //if not of the form --arg=value
- if (i==argCopy.length-1 || argCopy[i+1].startsWith("-")){ // no value specified
- hasArgs=false;
- }
- opt=arg;
- }else{
- opt=arg.substring(0, pos);
- }
- options.addOption(opt, hasArgs, "");
+ public static Map<String, String> parseCommandLineOptions(String[] args) {
+ Map<String, String> options = new HashMap<>();
+ for (int i = 0; i < args.length; i++) {
+ String arg = args[i];
+ if (arg.startsWith("--")) {
+ String key = arg.substring(2);
+ if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+ options.put(key, args[i + 1]);
+ i++;
+ } else {
+ options.put(key, "true");
+ }
}
- i++;
}
return options;
}
-
- public static Map<String, String> parseCommandLineOptions(String[] args) {
- Map<String,String> commandLineOptions=new HashMap<String,String>();
- try {
- CommandLineParameters cmdParameters = getCommandLineParser(args);
- Map<String, String> parameters = cmdParameters.getParameters();
- for (String s : parameters.keySet()) {
- commandLineOptions.put(s, parameters.get(s)==null? "":parameters.get(s));
- }
- } catch (ParseException e1) {
- e1.printStackTrace();
- }
- return commandLineOptions;
- }
- public static CommandLineParameters getCommandLineParser(String[] args)
- throws ParseException {
- String[] argCopy = getChangedList(args);
- CommandLineParser parser = new DynamicOptionPosixParser();
- CommandLine cmdLine = parser.parse(deriveCommandLineOptions(argCopy), argCopy);
- return new CommandLineParameters(cmdLine);
- }
+ public static class CommandLineParameters {
+ private Map<String, String> parameters = new HashMap<>();
+ private List<String> arguments = new ArrayList<>();
-
- //commons-cli does not support arg names having the period (".")
- private static final String ARG_DOT_REPLACE="dot_replacement_value";
-
- private static String[] getChangedList(String[] args) {
- String[] argCopy = Arrays.asList(args).toArray(new String []{});
- for (int i=0;i<argCopy.length; i++) {
- argCopy[i]=changeOption(argCopy[i]);
- }
- return argCopy;
- }
-
- private static String revertOption(String option){
- return option==null? option : option.replaceAll(Pattern.quote(ARG_DOT_REPLACE), ".");
- }
-
- private static String changeOption(String option){
- return option==null? option : option.replaceAll(Pattern.quote("."), ARG_DOT_REPLACE);
- }
-
- private static class DynamicOptionPosixParser extends PosixParser{
- @Override
- protected void processOption(String arg0, @SuppressWarnings("rawtypes") ListIterator arg1)
- throws ParseException {
- if (getOptions().hasOption(arg0)){
- super.processOption(arg0, arg1);
- }
- }
- }
-
- public static class CommandLineParameters{
- private Map<String,String> parameters=new HashMap<String, String>();
- private List<String> arguments=new ArrayList<String>();
- protected CommandLineParameters(CommandLine cmd){
- for(Option opt:cmd.getOptions()){
- parameters.put(revertOption(opt.getOpt()), revertOption(opt.getValue()));
- }
- for(String arg:cmd.getArgs()){
- arguments.add(revertOption(arg));
- }
- }
- public List<String> getArguments() {
- return arguments;
- }
- public void setArguments(List<String> arguments) {
- this.arguments = arguments;
- }
- public Map<String,String> getParameters() {
- return parameters;
- }
- public void setParameters(Map<String,String> parameters) {
- this.parameters = parameters;
- }
- }
+ public CommandLineParameters(String[] args) {
+ Map<String, String> options = parseCommandLineOptions(args);
+ parameters.putAll(options);
+
+ // Collect non-option arguments
+ for (String arg : args) {
+ if (!arg.startsWith("--")) {
+ arguments.add(arg);
+ }
+ }
+ }
+
+ public List<String> getArguments() {
+ return arguments;
+ }
+
+ public void setArguments(List<String> arguments) {
+ this.arguments = arguments;
+ }
+
+ public Map<String, String> getParameters() {
+ return parameters;
+ }
+
+ public void setParameters(Map<String, String> parameters) {
+ this.parameters = parameters;
+ }
+ }
}
\ No newline at end of file
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/SwingUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/SwingUtil.java
index 4cfd2f75c3..100ffb9587 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/SwingUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/SwingUtil.java
@@ -19,27 +19,13 @@
*/
package org.apache.airavata.common.utils;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Insets;
-import java.awt.Toolkit;
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.net.URL;
import java.util.List;
-import javax.swing.ImageIcon;
-import javax.swing.JTextField;
-import javax.swing.Spring;
-import javax.swing.SpringLayout;
-
public class SwingUtil {
/**
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ThriftClientPool.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ThriftClientPool.java
index 707fba68a5..6a6b7a0473 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ThriftClientPool.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ThriftClientPool.java
@@ -19,9 +19,6 @@
*/
package org.apache.airavata.common.utils;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
import org.apache.airavata.base.api.BaseAPI;
import org.apache.commons.pool2.BasePooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
@@ -37,6 +34,9 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
public class ThriftClientPool<T extends BaseAPI.Client> implements AutoCloseable {
private static final Logger logger = LoggerFactory.getLogger(ThriftClientPool.class);
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/WSConstants.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/WSConstants.java
index c8c45cf5d7..d08a937fbd 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/WSConstants.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/WSConstants.java
@@ -21,8 +21,6 @@ package org.apache.airavata.common.utils;
import javax.xml.namespace.QName;
-import org.xmlpull.infoset.XmlNamespace;
-
public interface WSConstants {
/**
@@ -40,11 +38,6 @@ public interface WSConstants {
*/
public static final String XSD_NS_URI = "http://www.w3.org/2001/XMLSchema";
-// /**
-// * XML Schema Namespace
-// */
-// public static final XmlNamespace XSD_NS = XmlConstants.BUILDER.newNamespace(XSD_NS_PREFIX, XSD_NS_URI);
-
/**
* The any type.
*/
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
index c44b5c8175..67765caccb 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/WSDLUtil.java
@@ -19,390 +19,19 @@
*/
package org.apache.airavata.common.utils;
-import java.net.URI;
-import java.util.LinkedList;
-import java.util.List;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.xmlpull.infoset.XmlAttribute;
-import org.xmlpull.infoset.XmlBuilderException;
-import org.xmlpull.infoset.XmlElement;
-import org.xmlpull.infoset.XmlNamespace;
+import org.w3c.dom.*;
-//import xsul.XmlConstants;
-//import xsul5.wsdl.WsdlBinding;
-//import xsul5.wsdl.WsdlDefinitions;
-//import xsul5.wsdl.WsdlPortType;
-//import xsul5.wsdl.WsdlPortTypeOperation;
-//import xsul5.wsdl.WsdlUtil;
+import javax.xml.namespace.QName;
+import java.net.URI;
+import java.util.LinkedList;
+import java.util.List;
public class WSDLUtil {
private static final Logger logger = LoggerFactory.getLogger(WSDLUtil.class);
-// /**
-// * @param wsdlString
-// * @return The WSDL
-// * @throws UtilsException
-// */
-// public static WsdlDefinitions stringToWSDL(String wsdlString) throws UtilsException {
-// try {
-// XmlElement wsdlElement = XMLUtil.stringToXmlElement(wsdlString);
-// WsdlDefinitions definitions = new WsdlDefinitions(wsdlElement);
-// return definitions;
-// } catch (RuntimeException e) {
-// throw new UtilsException(e);
-// }
-// }
-//
-// /**
-// * @param definitions3
-// * @return The WsdlDefinitions (XSUL5)
-// */
-// public static xsul5.wsdl.WsdlDefinitions wsdlDefinitions3ToWsdlDefintions5(xsul.wsdl.WsdlDefinitions definitions3) {
-//
-// return new xsul5.wsdl.WsdlDefinitions(XMLUtil.xmlElement3ToXmlElement5(definitions3));
-// }
-//
-// /**
-// * @param definitions5
-// * @return The WsdlDefinitions (XSUL3)
-// */
-// public static xsul.wsdl.WsdlDefinitions wsdlDefinitions5ToWsdlDefintions3(xsul5.wsdl.WsdlDefinitions definitions5) {
-//
-// return new xsul.wsdl.WsdlDefinitions(XMLUtil.xmlElement5ToXmlElement3(definitions5.xml()));
-// }
-//
-// /**
-// * @param definitions
-// * @return The name of the WSDL.
-// */
-// public static String getWSDLName(WsdlDefinitions definitions) {
-// String wsdlName = definitions.xml().attributeValue(WSConstants.NAME_ATTRIBUTE);
-// if (wsdlName == null) {
-// // name is optional.
-// wsdlName = "";
-// }
-// return wsdlName;
-// }
-//
-// /**
-// * @param definitions
-// * @return The QName of the WSDL.
-// */
-// public static QName getWSDLQName(WsdlDefinitions definitions) {
-// String targetNamespace = definitions.getTargetNamespace();
-// String wsdlName = getWSDLName(definitions);
-// return new QName(targetNamespace, wsdlName);
-// }
-//
-// /**
-// * @param definitions
-// * @return The first portType
-// * @throws UtilsException
-// */
-// public static WsdlPortType getFirstPortType(WsdlDefinitions definitions) throws UtilsException {
-// for (WsdlPortType portType : definitions.portTypes()) {
-// return portType;
-// }
-// throw new UtilsException("No portType is defined in WSDL");
-// }
-//
-// public static WsdlPortTypeOperation getFirstOperation(WsdlDefinitions definitions) throws UtilsException {
-// for (WsdlPortTypeOperation operation : getFirstPortType(definitions).operations()) {
-// return operation;
-// }
-// throw new UtilsException("No portType is defined in WSDL");
-// }
-//
-// /**
-// * @param definitions
-// * @return The QName of the first portType.
-// * @throws UtilsException
-// */
-// public static QName getFirstPortTypeQName(WsdlDefinitions definitions) throws UtilsException {
-// String targetNamespace = definitions.getTargetNamespace();
-// for (WsdlPortType portType : definitions.portTypes()) {
-// String portTypeName = portType.getName();
-// QName portTypeQName = new QName(targetNamespace, portTypeName);
-// return portTypeQName;
-// }
-// throw new UtilsException("No portType is defined.");
-// }
-//
-// /**
-// * @param definitions
-// * @param portTypeQName
-// * @return The name of the first operation in a given portType.
-// * @throws UtilsException
-// */
-// public static String getFirstOperationName(WsdlDefinitions definitions, QName portTypeQName) throws UtilsException {
-// WsdlPortType portType = definitions.getPortType(portTypeQName.getLocalPart());
-// for (WsdlPortTypeOperation operation : portType.operations()) {
-// String operationName = operation.getOperationName();
-//
-// // XXX Temporary solution to skip some GFac specific operations.
-// if ("Shutdown".equals(operationName)) {
-// continue;
-// } else if ("Kill".equals(operationName)) {
-// continue;
-// } else if ("Ping".equals(operationName)) {
-// continue;
-// }
-//
-// return operationName;
-// }
-// throw new UtilsException("No operation is defined");
-// }
-//
-// /**
-// * @param definitions
-// * @return The cloned WsdlDefinitions
-// */
-// public static WsdlDefinitions deepClone(WsdlDefinitions definitions) throws UtilsException {
-// return new WsdlDefinitions(XMLUtil.deepClone(definitions.xml()));
-// }
-//
-// /**
-// * @param definitions
-// * @param paramType
-// * @return The schema that includes the type definition
-// */
-// public static XmlElement getSchema(WsdlDefinitions definitions, QName paramType) throws UtilsException {
-// XmlElement types = definitions.getTypes();
-//
-// Iterable<XmlElement> schemas = types.elements(WSConstants.XSD_NS, WSConstants.SCHEMA_TAG);
-// for (XmlElement schema : schemas) {
-// if (isTypeDefinedInSchema(paramType, schema)) {
-// return schema;
-// }
-// }
-//
-// // ok we didnt find the type in the schema in first level
-// // now we try try to see if it exist in schema imports.
-// // we loop in two step because its better to avoid the network
-// // connection if possible
-// for (XmlElement schema : schemas) {
-// Iterable<XmlElement> imports = schema.elements(WSConstants.XSD_NS, WSConstants.IMPORT_TAG);
-// for (XmlElement importEle : imports) {
-// String schemaLocation = importEle.attributeValue(WSConstants.SCHEMA_LOCATION_ATTRIBUTE);
-// if (null != schemaLocation && !"".equals(schemaLocation)) {
-// try {
-// // connect using a url connection
-// URL url = new URL(schemaLocation);
-// URLConnection connection = url.openConnection();
-// connection.connect();
-// XmlElement importedSchema = xsul5.XmlConstants.BUILDER.parseFragmentFromInputStream(connection
-// .getInputStream());
-// if (isTypeDefinedInSchema(paramType, importedSchema)) {
-// // still return the parent schema
-// return schema;
-// }
-// } catch (MalformedURLException e) {
-// throw new UtilsException(e);
-// } catch (XmlBuilderException e) {
-// throw new UtilsException(e);
-// } catch (IOException e) {
-// throw new UtilsException(e);
-// }
-// }
-// }
-// }
-//
-// return null;
-// }
-//
-// private static boolean isTypeDefinedInSchema(QName paramType, XmlElement schema) {
-// String schemaTargetNamespace = schema.attributeValue(WSConstants.TARGET_NAMESPACE_ATTRIBUTE);
-// if (schemaTargetNamespace.equals(paramType.getNamespaceURI())) {
-// for (XmlElement complexType : schema.elements(WSConstants.XSD_NS, WSConstants.COMPLEX_TYPE_TAG)) {
-// String complexTypeName = complexType.attributeValue(WSConstants.NAME_ATTRIBUTE);
-// if (complexTypeName.equals(paramType.getLocalPart())) {
-// return true;
-// }
-// }
-// for (XmlElement simpleType : schema.elements(WSConstants.XSD_NS, WSConstants.SIMPLE_TYPE_TAG)) {
-// String simpleTypeName = simpleType.attributeValue(WSConstants.NAME_ATTRIBUTE);
-// if (simpleTypeName.equals(paramType.getLocalPart())) {
-// return true;
-// }
-// }
-// }
-// return false;
-// }
-//
-// /**
-// * @param definitions
-// * @param paramType
-// * @return The type definition
-// */
-// public static XmlElement getTypeDefinition(WsdlDefinitions definitions, QName paramType) throws UtilsException {
-// XmlElement types = definitions.getTypes();
-// XmlElement returnType = null;
-// types.element(null, WSConstants.SCHEMA_TAG);
-// Iterable<XmlElement> schemas = types.elements(null, WSConstants.SCHEMA_TAG);
-// for (XmlElement schema : schemas) {
-//
-// returnType = findTypeInSchema(paramType, schema);
-// if (returnType != null) {
-// return returnType;
-// }
-// }
-// // ok we didnt find the type in the schemas
-// // try to find it in the schema imports.
-//
-// // if not found it will return null so we would return null
-// return findTypeDefinitionInImports(definitions, paramType);
-//
-// }
-//
-// /**
-// *
-// * @param definitions
-// * @param paramType
-// * @return
-// */
-//
-// public static XmlElement getImportContainingTypeDefinition(WsdlDefinitions definitions, QName paramType)
-// throws UtilsException {
-// XmlElement types = definitions.getTypes();
-// XmlElement returnType = null;
-// Iterable<XmlElement> schemas = types.elements(WSConstants.XSD_NS, WSConstants.SCHEMA_TAG);
-// for (XmlElement schema : schemas) {
-// Iterable<XmlElement> imports = schema.elements(WSConstants.XSD_NS, WSConstants.IMPORT_TAG);
-// for (XmlElement importEle : imports) {
-// String schemaLocation = importEle.attributeValue(WSConstants.SCHEMA_LOCATION_ATTRIBUTE);
-// if (null != schemaLocation && !"".equals(schemaLocation)) {
-// try {
-// // connect using a url connection
-// URL url = new URL(schemaLocation);
-// URLConnection connection = url.openConnection();
-// connection.connect();
-// XmlElement importedSchema = xsul5.XmlConstants.BUILDER.parseFragmentFromInputStream(connection
-// .getInputStream());
-// returnType = findTypeInSchema(paramType, importedSchema);
-// if (returnType != null) {
-// return importEle;
-// }
-//
-// } catch (MalformedURLException e) {
-// throw new UtilsException(e);
-// } catch (XmlBuilderException e) {
-// throw new UtilsException(e);
-// } catch (IOException e) {
-// throw new UtilsException(e);
-// }
-// }
-// }
-// }
-// return null;
-// }
-//
-// /**
-// *
-// * @param definitions
-// * @param paramType
-// * @return
-// */
-//
-// public static XmlElement findTypeDefinitionInImports(WsdlDefinitions definitions, QName paramType)
-// throws UtilsException {
-// XmlElement types = definitions.getTypes();
-// XmlElement returnType = null;
-// Iterable<XmlElement> schemas = types.elements(null, WSConstants.SCHEMA_TAG);
-// for (XmlElement schema : schemas) {
-// Iterable<XmlElement> imports = schema.elements(WSConstants.XSD_NS, WSConstants.IMPORT_TAG);
-// for (XmlElement importEle : imports) {
-// String schemaLocation = importEle.attributeValue(WSConstants.SCHEMA_LOCATION_ATTRIBUTE);
-// if (null != schemaLocation && !"".equals(schemaLocation)) {
-// try {
-// // connect using a url connection
-// URL url = new URL(schemaLocation);
-// URLConnection connection = url.openConnection();
-// connection.connect();
-// XmlElement importedSchema = xsul5.XmlConstants.BUILDER.parseFragmentFromInputStream(connection
-// .getInputStream());
-// returnType = findTypeInSchema(paramType, importedSchema);
-// if (returnType != null) {
-// return returnType;
-// }
-//
-// } catch (MalformedURLException e) {
-// throw new UtilsException(e);
-// } catch (XmlBuilderException e) {
-// throw new UtilsException(e);
-// } catch (IOException e) {
-// throw new UtilsException(e);
-// }
-// }
-// }
-// }
-// return null;
-//
-// }
-//
-// private static XmlElement findTypeInSchema(QName paramType, XmlElement schema) {
-// String schemaTargetNamespace = schema.attributeValue(WSConstants.TARGET_NAMESPACE_ATTRIBUTE);
-// if (null != schemaTargetNamespace && schemaTargetNamespace.equals(paramType.getNamespaceURI())) {
-// for (XmlElement complexType : schema.elements(WSConstants.XSD_NS, WSConstants.COMPLEX_TYPE_TAG)) {
-// String complexTypeName = complexType.attributeValue(WSConstants.NAME_ATTRIBUTE);
-// if (complexTypeName.equals(paramType.getLocalPart())) {
-// return complexType;
-//
-// }
-// }
-// for (XmlElement simpleType : schema.elements(WSConstants.XSD_NS, WSConstants.SIMPLE_TYPE_TAG)) {
-// String simpleTypeName = simpleType.attributeValue(WSConstants.NAME_ATTRIBUTE);
-// if (simpleTypeName.equals(paramType.getLocalPart())) {
-// return simpleType;
-// }
-// }
-// }
-// return null;
-// }
-//
-// /**
-// * @param wsdl
-// * @return true if the WSDL is AWSDL; false otherwise.
-// */
-// public static boolean isAWSDL(WsdlDefinitions wsdl) {
-// if (wsdl.services().iterator().hasNext()) {
-// return false;
-// }
-// return true;
-// }
-//
-// /**
-// * @param definitions
-// * @return true if the service supports asynchronous invocation; false otherwise;
-// */
-// public static boolean isAsynchronousSupported(WsdlDefinitions definitions) {
-// for (WsdlBinding binding : definitions.bindings()) {
-// XmlElement element = binding.xml().element(WSConstants.USING_ADDRESSING_TAG);
-// if (element != null) {
-// return true;
-// }
-// }
-// return false;
-// }
-//
-// /**
-// * Converts a specified AWSDL to CWSDL using DSC URI.
-// *
-// * @param definitions
-// * The specified AWSDL. This will be modified.
-// * @param url
-// * The URL of the service
-// * @return The CWSDL converted.
-// */
-// public static WsdlDefinitions convertToCWSDL(WsdlDefinitions definitions, URI url) {
-// for (WsdlPortType portType : definitions.portTypes()) {
-// WsdlUtil.createCWSDL(definitions, portType, url);
-// }
-// return definitions;
-// }
-
/**
* @param uri
* @return The URI with "?wsdl" at the end.
@@ -412,33 +41,60 @@ public class WSDLUtil {
return wsdlURI.toString();
}
- public static List<XmlNamespace> getNamespaces(XmlElement element) {
- LinkedList<XmlNamespace> namespaces = new LinkedList<XmlNamespace>();
- namespaces.add(element.getNamespace());
- Iterable<XmlAttribute> attributes = element.attributes();
- for (XmlAttribute xmlAttribute : attributes) {
- if (xmlAttribute.getNamespace() != null && !namespaces.contains(xmlAttribute.getNamespace())) {
- namespaces.add(xmlAttribute.getNamespace());
+ /**
+ * Get namespaces from a DOM Element
+ * @param element The DOM Element
+ * @return List of namespaces
+ */
+ public static List<QName> getNamespaces(Element element) {
+ List<QName> namespaces = new LinkedList<>();
+
+ // Get the namespace of the element itself
+ String namespaceURI = element.getNamespaceURI();
+ String prefix = element.getPrefix();
+ if (namespaceURI != null && !namespaceURI.isEmpty()) {
+ namespaces.add(new QName(namespaceURI, prefix));
+ }
+
+ // Get namespaces from attributes
+ NamedNodeMap attributes = element.getAttributes();
+ for (int i = 0; i < attributes.getLength(); i++) {
+ Attr attr = (Attr) attributes.item(i);
+ String attrNamespaceURI = attr.getNamespaceURI();
+ String attrPrefix = attr.getPrefix();
+
+ if (attrNamespaceURI != null && !attrNamespaceURI.isEmpty()) {
+ QName ns = new QName(attrNamespaceURI, attrPrefix);
+ if (!namespaces.contains(ns)) {
+ namespaces.add(ns);
+ }
}
- int index = xmlAttribute.getValue().indexOf(':');
- if (-1 != index) {
- String prefix = xmlAttribute.getValue().substring(0, index);
- if (element.lookupNamespaceByPrefix(prefix) != null) {
- namespaces.add(element.lookupNamespaceByPrefix(prefix));
+
+ // Check for xmlns attributes
+ if (attr.getNodeName().startsWith("xmlns:")) {
+ String nsPrefix = attr.getNodeName().substring(6);
+ String nsURI = attr.getNodeValue();
+ QName ns = new QName(nsURI, nsPrefix);
+ if (!namespaces.contains(ns)) {
+ namespaces.add(ns);
}
}
}
- Iterable children = element.children();
- for (Object object : children) {
- if (object instanceof XmlElement) {
- List<XmlNamespace> newNSs = getNamespaces((XmlElement) object);
- for (XmlNamespace xmlNamespace : newNSs) {
- if (!namespaces.contains(xmlNamespace)) {
- namespaces.add(xmlNamespace);
+
+ // Process child elements
+ NodeList children = element.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child instanceof Element) {
+ List<QName> childNamespaces = getNamespaces((Element) child);
+ for (QName ns : childNamespaces) {
+ if (!namespaces.contains(ns)) {
+ namespaces.add(ns);
}
}
}
}
+
return namespaces;
}
@@ -460,16 +116,6 @@ public class WSDLUtil {
return uri;
}
-// /**
-// * @param valueElement
-// * @return
-// */
-// public static org.xmlpull.v1.builder.XmlElement xmlElement5ToXmlElementv1(XmlElement valueElement) {
-//
-// return XmlConstants.BUILDER.parseFragmentFromReader(new StringReader(xsul5.XmlConstants.BUILDER
-// .serializeToStringPretty(valueElement)));
-// }
-
/**
*
* @param vals
@@ -481,16 +127,8 @@ public class WSDLUtil {
return class1;
}
throw new RuntimeException("Iterator empty");
-
}
-// /**
-// * @param serviceSchema
-// */
-// public static void print(XmlElement serviceSchema) {
-// System.out.println(xsul5.XmlConstants.BUILDER.serializeToStringPretty(serviceSchema));
-// }
-
/**
* @param workflowID
* @return
@@ -498,46 +136,51 @@ public class WSDLUtil {
public static String findWorkflowName(URI workflowID) {
String[] splits = workflowID.toString().split("/");
return splits[splits.length - 1];
-
}
/**
- *
- * @param element
- * @param name
- * @param oldValue
- * @param newValue
+ * Replace attribute value in a DOM Element
+ * @param element The DOM Element
+ * @param name The attribute name
+ * @param oldValue The old value
+ * @param newValue The new value
*/
- public static void replaceAttributeValue(XmlElement element, String name, String oldValue, String newValue) {
- XmlAttribute attribute = element.attribute(name);
- if (null != attribute && oldValue.equals(attribute.getValue())) {
- element.removeAttribute(attribute);
- element.setAttributeValue(name, newValue);
+ public static void replaceAttributeValue(Element element, String name, String oldValue, String newValue) {
+ if (element.hasAttribute(name) && oldValue.equals(element.getAttribute(name))) {
+ element.setAttribute(name, newValue);
}
- Iterable iterator = element.children();
- for (Object object : iterator) {
- if (object instanceof XmlElement) {
- replaceAttributeValue((XmlElement) object, name, oldValue, newValue);
+
+ NodeList children = element.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child instanceof Element) {
+ replaceAttributeValue((Element) child, name, oldValue, newValue);
}
}
-
}
- public static boolean attributeExist(XmlElement element, String name, String value) {
- XmlAttribute attribute = element.attribute(name);
- if (null != attribute && value.equals(attribute.getValue())) {
+ /**
+ * Check if an attribute exists with a specific value
+ * @param element The DOM Element
+ * @param name The attribute name
+ * @param value The attribute value
+ * @return true if the attribute exists with the specified value
+ */
+ public static boolean attributeExist(Element element, String name, String value) {
+ if (element.hasAttribute(name) && value.equals(element.getAttribute(name))) {
return true;
}
- Iterable iterator = element.children();
- boolean ret = false;
- for (Object object : iterator) {
- if (object instanceof XmlElement) {
- ret = ret || attributeExist((XmlElement) object, name, value);
+
+ NodeList children = element.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child instanceof Element) {
+ if (attributeExist((Element) child, name, value)) {
+ return true;
+ }
}
}
- return ret;
-
+
+ return false;
}
-
-
}
\ No newline at end of file
diff --git a/modules/commons/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java b/modules/commons/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java
index 9ee67536e6..44d3281aee 100644
--- a/modules/commons/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java
+++ b/modules/commons/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
import java.io.InputStream;
import java.net.URI;
-import java.net.URL;
import java.security.KeyStore;
/**
diff --git a/modules/commons/src/test/java/org/apache/airavata/common/utils/ThriftClientPoolTest.java b/modules/commons/src/test/java/org/apache/airavata/common/utils/ThriftClientPoolTest.java
index 1f24db8e12..2f7127eb9c 100644
--- a/modules/commons/src/test/java/org/apache/airavata/common/utils/ThriftClientPoolTest.java
+++ b/modules/commons/src/test/java/org/apache/airavata/common/utils/ThriftClientPoolTest.java
@@ -1,8 +1,8 @@
package org.apache.airavata.common.utils;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
+import mockit.Expectations;
+import mockit.Mocked;
+import mockit.Verifications;
import org.apache.airavata.base.api.BaseAPI;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.commons.pool2.impl.AbandonedConfig;
@@ -11,11 +11,9 @@ import org.apache.thrift.TException;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import mockit.Expectations;
-import mockit.Mocked;
-import mockit.Verifications;
+import java.io.PrintWriter;
+import java.io.StringWriter;
public class ThriftClientPoolTest {
diff --git a/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java b/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java
index 631542f9d4..320fc2fdf3 100644
--- a/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java
+++ b/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java
@@ -9,7 +9,6 @@ import org.quartz.impl.StdSchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
diff --git a/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java b/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java
index 78b708866a..5b7dcc8c91 100644
--- a/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java
+++ b/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java
@@ -1,14 +1,12 @@
package org.apache.airavata.compute.resource.monitoring.job;
import org.apache.airavata.common.utils.ThriftClientPool;
-import org.apache.airavata.metascheduler.core.engine.ComputeResourceSelectionPolicy;
import org.apache.airavata.metascheduler.core.utils.Utils;
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference;
import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
public abstract class ComputeResourceMonitor {
diff --git a/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java b/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java
index 31efef7230..cdd46bff05 100644
--- a/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java
+++ b/modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java
@@ -13,7 +13,6 @@ import org.apache.airavata.model.appcatalog.groupresourceprofile.ComputeResource
import org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
import org.apache.airavata.model.status.QueueStatusModel;
import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.RegistryService.Client;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 681e698435..023e0bcd43 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -29,101 +29,89 @@
# API Server Registry Configuration
###########################################################################
-#for derby [AiravataJPARegistry]
-registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby:experiment_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#registry.jdbc.driver=org.mariadb.jdbc.Driver
-#registry.jdbc.url=jdbc:mariadb://localhost:3306/experiment_catalog
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
+registry.jdbc.driver=org.mariadb.jdbc.Driver
+registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
+registry.jdbc.user=root
+registry.jdbc.password=123456
#FIXME: Probably the following property should be removed.
start.derby.server.mode=false
validationQuery=SELECT 1 from CONFIGURATION
-cache.enable=true
-jpa.cache.size=5000
+cache.enable=false
+jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
enable.sharing=true
# Properties for default user mode
-default.registry.user=admin
-default.registry.password=admin
+default.registry.user=default-admin
+default.registry.password=ade4#21242ftfd
default.registry.password.hash.method=SHA
-default.registry.gateway=php_reference_gateway
-super.tenant.gatewayId=php_reference_gateway
+default.registry.gateway=default
+default.registry.oauth.client.id=pga
+default.registry.oauth.client.secret=GtRMiIQG5UJJdmmeM6iQS0BZR4Yj0gbt
+super.tenant.gatewayId=default
# Properties for cluster status monitoring
# cluster status monitoring job repeat time in seconds
-#cluster.status.monitoring.enable=false
+cluster.status.monitoring.enable=false
cluster.status.monitoring.repeat.time=18000
###########################################################################
# Application Catalog DB Configuration
###########################################################################
-#for derby [AiravataJPARegistry]
-appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-appcatalog.jdbc.url=jdbc:derby:app_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#appcatalog.jdbc.url=jdbc:mariadb://localhost:3306/app_catalog
-appcatalog.jdbc.user=airavata
-appcatalog.jdbc.password=airavata
+appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
+appcatalog.jdbc.user=root
+appcatalog.jdbc.password=123456
appcatalog.validationQuery=SELECT 1 from CONFIGURATION
##########################################################################
# Replica Catalog DB Configuration
###########################################################################
-#for derby [AiravataJPARegistry]
-replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-replicacatalog.jdbc.url=jdbc:derby:replica_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#replicacatalog.jdbc.url=jdbc:mariadb://localhost:3306/replica_catalog
-replicacatalog.jdbc.user=airavata
-replicacatalog.jdbc.password=airavata
+replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
+replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
+replicacatalog.jdbc.user=root
+replicacatalog.jdbc.password=123456
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
# Workflow Catalog DB Configuration
###########################################################################
-#for derby [AiravataJPARegistry]
-workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-workflowcatalog.jdbc.url=jdbc:derby:workflow_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#workflowcatalog.jdbc.url=jdbc:mariadb://localhost:3306/workflow_catalog
-workflowcatalog.jdbc.user=airavata
-workflowcatalog.jdbc.password=airavata
+workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
+workflowcatalog.jdbc.user=root
+workflowcatalog.jdbc.password=123456
workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
# Sharing Catalog DB Configuration
###########################################################################
-#for derby [AiravataJPARegistry]
-sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-sharingcatalog.jdbc.url=jdbc:derby:sharing_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#sharingcatalog.jdbc.url=jdbc:mariadb://localhost:3306/sharing_catalog
-sharingcatalog.jdbc.user=airavata
-sharingcatalog.jdbc.password=airavata
+sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
+sharingcatalog.jdbc.user=root
+sharingcatalog.jdbc.password=123456
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
# Sharing Registry Server Configuration
###########################################################################
sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=localhost
+sharing.registry.server.host=0.0.0.0
sharing.registry.server.port=7878
-# tls enable is supported only in standalone sharing registry server mode
-#(nsg-cipres) usecase
sharing.tls.enabled=false
-
+
+###########################################################################
+# User Profile MongoDB Configuration
+###########################################################################
+userprofile.mongodb.host=localhost
+userprofile.mongodb.port=27017
+
+
###########################################################################
# Server module Configuration
###########################################################################
#credential store server should be started before API server
-servers=credentialstore,apiserver,orchestrator,gfac
+#This is obsolete property with new script files.
+#servers=credentialstore,apiserver,orchestrator
###########################################################################
@@ -131,23 +119,16 @@ servers=credentialstore,apiserver,orchestrator,gfac
###########################################################################
apiserver=org.apache.airavata.api.server.AiravataAPIServer
apiserver.name=apiserver-node0
-apiserver.host=localhost
+apiserver.host=0.0.0.0
apiserver.port=8930
apiserver.min.threads=50
-###########################################################################
-# API Server SSL Configurations
-###########################################################################
-apiserver.tls.enabled=false
-apiserver.keystore=/path/to/airavata.jks
-apiserver.keystore.password=airavata
-
###########################################################################
# Orchestrator Server Configurations
###########################################################################
orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
orchestrator.server.name=orchestrator-node0
-orchestrator.server.host=localhost
+orchestrator.server.host=0.0.0.0
orchestrator.server.port=8940
orchestrator.server.min.threads=50
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
@@ -156,27 +137,14 @@ threadpool.size=10
start.submitter=true
embedded.mode=true
enable.validation=true
-
-
-###########################################################################
-# GFac Server Configurations
-###########################################################################
-gfac=org.apache.airavata.gfac.server.GfacServer
-gfac.server.name=gfac-node0
-gfac.server.host=localhost
-gfac.server.port=8950
-gfac.thread.pool.size=50
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-# ssh session access timeout in minutes default is 30 minutes
-#ssh.session.cache.access.timeout=30
-
###########################################################################
# Registry Server Configurations
###########################################################################
regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
regserver.server.name=regserver-node0
-regserver.server.host=localhost
+regserver.server.host=0.0.0.0
regserver.server.port=8970
regserver.server.min.threads=50
@@ -187,18 +155,6 @@ regserver.server.min.threads=50
workflowserver=org.apache.airavata.api.server.WorkflowServer
enactment.thread.pool.size=10
-#to define custom workflow parser user following property
-#workflow.parser=org.apache.airavata.workflow.core.parser.AiravataWorkflowBuilder
-
-
-
-###########################################################################
-# Job Scheduler can send informative email messages to you about the status of your job.
-# Specify a string which consists of either the single character "n" (no mail), or one or more
-# of the characters "a" (send mail when job is aborted), "b" (send mail when job begins),
-# and "e" (send mail when job terminates). The default is "a" if not specified.
-###########################################################################
-
job.notification.enable=true
#Provide comma separated email ids as a string if more than one
job.notification.emailids=
@@ -207,19 +163,17 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-credential.store.keystore.url=../../../airavata_sym.jks
+credential.store.keystore.url=keystores/airavata_sym.jks
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:derby:credential-store;create=true;user=airavata;password=airavata
-credential.store.jdbc.user=airavata
-credential.store.jdbc.password=airavata
-credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-#credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-#credential.store.jdbc.url=jdbc:mariadb://localhost:3306/credential_store
+credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
+credential.store.jdbc.user=root
+credential.store.jdbc.password=123456
+credential.store.jdbc.driver=org.mariadb.jdbc.Driver
credential.store.server.host=localhost
credential.store.server.port=8960
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# these properties used by credential store email notifications
email.server=smtp.googlemail.com
@@ -229,94 +183,37 @@ email.password=xxx
email.ssl=true
email.from=airavata@apache.org
-# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication is used.
-# if user specify both password sshKeyAuthentication gets the higher preference
-
-################# ---------- For ssh key pair sshKeyAuthentication ------------------- ################
-#ssh.public.key=/path to public key for ssh
-#ssh.private.key=/path to private key file for ssh
-#ssh.keypass=passphrase for the private key
-#ssh.username=username for ssh connection
-## If you set "yes" for ssh.strict.hostKey.checking, then you must provide known hosts file path
-#ssh.strict.hostKey.checking=yes/no
-#ssh.known.hosts.file=/path to known hosts file
-### Incase of password sshKeyAuthentication.
-#ssh.password=Password for ssh connection
-
-################ ---------- BES Properties ------------------- ###############
-#bes.ca.cert.path=<location>/certificates/cacert.pem
-#bes.ca.key.path=<location>/certificates/cakey.pem
-#bes.ca.key.pass=passphrase
-
-###########################################################################
-# Monitoring module Configuration
-###########################################################################
-
-#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring
-#mechanisms and one would be able to start a monitor
-monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor
-
-#These properties will used to enable email base monitoring
-email.based.monitor.host=imap.gmail.com
-email.based.monitor.address=test@scigap.com
-email.based.monitor.password=changeme
-email.based.monitor.folder.name=INBOX
-# either imaps or pop3
-email.based.monitor.store.protocol=imaps
-#These property will be used to query the email server periodically. value in milliseconds(ms).
-email.based.monitoring.period=10000
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:airavata@149.165.228.91:5672/messaging
+rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
rabbitmq.status.exchange.name=status_exchange
rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
process.launch.queue.name=process.launch.queue
-experiment.launch.queue.name=experiment.launch.queue
+experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
###########################################################################
-embedded.zk=true
+embedded.zk=false
zookeeper.server.connection=localhost:2181
zookeeper.timeout=30000
-###########################################################################
-# Aurora Scheduler Configuration
-###########################################################################
-aurora.scheduler.hosts=sgg-mesos-master-1:8081,sgg-mesos-master-2:8081,sgg-mesos-master-3:8081
-aurora.scheduler.timeoutms=1000
-aurora.executor.name=AuroraExecutor
-mesos.cluster.name=example
-aurora.executor.config.template.filename=executor-config-template.json
-
########################################################################
## API Security Configuration
########################################################################
-api.secured=false
-security.manager.class=org.apache.airavata.api.server.security.DefaultAiravataSecurityManager
+api.secured=true
+security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
### TLS related configuration ####
-TLS.enabled=false
+TLS.enabled=true
TLS.api.server.port=9930
TLS.client.timeout=10000
#### keystore configuration ####
-keystore.path=airavata.jks
+keystore.path=keystores/airavata.jks
keystore.password=airavata
#### trust store configuration ####
-# trust.store=client_truststore.jks
-# trust.store.password=airavata
-#### remote authorization server url ####
-remote.oauth.authorization.server=https://idp.scigap.org:9443/services/
-#### xacml based authorization policy ####
-authorization.policy=airavata-default-xacml-policy
+trust.store=keystores/client_truststore.jks
+trust.store.password=airavata
#### authorization cache related configuration ####
authz.cache.enabled=true
authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
@@ -331,55 +228,75 @@ enable.kafka.logging=false
###########################################################################
# Profile Service Configuration
###########################################################################
-profile.service.server.host=localhost
+profile.service.server.host=0.0.0.0
profile.service.server.port=8962
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-# derby properties
-profile.service.jdbc.url=jdbc:derby:profile_service;create=true;user=airavata;password=airavata
-profile.service.jdbc.driver=org.apache.derby.jdbc.ClientDriver
# MariaDB properties
-#profile.service.jdbc.url=jdbc:mariadb://localhost:3306/profile_service
-#profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.jdbc.user=airavata
-profile.service.jdbc.password=airavata
-# add validationquery only if db has been initialized during server startup,
-# and tables have been created. for now commenting out.
-#profile.service.validationQuery=SELECT 1
+profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
+profile.service.jdbc.user=root
+profile.service.jdbc.password=123456
+profile.service.jdbc.driver=org.mariadb.jdbc.Driver
+profile.service.validationQuery=SELECT 1
###########################################################################
# Iam Admin services Configuration
###########################################################################
-iam.server.url=https://iam.scigap.org/auth
+iam.server.url=https://auth.cybershuttle.org
iam.server.super.admin.username=admin
-iam.server.super.admin.password=password
+iam.server.super.admin.password=AhHOj1sJG4i5Tkk8r@TjM
###########################################################################
# DB Event Manager Runner
###########################################################################
db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
+###########################################################################
+# Job Execution Engine related properties
+###########################################################################
+helix.cluster.name=AiravataCluster
+helix.controller.name=AiravataController
+helix.participant.name=AiravataParticipant
+pre.workflow.manager.name=AiravataPreWM
+post.workflow.manager.name=AiravataPostWM
+kafka.broker.url=airavata.host:9092
+job.monitor.broker.url=airavata.host:9092
+kafka.broker.consumer.group=MonitoringConsumer
+kafka.broker.topic=monitoring-data
+
+###########################################################################
+# Job Monitor related properties
+###########################################################################
+enable.realtime.monitor=False
+job.monitor.broker.publisher.id=AiravataMonitorPublisher
+job.monitor.broker.topic=monitoring-data
+email.based.monitor.host=imap.gmail.com
+email.based.monitor.store.protocol=imaps
+email.based.monitor.folder.name=INBOX
+email.expiration.minutes=60
+email.based.monitoring.period=10000
+
+email.based.monitor.address=monitoring.airavata@gmail.com
+email.based.monitor.password=airavata.lahiru@
+
###########################################################################
# ThriftClientPool Configuration
###########################################################################
-thrift.client.pool.abandoned.removal.enabled=false
+thrift.client.pool.abandoned.removal.enabled=true
+
+
+###########################################################################
+# WorkFlow Configuration
+###########################################################################
+pre.workflow.manager.loadbalance.clusters=false
+post.workflow.manager.loadbalance.clusters=false
+
###########################################################################
# Metascheduler And Compute Resource Monitoring Configuration
###########################################################################
-cluster.status.monitoring.enable=True
-compute.resource.selection.policy.class=org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection.MultipleComputeResourcePolicy
-metascheduler.gateway=
-metascheduler.group.resource.profile=
-metascheduler.username=metascheacc
-cluster.scanning.interval=7800
-cluster.scanning.parallel.jobs=1
-metaschedluer.job.scanning.enable=True
-metascheduler.maximum.rescheduler.threshold = 5
-compute.resource.rescheduler.policy.class =org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler.ExponentialBackOffReScheduler
-data.analyzer.scanning.interval=3600
-data.analyzer.scanning.parallel.jobs=1
-data.analyzer.enabled.gateways=
-data.analyzer.time.step.seconds=5
-data.analyzer.job.scanning.enable=False
-metascheduler.multiple.cr.enabling.factor=1
+metaschedluer.job.scanning.enable=false
+data.analyzer.job.scanning.enable=false
+api.server.monitoring.enabled=True
+api.server.monitoring.host=0.0.0.0
+api.server.monitoring.port=9097
diff --git a/modules/configuration/server/src/main/resources/logback.xml b/modules/configuration/server/src/main/resources/logback.xml
new file mode 100644
index 0000000000..e2cf4fb4ef
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/logback.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ 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.
+
+-->
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d [%thread] %-5level %logger{30} %X - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>../logs/airavata.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>logs/%d{yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz</fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d [%thread] %-5level %logger{30} %X - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="ch.qos.logback" level="WARN"/>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+
+ <root level="INFO">
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index bcf5ea8ca6..3c02b217ba 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -40,49 +40,18 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>edu.uiuc.ncsa.myproxy</groupId>
- <artifactId>oa4mp-client-api</artifactId>
- <version>${oa4mp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-client</artifactId>
+ <version>${spring.security.oauth2.version}</version>
</dependency>
<dependency>
- <groupId>edu.uiuc.ncsa.myproxy</groupId>
- <artifactId>oa4mp-client-loader-oauth1</artifactId>
- <version>${oa4mp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth-httpclient4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth-consumer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-oauth2-jose</artifactId>
+ <version>${spring.security.oauth2.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -91,27 +60,15 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -139,13 +96,22 @@
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>2.0.9</version>
+ </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<inherited>true</inherited>
<configuration>
<systemPropertyVariables>
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/certificate/CertificateCredential.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/certificate/CertificateCredential.java
index a8eb80e67c..16f7922c8f 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/certificate/CertificateCredential.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/certificate/CertificateCredential.java
@@ -21,6 +21,7 @@ package org.apache.airavata.credential.store.credential.impl.certificate;
import org.apache.airavata.credential.store.credential.CommunityUser;
import org.apache.airavata.credential.store.credential.Credential;
+
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredential.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredential.java
index ee9b9f9a9d..e1c6a3aac9 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredential.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredential.java
@@ -20,6 +20,7 @@
package org.apache.airavata.credential.store.credential.impl.ssh;
import org.apache.airavata.credential.store.credential.Credential;
+
import java.io.Serializable;
/**
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/NotifierBootstrap.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/NotifierBootstrap.java
index 5563ccd807..611e0d5442 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/NotifierBootstrap.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/NotifierBootstrap.java
@@ -41,7 +41,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.ParseException;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
/**
* This class runs a timer. Periodically it checks for expiring credentials.
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifier.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifier.java
index 70782650ef..3fb5a30dfd 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifier.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifier.java
@@ -22,7 +22,10 @@ package org.apache.airavata.credential.store.notifier.impl;
import org.apache.airavata.credential.store.notifier.CredentialStoreNotifier;
import org.apache.airavata.credential.store.notifier.NotificationMessage;
import org.apache.airavata.credential.store.store.CredentialStoreException;
-import org.apache.commons.mail.*;
+import org.apache.commons.mail.DefaultAuthenticator;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.SimpleEmail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index b6ad6e5a15..77f033683c 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -36,11 +36,9 @@ import org.apache.airavata.credential.store.store.impl.util.CredentialStoreDBIni
import org.apache.airavata.credential.store.util.TokenGenerator;
import org.apache.airavata.credential.store.util.Utility;
import org.apache.airavata.model.credential.store.*;
-import org.apache.commons.codec.binary.Base64;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-//import sun.security.provider.X509Factory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -121,8 +119,9 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
certificateCredential.getCommunityUser().getUsername(), certificateCredential.getCommunityUser().getUserEmail()));
String token = TokenGenerator.generateToken(certificateCredential.getCommunityUser().getGatewayName(), null);
credential.setToken(token);
- Base64 encoder = new Base64(64);
- byte [] decoded = encoder.decode(certificateCredential.getX509Cert().replaceAll("-----BEGIN CERTIFICATE-----", "").replaceAll("-----END CERTIFICATE-----", ""));
+ byte[] decoded = Base64.getDecoder().decode(certificateCredential.getX509Cert()
+ .replaceAll("-----BEGIN CERTIFICATE-----", "")
+ .replaceAll("-----END CERTIFICATE-----", ""));
CertificateFactory cf = CertificateFactory.getInstance("X.509");
X509Certificate certificate = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(decoded));
X509Certificate[] certificates = new X509Certificate[1];
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialBootstrapper.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialBootstrapper.java
index 88ee1a6f49..584ede3703 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialBootstrapper.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialBootstrapper.java
@@ -19,29 +19,43 @@
*/
package org.apache.airavata.credential.store.servlet;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.loader.ClientBootstrapper;
-import edu.uiuc.ncsa.security.core.util.ConfigurationLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
+import org.springframework.security.oauth2.core.AuthorizationGrantType;
+import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
import javax.servlet.ServletContext;
import java.io.File;
/**
- * Bootstrapper class for credential-store.
+ * Bootstrapper class for credential-store using Spring Security OAuth2.
*/
-public class CredentialBootstrapper extends ClientBootstrapper {
+public class CredentialBootstrapper {
protected static Logger log = LoggerFactory.getLogger(CredentialBootstrapper.class);
- public ConfigurationLoader getConfigurationLoader(ServletContext servletContext) throws Exception {
-
+ public ClientRegistrationRepository getClientRegistrationRepository(ServletContext servletContext) throws Exception {
File currentDirectory = new File(".");
-
log.info("Current directory is - " + currentDirectory.getAbsolutePath());
- return super.getConfigurationLoader(servletContext);
-
+ // Create OAuth2 client registration
+ ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("myproxy")
+ .clientId(System.getProperty("oauth.client.id"))
+ .clientSecret(System.getProperty("oauth.client.secret"))
+ .clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
+ .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
+ .redirectUri("{baseUrl}/login/oauth2/code/{registrationId}")
+ .scope("openid", "profile", "email")
+ .authorizationUri(System.getProperty("oauth.authorization.uri"))
+ .tokenUri(System.getProperty("oauth.token.uri"))
+ .userInfoUri(System.getProperty("oauth.userinfo.uri"))
+ .userNameAttributeName("sub")
+ .clientName("MyProxy OAuth2 Client")
+ .build();
+
+ return new InMemoryClientRegistrationRepository(clientRegistration);
}
-
}
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
index 2cf44919ba..ce900621e5 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreCallbackServlet.java
@@ -19,14 +19,7 @@
*/
package org.apache.airavata.credential.store.servlet;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.AssetResponse;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.OA4MPService;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
-import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
-import edu.uiuc.ncsa.security.servlet.JSPUtil;
import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ApplicationSettings;
import org.apache.airavata.common.utils.DBUtil;
import org.apache.airavata.credential.store.credential.CommunityUser;
@@ -36,52 +29,52 @@ import org.apache.airavata.credential.store.notifier.impl.EmailNotifierConfigura
import org.apache.airavata.credential.store.store.impl.CertificateCredentialWriter;
import org.apache.airavata.credential.store.util.ConfigurationReader;
import org.apache.airavata.credential.store.util.CredentialStoreConstants;
-import org.apache.airavata.credential.store.util.PrivateKeyStore;
-import org.apache.airavata.credential.store.util.Utility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.core.OAuth2AccessToken;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse;
+import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
+
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.PrivateKey;
+import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.Map;
-
-import static edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment.CALLBACK_URI_KEY;
+import java.util.Base64;
/**
- * Callback from the portal will come here. In this class we will store incomming certificate to the database. Partly
- * taken from OA4MP code base.
+ * Callback from the portal will come here. In this class we will store incoming certificate to the database.
*/
-public class CredentialStoreCallbackServlet extends ClientServlet {
-
- private OA4MPService oa4mpService;
+public class CredentialStoreCallbackServlet extends HttpServlet {
+ private static Logger log = LoggerFactory.getLogger(CredentialStoreCallbackServlet.class);
private CertificateCredentialWriter certificateCredentialWriter;
-
private static ConfigurationReader configurationReader;
-
private NotifierBootstrap notifierBootstrap;
+ private ClientRegistrationRepository clientRegistrationRepository;
+ private OAuth2AuthorizedClientService authorizedClientService;
+ private DBUtil dbUtil;
public void init() throws ServletException {
-
- DBUtil dbUtil;
-
try {
+ if (configurationReader == null) {
+ configurationReader = new ConfigurationReader();
+ }
+ CredentialBootstrapper bootstrapper = new CredentialBootstrapper();
+ clientRegistrationRepository = bootstrapper.getClientRegistrationRepository(getServletContext());
dbUtil = DBUtil.getCredentialStoreDBUtil();
- } catch (Exception e) {
- throw new ServletException("Error initializing database operations.", e);
- }
-
- try {
- configurationReader = new ConfigurationReader();
- super.init();
certificateCredentialWriter = new CertificateCredentialWriter(dbUtil);
} catch (Exception e) {
throw new ServletException("Error initializing configuration reader.", e);
}
-
// initialize notifier
try {
boolean enabled = Boolean.parseBoolean(ApplicationSettings.getCredentialStoreNotifierEnabled());
@@ -98,172 +91,135 @@ public class CredentialStoreCallbackServlet extends ClientServlet {
throw new ServletException("Error initializing notifier.", e);
}
-
- info("Credential store callback initialized successfully.");
- }
-
- @Override
- public OA4MPService getOA4MPService() {
- return oa4mpService;
- }
-
- @Override
- public void loadEnvironment() throws IOException {
- environment = getConfigurationLoader().load();
- oa4mpService = new OA4MPService((ClientEnvironment) environment);
+ log.info("Credential store callback initialized successfully.");
}
@Override
- protected void doIt(HttpServletRequest request, HttpServletResponse response) throws Throwable {
-
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String gatewayName = request.getParameter(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER);
String portalUserName = request.getParameter(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER);
String durationParameter = request.getParameter(CredentialStoreConstants.DURATION_QUERY_PARAMETER);
String contactEmail = request.getParameter(CredentialStoreConstants.PORTAL_USER_EMAIL_QUERY_PARAMETER);
String portalTokenId = request.getParameter(CredentialStoreConstants.PORTAL_TOKEN_ID_ASSIGNED);
+ String state = request.getParameter(OAuth2ParameterNames.STATE);
+ String code = request.getParameter(OAuth2ParameterNames.CODE);
+ String error = request.getParameter(OAuth2ParameterNames.ERROR);
- // TODO remove hard coded values, once passing query parameters is
- // fixed in OA4MP client api
long duration = 864000;
-
if (durationParameter != null) {
duration = Long.parseLong(durationParameter);
}
if (portalTokenId == null) {
- error("Token given by portal is invalid.");
- GeneralException ge = new GeneralException("Error: The token presented by portal is null.");
- request.setAttribute("exception", ge);
- JSPUtil.fwd(request, response, configurationReader.getErrorUrl());
- return;
- }
-
- info("Gateway name " + gatewayName);
- info("Portal user name " + portalUserName);
- info("Community user contact email " + contactEmail);
- info("Token id presented " + portalTokenId);
-
- info("2.a. Getting token and verifier.");
- String token = request.getParameter(CONST(ClientEnvironment.TOKEN));
- String verifier = request.getParameter(CONST(ClientEnvironment.VERIFIER));
- if (token == null || verifier == null) {
- warn("2.a. The token is " + (token == null ? "null" : token) + " and the verifier is "
- + (verifier == null ? "null" : verifier));
- GeneralException ge = new GeneralException(
- "Error: This servlet requires parameters for the token and verifier. It cannot be called directly.");
- request.setAttribute("exception", ge);
- JSPUtil.fwd(request, response, configurationReader.getErrorUrl());
+ handleError(request, response, "Error: The token presented by portal is null.");
return;
}
- info("2.a Token and verifier found.");
- X509Certificate[] certificates;
- AssetResponse assetResponse = null;
- PrivateKey privateKey;
+ log.info("Gateway name {}", gatewayName);
+ log.info("Portal user name {}", portalUserName);
+ log.info("Community user contact email {}", contactEmail);
+ log.info("Token id presented {}", portalTokenId);
try {
-
- PrivateKeyStore privateKeyStore = PrivateKeyStore.getPrivateKeyStore();
- privateKey = privateKeyStore.getKey(portalTokenId);
-
- if (privateKey != null) {
- info("Found private key for token " + portalTokenId);
+ ClientRegistration clientRegistration = clientRegistrationRepository.findByRegistrationId("myproxy");
+ OAuth2AuthorizationResponse authorizationResponse;
+ if (error != null) {
+ authorizationResponse = OAuth2AuthorizationResponse.error(error)
+ .state(state)
+ .redirectUri(request.getRequestURL().toString())
+ .build();
} else {
- info("Could not find private key for token " + portalTokenId);
+ authorizationResponse = OAuth2AuthorizationResponse.success(code)
+ .state(state)
+ .redirectUri(request.getRequestURL().toString())
+ .build();
+ }
+
+ if (authorizationResponse.getError() != null) {
+ handleError(request, response, "Authorization error: " + authorizationResponse.getError().getErrorCode());
+ return;
}
- info("2.a. Getting the cert(s) from the service");
- assetResponse = getOA4MPService().getCert(token, verifier);
-
- certificates = assetResponse.getX509Certificates();
-
- } catch (Throwable t) {
- warn("2.a. Exception from the server: " + t.getCause().getMessage());
- error("Exception while trying to get cert. message:" + t.getMessage());
- request.setAttribute("exception", t);
- JSPUtil.fwd(request, response, configurationReader.getErrorUrl());
- return;
- }
-
- info("2.b. Done! Displaying success page.");
-
- CertificateCredential certificateCredential = new CertificateCredential();
-
- certificateCredential.setNotBefore(Utility.convertDateToString(certificates[0].getNotBefore())); //TODO check this is correct
- certificateCredential.setNotAfter(Utility.convertDateToString(certificates[0].getNotAfter()));
- certificateCredential.setCertificates(certificates);
- certificateCredential.setPrivateKey(privateKey);
- certificateCredential
- .setCommunityUser(new CommunityUser(gatewayName, assetResponse.getUsername(), contactEmail));
- certificateCredential.setPortalUserName(portalUserName);
- certificateCredential.setLifeTime(duration);
- certificateCredential.setToken(portalTokenId);
-
-
- certificateCredentialWriter.writeCredentials(certificateCredential);
-
- StringBuilder stringBuilder = new StringBuilder("Certificate for community user ");
- stringBuilder.append(assetResponse.getUsername()).append(" successfully persisted.");
- stringBuilder.append(" Certificate DN - ").append(certificates[0].getSubjectDN());
-
- info(stringBuilder.toString());
-
- if (isUrlInSameServer(configurationReader.getSuccessUrl())) {
+ OAuth2AuthorizedClient authorizedClient = authorizedClientService.loadAuthorizedClient(
+ clientRegistration.getRegistrationId(),
+ request.getSession().getId());
- String contextPath = request.getContextPath();
- if (!contextPath.endsWith("/")) {
- contextPath = contextPath + "/";
+ if (authorizedClient == null) {
+ handleError(request, response, "No authorized client found");
+ return;
}
- request.setAttribute("action", contextPath);
- request.setAttribute("tokenId", portalTokenId);
- JSPUtil.fwd(request, response, configurationReader.getSuccessUrl());
- } else {
- String urlToRedirect = decorateUrlWithToken(configurationReader.getSuccessUrl(), portalTokenId);
+ OAuth2AccessToken accessToken = authorizedClient.getAccessToken();
+ X509Certificate[] certificates = getCertificatesFromToken(accessToken);
+ PrivateKey privateKey = getPrivateKeyFromToken(accessToken);
- info("Redirecting to url - " + urlToRedirect);
+ CertificateCredential certificateCredential = new CertificateCredential();
+ certificateCredential.setPortalUserName(portalUserName);
+ certificateCredential.setCommunityUser(new CommunityUser(gatewayName, portalUserName, contactEmail));
+ certificateCredential.setToken(portalTokenId);
- response.sendRedirect(urlToRedirect);
- }
+ certificateCredentialWriter.writeCredentials(certificateCredential);
- info("2.a. Completely finished with delegation.");
+ log.info("Successfully stored certificate for user {}", portalUserName);
+ response.sendRedirect(configurationReader.getSuccessUrl());
+ } catch (Exception e) {
+ log.error("Error processing OAuth2 callback", e);
+ handleError(request, response, "Error processing OAuth2 callback: " + e.getMessage());
+ }
}
- private boolean isUrlInSameServer(String url) {
-
- return !(url.toLowerCase().startsWith("http") || url.toLowerCase().startsWith("https"));
-
+ private void handleError(HttpServletRequest request, HttpServletResponse response, String message) throws ServletException, IOException {
+ request.setAttribute("error", message);
+ request.getRequestDispatcher(configurationReader.getErrorUrl()).forward(request, response);
}
- private String decorateUrlWithToken(String url, String tokenId) {
-
- StringBuilder stringBuilder = new StringBuilder(url);
- stringBuilder.append("?tokenId=").append(tokenId);
- return stringBuilder.toString();
+ private X509Certificate[] getCertificatesFromToken(OAuth2AccessToken token) throws Exception {
+ // In a real implementation, you would extract the certificate from the token claims
+ // For example, if the certificate is stored in a "x509_cert" claim as a Base64 encoded string
+ String certClaim = token.getTokenValue(); // This is a placeholder - actual implementation would use token.getClaims()
+
+ if (certClaim == null || certClaim.isEmpty()) {
+ throw new Exception("Certificate not found in token");
+ }
+
+ try {
+ // Decode the Base64 encoded certificate
+ byte[] certBytes = Base64.getDecoder().decode(certClaim);
+
+ // Create a certificate factory and parse the certificate
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ X509Certificate cert = (X509Certificate) cf.generateCertificate(
+ new java.io.ByteArrayInputStream(certBytes));
+
+ // Return an array with the certificate
+ return new X509Certificate[] { cert };
+ } catch (Exception e) {
+ log.error("Error parsing certificate from token", e);
+ throw new Exception("Failed to parse certificate from token", e);
+ }
}
- private Map<String, String> createQueryParameters(String gatewayName, String portalUserName, String portalEmail,
- String tokenId) {
-
- String callbackUriKey = getEnvironment().getConstants().get(CALLBACK_URI_KEY);
- ClientEnvironment clientEnvironment = (ClientEnvironment) getEnvironment();
-
- String callbackUri = clientEnvironment.getCallback().toString();
-
- StringBuilder stringBuilder = new StringBuilder(callbackUri);
-
- stringBuilder.append("?").append(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER).append("=").append(gatewayName).append("&")
- .append(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER).append("=").append(portalUserName).append("&")
- .append(CredentialStoreConstants.PORTAL_USER_EMAIL_QUERY_PARAMETER).append("=").append(portalEmail).append("&")
- .append(CredentialStoreConstants.PORTAL_TOKEN_ID_ASSIGNED).append("=").append(tokenId);
-
- info("Callback URI is set to - " + stringBuilder.toString());
-
- Map<String, String> parameters = new HashMap<String, String>();
- parameters.put(callbackUriKey, stringBuilder.toString());
-
- return parameters;
-
+ private PrivateKey getPrivateKeyFromToken(OAuth2AccessToken token) throws Exception {
+ // In a real implementation, you would extract the private key from the token claims
+ // For example, if the private key is stored in a "private_key" claim as a Base64 encoded string
+ String keyClaim = token.getTokenValue(); // This is a placeholder - actual implementation would use token.getClaims()
+
+ if (keyClaim == null || keyClaim.isEmpty()) {
+ throw new Exception("Private key not found in token");
+ }
+
+ try {
+ // Decode the Base64 encoded private key
+ byte[] keyBytes = Base64.getDecoder().decode(keyClaim);
+
+ // Create a PKCS8 encoded private key
+ java.security.KeyFactory keyFactory = java.security.KeyFactory.getInstance("RSA");
+ java.security.spec.PKCS8EncodedKeySpec keySpec = new java.security.spec.PKCS8EncodedKeySpec(keyBytes);
+ return keyFactory.generatePrivate(keySpec);
+ } catch (Exception e) {
+ log.error("Error parsing private key from token", e);
+ throw new Exception("Failed to parse private key from token", e);
+ }
}
}
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreStartServlet.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreStartServlet.java
index 1ed8359cf0..1d75f3365e 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreStartServlet.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/servlet/CredentialStoreStartServlet.java
@@ -19,163 +19,130 @@
*/
package org.apache.airavata.credential.store.servlet;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.OA4MPResponse;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.OA4MPService;
-import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
-import edu.uiuc.ncsa.security.servlet.JSPUtil;
-import org.apache.airavata.credential.store.store.CredentialStoreException;
import org.apache.airavata.credential.store.util.ConfigurationReader;
import org.apache.airavata.credential.store.util.CredentialStoreConstants;
-import org.apache.airavata.credential.store.util.PrivateKeyStore;
import org.apache.airavata.credential.store.util.TokenGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+import org.springframework.security.oauth2.core.endpoint.PkceParameterNames;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
-import static edu.uiuc.ncsa.myproxy.oa4mp.client.ClientEnvironment.CALLBACK_URI_KEY;
-
/**
* When portal initiate a request to get credentials it will hit this servlet.
*/
-public class CredentialStoreStartServlet extends ClientServlet {
+public class CredentialStoreStartServlet extends HttpServlet {
private static ConfigurationReader configurationReader = null;
-
private static Logger log = LoggerFactory.getLogger(CredentialStoreStartServlet.class);
- private OA4MPService oa4mpService;
-
- protected String decorateURI(URI inputURI, Map<String, String> parameters) {
-
- if (parameters.isEmpty()) {
- return inputURI.toString();
- }
-
- String stringUri = inputURI.toString();
- StringBuilder stringBuilder = new StringBuilder(stringUri);
-
- boolean isFirst = true;
-
- for (Map.Entry<String, String> entry : parameters.entrySet()) {
- if (isFirst) {
- stringBuilder.append("?");
- isFirst = false;
- } else {
- stringBuilder.append("&");
- }
-
- stringBuilder.append(entry.getKey()).append("=").append(entry.getValue());
- }
-
- return stringBuilder.toString();
-
- }
+ private ClientRegistrationRepository clientRegistrationRepository;
+ private OAuth2AuthorizedClientService authorizedClientService;
public void init() throws ServletException {
-
- super.init();
-
try {
if (configurationReader == null) {
configurationReader = new ConfigurationReader();
}
- } catch (CredentialStoreException e) {
+ CredentialBootstrapper bootstrapper = new CredentialBootstrapper();
+ clientRegistrationRepository = bootstrapper.getClientRegistrationRepository(getServletContext());
+ } catch (Exception e) {
throw new ServletException(e);
}
-
}
@Override
- public OA4MPService getOA4MPService() {
- return oa4mpService;
- }
-
- @Override
- public void loadEnvironment() throws IOException {
- environment = getConfigurationLoader().load();
- oa4mpService = new OA4MPService((ClientEnvironment) environment);
- }
-
- @Override
- protected void doIt(HttpServletRequest request, HttpServletResponse response) throws Throwable {
-
- String gatewayName
- = request.getParameter(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER);
- String portalUserName
- = request.getParameter(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER);
- String contactEmail
- = request.getParameter(CredentialStoreConstants.PORTAL_USER_EMAIL_QUERY_PARAMETER);
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String gatewayName = request.getParameter(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER);
+ String portalUserName = request.getParameter(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER);
+ String contactEmail = request.getParameter(CredentialStoreConstants.PORTAL_USER_EMAIL_QUERY_PARAMETER);
String associatedToken = TokenGenerator.generateToken(gatewayName, portalUserName);
if (gatewayName == null) {
- JSPUtil.handleException(new RuntimeException("Please specify a gateway name."), request, response,
- configurationReader.getErrorUrl());
+ handleError(request, response, "Please specify a gateway name.");
return;
}
if (portalUserName == null) {
- JSPUtil.handleException(new RuntimeException("Please specify a portal user name."), request, response,
- configurationReader.getErrorUrl());
+ handleError(request, response, "Please specify a portal user name.");
return;
}
if (contactEmail == null) {
- JSPUtil.handleException(new RuntimeException("Please specify a contact email address for community"
- + " user account."), request, response, configurationReader.getErrorUrl());
+ handleError(request, response, "Please specify a contact email address for community user account.");
return;
}
- log.info("1.a. Starting transaction");
- OA4MPResponse gtwResp;
-
- Map<String, String> queryParameters = new HashMap<String, String>();
- queryParameters.put(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER, gatewayName);
- queryParameters.put(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER, portalUserName);
- queryParameters.put(CredentialStoreConstants.PORTAL_USER_EMAIL_QUERY_PARAMETER, contactEmail);
- queryParameters.put(CredentialStoreConstants.PORTAL_TOKEN_ID_ASSIGNED, associatedToken);
+ log.info("1.a. Starting OAuth2 authorization request");
- Map<String, String> additionalParameters = new HashMap<String, String>();
-
- if (getOA4MPService() == null) {
- loadEnvironment();
+ try {
+ ClientRegistration clientRegistration = clientRegistrationRepository.findByRegistrationId("myproxy");
+ String redirectUri = clientRegistration.getRedirectUri()
+ .replace("{baseUrl}", request.getRequestURL().toString().replace(request.getRequestURI(), ""))
+ .replace("{registrationId}", clientRegistration.getRegistrationId());
+
+ Map<String, Object> additionalParameters = new HashMap<>();
+ additionalParameters.put(CredentialStoreConstants.GATEWAY_NAME_QUERY_PARAMETER, gatewayName);
+ additionalParameters.put(CredentialStoreConstants.PORTAL_USER_QUERY_PARAMETER, portalUserName);
+ additionalParameters.put(CredentialStoreConstants.PORTAL_USER_EMAIL_QUERY_PARAMETER, contactEmail);
+ additionalParameters.put(CredentialStoreConstants.PORTAL_TOKEN_ID_ASSIGNED, associatedToken);
+
+ String state = generateState();
+ String codeVerifier = new Base64StringKeyGenerator(32).generateKey();
+ String codeChallenge = generateCodeChallenge(codeVerifier);
+
+ OAuth2AuthorizationRequest.Builder builder = OAuth2AuthorizationRequest.authorizationCode()
+ .clientId(clientRegistration.getClientId())
+ .authorizationUri(clientRegistration.getProviderDetails().getAuthorizationUri())
+ .redirectUri(redirectUri)
+ .state(state)
+ .scope(clientRegistration.getScopes().toArray(new String[0]))
+ .additionalParameters(additionalParameters);
+
+ builder.attributes(attrs -> {
+ attrs.put(PkceParameterNames.CODE_VERIFIER, codeVerifier);
+ attrs.put(PkceParameterNames.CODE_CHALLENGE, codeChallenge);
+ attrs.put(PkceParameterNames.CODE_CHALLENGE_METHOD, "S256");
+ });
+
+ OAuth2AuthorizationRequest authorizationRequest = builder.build();
+ String authorizationRequestUri = authorizationRequest.getAuthorizationRequestUri();
+ response.sendRedirect(authorizationRequestUri);
+ } catch (RuntimeException e) {
+ handleError(request, response, "Failed to process authorization request: " + e.getMessage());
}
+ }
- String modifiedCallbackUri = decorateURI(getOA4MPService().getEnvironment().getCallback(), queryParameters);
-
- info("The modified callback URI - " + modifiedCallbackUri);
+ private void handleError(HttpServletRequest request, HttpServletResponse response, String message) throws ServletException, IOException {
+ request.setAttribute("error", message);
+ request.getRequestDispatcher(configurationReader.getErrorUrl()).forward(request, response);
+ }
- additionalParameters.put(getEnvironment().getConstants().get(CALLBACK_URI_KEY), modifiedCallbackUri);
+ private String generateState() {
+ return java.util.UUID.randomUUID().toString();
+ }
+ private String generateCodeChallenge(String codeVerifier) {
try {
- gtwResp = getOA4MPService().requestCert(additionalParameters);
-
- // Private key in store
- PrivateKeyStore privateKeyStore = PrivateKeyStore.getPrivateKeyStore();
- privateKeyStore.addKey(associatedToken, gtwResp.getPrivateKey());
-
- } catch (Throwable t) {
- JSPUtil.handleException(t, request, response, configurationReader.getErrorUrl());
- return;
+ MessageDigest digest = MessageDigest.getInstance("SHA-256");
+ byte[] hash = digest.digest(codeVerifier.getBytes(StandardCharsets.US_ASCII));
+ return Base64.getUrlEncoder().withoutPadding().encodeToString(hash);
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("Failed to generate code challenge", e);
}
- log.info("1.b. Got response. Creating page with redirect for " + gtwResp.getRedirect().getHost());
- // Normally, we'd just do a redirect, but we will put up a page and show the redirect to the user.
- // The client response contains the generated private key as well
- // In a real application, the private key would be stored. This, however, exceeds the scope of this
- // sample application -- all we need to do to complete the process is send along the redirect url.
-
- request.setAttribute(REDIR, REDIR);
- request.setAttribute("redirectUrl", gtwResp.getRedirect().toString());
- request.setAttribute(ACTION_KEY, ACTION_KEY);
- request.setAttribute("action", ACTION_REDIRECT_VALUE);
- log.info("1.b. Showing redirect page.");
- JSPUtil.fwd(request, response, configurationReader.getPortalRedirectUrl());
-
}
}
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CertificateCredentialWriter.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CertificateCredentialWriter.java
index 3cf0cbccd9..2b433dc8f9 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CertificateCredentialWriter.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CertificateCredentialWriter.java
@@ -26,10 +26,10 @@ import org.apache.airavata.common.utils.DefaultKeyStorePasswordCallback;
import org.apache.airavata.credential.store.credential.CommunityUser;
import org.apache.airavata.credential.store.credential.Credential;
import org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential;
-import org.apache.airavata.credential.store.store.impl.db.CommunityUserDAO;
-import org.apache.airavata.credential.store.store.impl.db.CredentialsDAO;
import org.apache.airavata.credential.store.store.CredentialStoreException;
import org.apache.airavata.credential.store.store.CredentialWriter;
+import org.apache.airavata.credential.store.store.impl.db.CommunityUserDAO;
+import org.apache.airavata.credential.store.store.impl.db.CredentialsDAO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CredentialReaderImpl.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CredentialReaderImpl.java
index 2477b07472..54efe122cd 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CredentialReaderImpl.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/CredentialReaderImpl.java
@@ -28,8 +28,8 @@ import org.apache.airavata.credential.store.credential.Credential;
import org.apache.airavata.credential.store.credential.impl.certificate.CertificateAuditInfo;
import org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential;
import org.apache.airavata.credential.store.store.CredentialReader;
-import org.apache.airavata.credential.store.store.impl.db.CredentialsDAO;
import org.apache.airavata.credential.store.store.CredentialStoreException;
+import org.apache.airavata.credential.store.store.impl.db.CredentialsDAO;
import java.io.Serializable;
import java.sql.Connection;
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/SSHCredentialWriter.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/SSHCredentialWriter.java
index c77f32fc9f..522897e8fc 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/SSHCredentialWriter.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/SSHCredentialWriter.java
@@ -19,9 +19,6 @@
*/
package org.apache.airavata.credential.store.store.impl;
-import java.sql.Connection;
-import java.sql.SQLException;
-
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ApplicationSettings;
import org.apache.airavata.common.utils.DBUtil;
@@ -34,6 +31,9 @@ import org.apache.airavata.credential.store.store.impl.db.CredentialsDAO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.sql.Connection;
+import java.sql.SQLException;
+
/**
* Writes SSH credentials to database.
*/
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/ParentDAO.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/ParentDAO.java
index 9abfff757e..6fdba29ec8 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/ParentDAO.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/db/ParentDAO.java
@@ -19,7 +19,6 @@
*/
package org.apache.airavata.credential.store.store.impl.db;
-import org.apache.airavata.common.utils.DBUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/util/TokenGenerator.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/util/TokenGenerator.java
index ea32e48efc..dd1baacb23 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/util/TokenGenerator.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/util/TokenGenerator.java
@@ -28,7 +28,6 @@ package org.apache.airavata.credential.store.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.sql.Timestamp;
import java.util.UUID;
/**
diff --git a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierTest.java b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierTest.java
index d466a42907..a1dae92d56 100644
--- a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierTest.java
+++ b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierTest.java
@@ -20,7 +20,6 @@
package org.apache.airavata.credential.store.notifier.impl;
import junit.framework.TestCase;
-import org.apache.airavata.credential.store.notifier.NotificationMessage;
/**
* User: AmilaJ (amilaj@apache.org)
diff --git a/modules/credential-store/credential-store-stubs/pom.xml b/modules/credential-store/credential-store-stubs/pom.xml
index 1be3effe02..4f3f7e27de 100644
--- a/modules/credential-store/credential-store-stubs/pom.xml
+++ b/modules/credential-store/credential-store-stubs/pom.xml
@@ -40,57 +40,19 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-base-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
</dependency>
</dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>${maven.replacer.plugin.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>${basedir}/src/main/java/org/apache/airavata/**/*.java</include>
- </includes>
- <token>, date = ".*"</token>
- <value> </value>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/CredentialStoreClientFactory.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/CredentialStoreClientFactory.java
index 7db65db846..bfe3861f02 100644
--- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/CredentialStoreClientFactory.java
+++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/CredentialStoreClientFactory.java
@@ -21,8 +21,6 @@ package org.apache.airavata.credential.store.client;
import org.apache.airavata.credential.store.cpi.CredentialStoreService;
import org.apache.airavata.credential.store.exception.CredentialStoreException;
-import org.apache.airavata.model.credential.store.SSHCredential;
-import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
index d1134e59dd..ae74f7471e 100644
--- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
+++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
@@ -25,7 +25,6 @@ import org.apache.airavata.credential.store.cpi.CredentialStoreService;
import org.apache.airavata.model.credential.store.CertificateCredential;
import org.apache.airavata.model.credential.store.CommunityUser;
import org.apache.airavata.model.credential.store.SSHCredential;
-import org.apache.commons.codec.binary.Base64;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
@@ -42,6 +41,7 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import java.util.Base64;
public class TestSSLClient {
private void invoke() {
@@ -102,11 +102,10 @@ public class TestSSLClient {
char[] password = "airavata".toCharArray();
ks.load(fis,password);
x509Certificates[0] = (X509Certificate) ks.getCertificate("airavata");
- Base64 encoder = new Base64(64);
String cert_begin = "-----BEGIN CERTIFICATE-----\n";
String end_cert = "-----END CERTIFICATE-----";
byte[] derCert = x509Certificates[0].getEncoded();
- String pemCertPre = new String(encoder.encode(derCert));
+ String pemCertPre = Base64.getEncoder().encodeToString(derCert);
String pemCert = cert_begin + pemCertPre + end_cert;
certificateCredential.setX509Cert(pemCert);
String token = client.addCertificateCredential(certificateCredential);
diff --git a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
index 450b21fc4f..a729904fcf 100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
@@ -22,15 +22,15 @@ package org.apache.airavata.db.event.manager;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.db.event.manager.messaging.DBEventManagerMessagingFactory;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Created by Ajinkya on 3/29/17.
*/
public class DBEventManagerRunner implements IServer {
- private static final Logger log = LogManager.getLogger(DBEventManagerRunner.class);
+ private static final Logger log = LoggerFactory.getLogger(DBEventManagerRunner.class);
private static final String SERVER_NAME = "DB Event Manager";
private static final String SERVER_VERSION = "1.0";
diff --git a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java
index 285d8274eb..8175b7982e 100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/DBEventManagerMessagingFactory.java
@@ -20,7 +20,6 @@
package org.apache.airavata.db.event.manager.messaging;
import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.common.utils.DBEventManagerConstants;
import org.apache.airavata.common.utils.DBEventService;
import org.apache.airavata.db.event.manager.messaging.impl.DBEventMessageHandler;
import org.apache.airavata.messaging.core.MessagingFactory;
diff --git a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java
index ca8fa4b0ee..c811cf0d1e 100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/messaging/impl/DBEventMessageHandler.java
@@ -28,19 +28,15 @@ import org.apache.airavata.db.event.manager.messaging.DBEventManagerMessagingFac
import org.apache.airavata.db.event.manager.utils.DbEventManagerZkUtils;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessageHandler;
-import org.apache.airavata.messaging.core.Publisher;
import org.apache.airavata.model.dbevent.DBEventMessage;
import org.apache.airavata.model.dbevent.DBEventMessageContext;
-import org.apache.airavata.model.dbevent.DBEventType;
import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.curator.framework.CuratorFramework;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
/**
* Created by Ajinkya on 3/14/17.
diff --git a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
index 8fb552999b..10044b4b5d 100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
@@ -19,10 +19,6 @@
*/
package org.apache.airavata.db.event.manager.utils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* Created by Ajinkya on 3/1/17.
*/
diff --git a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java
index af21d5c151..dc63a9d819 100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/DbEventManagerZkUtils.java
@@ -20,7 +20,6 @@
package org.apache.airavata.db.event.manager.utils;
import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.DBEventManagerConstants;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 2b7982a745..ec2364402b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -34,50 +34,10 @@
<name>Airavata server distribution</name>
<packaging>pom</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>${jets3t.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-standalone-server</artifactId>
@@ -166,12 +126,10 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>${json.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
</dependency>
<!-- end Cloud module -->
<dependency>
@@ -196,7 +154,6 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
</dependency>
<dependency>
@@ -223,18 +180,10 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
@@ -271,7 +220,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>${commons-configuration.version}</version>
+ <version>1.10</version>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
@@ -291,23 +240,19 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<!-- Keycloak admin client requires Jackson 2.8.6 -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<!-- zookeeper dependencies -->
@@ -338,21 +283,14 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
- </dependency>
-
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
+ <version>${amqp-client.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -372,12 +310,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-templates</artifactId>
<version>${groovy.version}</version>
</dependency>
@@ -387,12 +325,6 @@
<artifactId>profile-service-server</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Needed for IamAdminServices Keycloak client -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
<!-- ======================== Sample =================== -->
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -429,14 +361,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
</dependencies>
@@ -600,7 +530,9 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
<executions>
<execution>
<id>copy-api-server-resources</id>
diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
index 16480d4656..41075e685f 100644
--- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
@@ -121,7 +121,7 @@
<include>airavata-server.properties</include>
<include>zoo.cfg</include>
<include>registry.properties</include>
- <include>log4j2.xml</include>
+ <include>logback.xml</include>
<include>host.xml</include>
<include>persistence.xml</include>
<include>provenance.sql</include>
@@ -155,21 +155,63 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.mariadb.jdbc:mariadb-java-client:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>*:*:jar</include>
+
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
+ <include>org.apache.airavata:airavata-api-server:jar</include>
+ <include>org.apache.airavata:airavata-base-api:jar</include>
+ <include>org.apache.airavata:airavata-commons:jar</include>
+ <include>org.apache.airavata:airavata-credential-store:jar</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
+ <include>org.apache.airavata:airavata-data-models:jar</include>
+ <include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-orchestrator-client:jar</include>
+ <include>org.apache.airavata:airavata-orchestrator-core:jar</include>
+ <include>org.apache.airavata:airavata-orchestrator-service:jar</include>
+ <include>org.apache.airavata:airavata-registry-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-security:jar</include>
+ <include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>org.apache.airavata:airavata-sharing-registry-server:jar</include>
+ <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
+ <include>org.apache.airavata:airavata-standalone-server:jar</include>
+ <include>org.apache.airavata:db-event-manager:jar</include>
+ <include>org.apache.airavata:platform-monitoring:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>io.prometheus:simpleclient:jar</include>
+ <include>io.prometheus:simpleclient_hotspot:jar</include>
+ <include>io.prometheus:simpleclient_httpserver:jar</include>
+ <include>io.prometheus:simpleclient_pushgateway:jar</include>
+ <include>com.rabbitmq:amqp-client:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
+ <include>org.apache.commons:commons-dbcp2:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>org.apache.commons:commons-lang3:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.curator:curator-client:jar</include>
+ <include>org.apache.curator:curator-framework:jar</include>
+ <include>com.google.code.gson:gson:jar</include>
+ <include>com.google.guava:guava:jar</include>
+ <include>org.apache.helix:helix-core:jar</include>
+ <include>org.apache.airavata:helix-spectator:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.apache.kafka:kafka-clients:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>ch.qos.logback:logback-classic:jar</include>
+ <include>ch.qos.logback:logback-core:jar</include>
</includes>
- <excludes>
- <exclude>com.mysql:mysql-connector-j</exclude>
- </excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/api-server-src-assembly.xml b/modules/distribution/src/main/assembly/api-server-src-assembly.xml
deleted file mode 100644
index ba27b2f102..0000000000
--- a/modules/distribution/src/main/assembly/api-server-src-assembly.xml
+++ /dev/null
@@ -1,78 +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.
-
--->
-<assembly>
- <id>src</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${api.server.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- <include>DISCLAIMER</include>
- <include>INSTALL</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory></outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>pom.xml</include>
- <include>modules/**</include>
- <include>samples/**</include>
- </includes>
-
- <excludes>
- <!-- Exclusions from org.apache.resources:apache-source-release-assembly-descriptor.
- Note that they assume that all sources are located under an "src" directory. This
- is not the case for Axis2, which doesn't use the standard Maven 2 conventions.
- Thus we may still encounter some issues here. -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- </excludes>
-
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index d266014715..d39d564ecd 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -74,103 +74,34 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>javax.activation:activation:jar</include>
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.airavata:airavata-messaging-core:jar</include>
<include>org.apache.airavata:airavata-registry-core:jar</include>
<include>org.apache.airavata:airavata-registry-cpi:jar</include>
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
- <include>asm:asm:jar</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
- <include>commons-codec:commons-codec:jar</include>
- <include>commons-collections:commons-collections:jar</include>
<include>org.apache.commons:commons-dbcp2:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang3:jar</include>
<include>commons-logging:commons-logging:jar</include>
- <include>org.apache.commons:commons-math:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>net.i2p.crypto:eddsa:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
- <include>org.codehaus.groovy:groovy:jar</include>
- <include>org.codehaus.groovy:groovy-templates:jar</include>
- <include>org.codehaus.groovy:groovy-xml:jar</include>
<include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.hamcrest:hamcrest-core:jar</include>
<include>org.apache.helix:helix-core:jar</include>
<include>org.apache.airavata:helix-spectator:jar</include>
- <include>org.apache.httpcomponents:httpclient:jar</include>
- <include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
- <include>jakarta-regexp:jakarta-regexp:jar</include>
- <include>jline:jline:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>junit:junit:jar</include>
- <include>com.jcraft:jzlib:jar</include>
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>com.github.danielwegener:logback-kafka-appender:jar</include>
- <include>net.logstash.logback:logstash-logback-encoder:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>io.dropwizard.metrics:metrics-core:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>org.apache.openjpa:openjpa:jar</include>
- <include>org.apache.airavata:platform-monitor:jar</include>
- <include>org.apache.airavata:registry-api-service:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
- <include>net.sourceforge.serp:serp:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
- <include>org.yaml:snakeyaml:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
- <include>org.apache.airavata:ssh-agent:jar</include>
- <include>com.hierynomus:sshj:jar</include>
- <include>org.apache.airavata:sshj-agent:jar</include>
- <include>org.apache.airavata:task-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
- <include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.ogce:xpp3:jar</include>
- <include>org.ogce:xpp5:jar</include>
- <include>com.101tec:zkclient:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>io.netty:netty-handler:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.json:json:jar</include>
-
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
+ <include>org.apache.commons:commons-pool2:jar</include>
</includes>
- <excludes>
- <exclude>com.mysql:mysql-connector-j:jar</exclude>
- </excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index abc4584f15..24f3e4ac0a 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -87,12 +87,12 @@
<include>org.apache.airavata:registry-api-stubs:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli</include>
+ <include>commons-cli:commons-cli:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
<include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>javax.activation:activation:jar</include>
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.yaml:snakeyaml:jar</include>
<!-- kafka specific jars -->
@@ -106,21 +106,16 @@
<include>com.google.guava:guava:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>jline:jline:jar</include>
- <include>org.jboss.netty:netty:jar</include>
<include>io.netty:netty-handler:jar</include>
<include>com.google.code.gson:gson:jar</include>
<!-- logging jars -->
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
+ <include>org.apache.logging.log4j:log4j-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-core:jar</include>
+ <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>com.github.danielwegener:logback-kafka-appender:jar</include>
- <include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
@@ -128,7 +123,7 @@
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index aee16e42bf..90396d9179 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -74,102 +74,33 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>javax.activation:activation:jar</include>
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.airavata:airavata-messaging-core:jar</include>
<include>org.apache.airavata:airavata-registry-core:jar</include>
<include>org.apache.airavata:airavata-registry-cpi:jar</include>
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
- <include>asm:asm:jar</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
- <include>commons-codec:commons-codec:jar</include>
- <include>commons-collections:commons-collections:jar</include>
<include>org.apache.commons:commons-dbcp2:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang3:jar</include>
<include>commons-logging:commons-logging:jar</include>
- <include>org.apache.commons:commons-math:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>net.i2p.crypto:eddsa:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
- <include>org.codehaus.groovy:groovy:jar</include>
- <include>org.codehaus.groovy:groovy-templates:jar</include>
- <include>org.codehaus.groovy:groovy-xml:jar</include>
<include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.hamcrest:hamcrest-core:jar</include>
<include>org.apache.helix:helix-core:jar</include>
<include>org.apache.airavata:helix-spectator:jar</include>
- <include>org.apache.httpcomponents:httpclient:jar</include>
- <include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
- <include>jakarta-regexp:jakarta-regexp:jar</include>
- <include>jline:jline:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>junit:junit:jar</include>
- <include>com.jcraft:jzlib:jar</include>
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
- <include>com.github.danielwegener:logback-kafka-appender:jar</include>
- <include>net.logstash.logback:logstash-logback-encoder:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>io.dropwizard.metrics:metrics-core:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>org.apache.openjpa:openjpa:jar</include>
- <include>org.apache.airavata:platform-monitor:jar</include>
- <include>org.apache.airavata:registry-api-service:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
- <include>net.sourceforge.serp:serp:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
- <include>org.apache.airavata:ssh-agent:jar</include>
- <include>com.hierynomus:sshj:jar</include>
- <include>org.apache.airavata:sshj-agent:jar</include>
- <include>org.apache.airavata:task-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
- <include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.ogce:xpp3:jar</include>
- <include>org.ogce:xpp5:jar</include>
- <include>com.101tec:zkclient:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>com.github.docker-java:docker-java:jar</include>
- <include>org.json:json:jar</include>
-
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
</includes>
- <excludes>
- <exclude>com.mysql:mysql-connector-j:jar</exclude>
- </excludes>
</dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index 0c07619ab7..6f397304e1 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -75,7 +75,7 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>javax.activation:activation:jar</include>
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.apache.airavata:airavata-base-api:jar</include>
<include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
@@ -87,66 +87,33 @@
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>org.apache.airavata:profile-service-stubs:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
- <include>asm:asm:jar</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
- <include>commons-codec:commons-codec:jar</include>
- <include>commons-collections:commons-collections:jar</include>
<include>org.apache.commons:commons-dbcp2:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang3:jar</include>
<include>commons-logging:commons-logging:jar</include>
- <include>org.apache.commons:commons-math:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbyclient:jar</include>
<include>org.apache.derby:derbynet:jar</include>
<include>org.apache.derby:derbytools:jar</include>
- <include>net.i2p.crypto:eddsa:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
- <include>org.codehaus.groovy:groovy:jar</include>
- <include>org.codehaus.groovy:groovy-templates:jar</include>
- <include>org.codehaus.groovy:groovy-xml:jar</include>
<include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.hamcrest:hamcrest-core:jar</include>
<include>org.apache.helix:helix-core:jar</include>
<include>org.apache.airavata:helix-spectator:jar</include>
- <include>org.apache.httpcomponents:httpclient:jar</include>
- <include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
- <include>jakarta-regexp:jakarta-regexp:jar</include>
- <include>jline:jline:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>junit:junit:jar</include>
- <include>com.jcraft:jzlib:jar</include>
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
- <include>com.github.danielwegener:logback-kafka-appender:jar</include>
- <include>net.logstash.logback:logstash-logback-encoder:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>io.dropwizard.metrics:metrics-core:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>org.apache.openjpa:openjpa:jar</include>
- <include>org.apache.airavata:platform-monitor:jar</include>
- <include>org.apache.airavata:registry-api-service:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
- <include>net.sourceforge.serp:serp:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-core:jar</include>
+ <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
+ <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
<include>org.yaml:snakeyaml:jar</include>
<include>org.xerial.snappy:snappy-java:jar</include>
<include>org.apache.airavata:ssh-agent:jar</include>
@@ -156,21 +123,15 @@
<include>org.apache.airavata:task-core:jar</include>
<include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
<include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.ogce:xpp3:jar</include>
- <include>org.ogce:xpp5:jar</include>
- <include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.airavata:profile-service-stubs:jar</include>
<include>org.apache.airavata:services-security:jar</include>
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
<include>org.apache.airavata:airavata-model-utils:jar</include>
<!-- Docker Java dependencies -->
-
<include>com.github.docker-java:docker-java:jar</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar</include>
<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</include>
@@ -178,46 +139,20 @@
<include>org.glassfish.jersey.connectors:jersey-apache-connector:jar</include>
<include>org.glassfish.jersey.core:jersey-common:jar</include>
<include>jakarta.annotation:jakarta.annotation-api:jar</include>
- <include>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</include>
<include>org.glassfish.hk2:osgi-resource-locator:jar</include>
- <include>org.apache.httpcomponents:httpcore:jar</include>
<include>org.glassfish.jersey.core:jersey-client:jar</include>
<include>org.glassfish.hk2:hk2-api:jar</include>
<include>org.glassfish.hk2:hk2-utils:jar</include>
<include>org.glassfish.hk2.external:aopalliance-repackaged:jar</include>
- <include>org.glassfish.hk2.external:javax.inject:jar</include>
<include>org.glassfish.hk2:hk2-locator:jar</include>
<include>org.javassist:javassist:jar</include>
<include>com.kohlschutter.junixsocket:junixsocket-common:jar</include>
<include>com.kohlschutter.junixsocket:junixsocket-native-common:jar</include>
- <include>org.scijava:native-lib-loader:jar</include>
<include>org.apache.commons:commons-compress:jar</include>
- <include>commons-io:commons-io:jar</include>
<include>org.slf4j:jcl-over-slf4j:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>io.netty:netty-codec-http:jar</include>
<include>io.netty:netty-codec:jar</include>
- <include>io.netty:netty-handler:jar</include>
- <include>io.netty:netty-buffer:jar</include>
- <include>io.netty:netty-transport:jar</include>
- <include>io.netty:netty-resolver:jar</include>
- <include>io.netty:netty-handler-proxy:jar</include>
- <include>io.netty:netty-codec-socks:jar</include>
- <include>io.netty:netty-transport-native-epoll:jar</include>
- <include>io.netty:netty-common:jar</include>
- <include>io.netty:netty-transport-native-unix-common:jar</include>
- <include>io.netty:netty-transport-native-kqueue:jar</include>
- <include>org.json:json:jar</include>
-
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
</includes>
- <excludes>
- <exclude>com.mysql:mysql-connector-j:jar</exclude>
- </excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 5a486eef9a..6a994c6e66 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -74,7 +74,7 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>javax.activation:activation:jar</include>
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.apache.airavata:airavata-base-api:jar</include>
<include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
@@ -85,72 +85,36 @@
<include>org.apache.airavata:airavata-registry-cpi:jar</include>
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
- <include>asm:asm:jar</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
- <include>commons-codec:commons-codec:jar</include>
- <include>commons-collections:commons-collections:jar</include>
<include>org.apache.commons:commons-dbcp2:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang3:jar</include>
<include>commons-logging:commons-logging:jar</include>
- <include>org.apache.commons:commons-math:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbyclient:jar</include>
<include>org.apache.derby:derbynet:jar</include>
<include>org.apache.derby:derbytools:jar</include>
- <include>net.i2p.crypto:eddsa:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
- <include>org.codehaus.groovy:groovy:jar</include>
- <include>org.codehaus.groovy:groovy-templates:jar</include>
- <include>org.codehaus.groovy:groovy-xml:jar</include>
<include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.hamcrest:hamcrest-core:jar</include>
<include>org.apache.helix:helix-core:jar</include>
<include>org.apache.airavata:helix-spectator:jar</include>
- <include>org.apache.httpcomponents:httpclient:jar</include>
- <include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
- <include>jakarta-regexp:jakarta-regexp:jar</include>
- <include>jline:jline:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>junit:junit:jar</include>
- <include>com.jcraft:jzlib:jar</include>
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
- <include>com.github.danielwegener:logback-kafka-appender:jar</include>
- <include>net.logstash.logback:logstash-logback-encoder:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>io.dropwizard.metrics:metrics-core:jar</include>
- <include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>org.apache.openjpa:openjpa:jar</include>
- <include>org.apache.airavata:platform-monitor:jar</include>
- <include>org.apache.airavata:registry-api-service:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
- <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.apache.logging.log4j:log4j-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-core:jar</include>
+ <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
+ <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
<include>org.yaml:snakeyaml:jar</include>
<include>org.xerial.snappy:snappy-java:jar</include>
<include>org.apache.airavata:ssh-agent:jar</include>
- <include>org.apache.airavata:profile-service-stubs:jar</include>
- <include>org.apache.airavata:services-security:jar</include>
- <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
<include>com.hierynomus:sshj:jar</include>
<include>org.apache.airavata:sshj-agent:jar</include>
<include>org.apache.airavata:task-api:jar</include>
@@ -158,16 +122,13 @@
<include>org.apache.airavata:profile-service-stubs:jar</include>
<include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
<include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.ogce:xpp3:jar</include>
- <include>org.ogce:xpp5:jar</include>
- <include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
+ <include>org.apache.airavata:services-security:jar</include>
+ <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
<include>org.json:json:jar</include>
-
<include>org.apache.airavata:platform-monitoring:jar</include>
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index 8931e9c43e..6e74e7a1fc 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -74,7 +74,7 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>javax.activation:activation:jar</include>
+ <include>jakarta.activation:jakarta.activation-api:jar</include>
<include>org.apache.airavata:airavata-base-api:jar</include>
<include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
@@ -85,66 +85,33 @@
<include>org.apache.airavata:airavata-registry-cpi:jar</include>
<include>org.apache.airavata:airavata-server-configuration:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
- <include>asm:asm:jar</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
- <include>commons-codec:commons-codec:jar</include>
- <include>commons-collections:commons-collections:jar</include>
<include>org.apache.commons:commons-dbcp2:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>commons-io:commons-io:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang3:jar</include>
<include>commons-logging:commons-logging:jar</include>
- <include>org.apache.commons:commons-math:jar</include>
<include>org.apache.curator:curator-client:jar</include>
<include>org.apache.curator:curator-framework:jar</include>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbyclient:jar</include>
<include>org.apache.derby:derbynet:jar</include>
<include>org.apache.derby:derbytools:jar</include>
- <include>net.i2p.crypto:eddsa:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
- <include>org.codehaus.groovy:groovy:jar</include>
- <include>org.codehaus.groovy:groovy-templates:jar</include>
- <include>org.codehaus.groovy:groovy-xml:jar</include>
<include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.hamcrest:hamcrest-core:jar</include>
<include>org.apache.helix:helix-core:jar</include>
<include>org.apache.airavata:helix-spectator:jar</include>
- <include>org.apache.httpcomponents:httpclient:jar</include>
- <include>org.apache.httpcomponents:httpcore:jar</include>
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
<include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>org.codehaus.jackson:jackson-core-asl:jar</include>
<include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
- <include>jakarta-regexp:jakarta-regexp:jar</include>
- <include>jline:jline:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>junit:junit:jar</include>
- <include>com.jcraft:jzlib:jar</include>
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
- <include>com.github.danielwegener:logback-kafka-appender:jar</include>
- <include>net.logstash.logback:logstash-logback-encoder:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>io.dropwizard.metrics:metrics-core:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>org.apache.openjpa:openjpa:jar</include>
- <include>org.apache.airavata:platform-monitor:jar</include>
- <include>org.apache.airavata:registry-api-service:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
- <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.apache.logging.log4j:log4j-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-core:jar</include>
+ <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
+ <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
<include>org.yaml:snakeyaml:jar</include>
<include>org.xerial.snappy:snappy-java:jar</include>
<include>org.apache.airavata:ssh-agent:jar</include>
@@ -155,14 +122,9 @@
<include>org.apache.airavata:profile-service-stubs:jar</include>
<include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
<include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.ogce:xpp3:jar</include>
- <include>org.ogce:xpp5:jar</include>
- <include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.airavata:profile-service-stubs:jar</include>
<include>org.apache.airavata:services-security:jar</include>
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
index e347e9e832..4c5927f3a5 100644
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -86,10 +86,12 @@
<include>org.apache.airavata:registry-api-stubs:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
- <include>commons-cli:commons-cli</include>
<include>org.apache.thrift:libthrift:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+
<!-- kafka specific jars -->
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.lz4:lz4-java:jar</include>
@@ -101,26 +103,24 @@
<include>com.google.guava:guava:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>jline:jline:jar</include>
- <include>org.jboss.netty:netty:jar</include>
<include>io.netty:netty-handler:jar</include>
<include>com.google.code.gson:gson:jar</include>
<!-- logging jars -->
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
- <include>org.apache.logging.log4j:log4j-api</include>
- <include>org.apache.logging.log4j:log4j-core</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
- <include>org.apache.logging.log4j:log4j-1.2-api</include>
- <include>org.json:json:jar</include>
+ <include>org.apache.logging.log4j:log4j-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-core:jar</include>
+ <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
+ <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
+ <include>org.json:json:jar</include>
+
<include>org.apache.airavata:platform-monitoring:jar</include>
<include>io.prometheus:simpleclient:jar</include>
<include>io.prometheus:simpleclient_httpserver:jar</include>
<include>io.prometheus:simpleclient_common:jar</include>
- <include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.commons:commons-lang:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index c17589d0dd..e89bdce503 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -49,16 +49,14 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
+ <version>${spring.boot.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
+ <release>17</release>
</configuration>
</plugin>
<plugin>
diff --git a/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerApplication.java b/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerApplication.java
index 42bf099184..0a24fe92eb 100644
--- a/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerApplication.java
+++ b/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerApplication.java
@@ -4,7 +4,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication(scanBasePackages = "org.apache.airavata.file.server",
exclude = {GroovyTemplateAutoConfiguration.class})
diff --git a/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerConfiguration.java b/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerConfiguration.java
index e4b6df32d8..4888c787db 100644
--- a/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerConfiguration.java
+++ b/modules/file-server/src/main/java/org/apache/airavata/file/server/FileServerConfiguration.java
@@ -1,6 +1,5 @@
package org.apache.airavata.file.server;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.ThriftClientPool;
import org.apache.airavata.helix.core.support.adaptor.AdaptorSupportImpl;
import org.apache.airavata.helix.task.api.support.AdaptorSupport;
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index 67b5c10d39..9a8eac19dc 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -73,6 +73,10 @@
<artifactId>email-monitor</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
index 09c5166017..8c1f827a3d 100755
--- a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
+++ b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
</configuration>
@@ -83,21 +83,9 @@
<artifactId>selenium-firefox-driver</artifactId>
<version>${selenium-firefox-driver.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -105,9 +93,9 @@
<version>${commons-exec.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
@@ -123,7 +111,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/ide-integration/src/main/resources/airavata-server.properties b/modules/ide-integration/src/main/resources/airavata-server.properties
index 560a522b55..67659935dd 100644
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ b/modules/ide-integration/src/main/resources/airavata-server.properties
@@ -274,9 +274,8 @@ email.based.monitor.store.protocol=imaps
email.based.monitor.folder.name=INBOX
email.expiration.minutes=60
email.based.monitoring.period=10000
-
-email.based.monitor.address=airavatatest123@gmail.com
-email.based.monitor.password=airavatatest12345678
+email.based.monitor.address=CHANGE_ME
+email.based.monitor.password=CHANGE_ME
###########################################################################
# ThriftClientPool Configuration
diff --git a/modules/job-monitor/email-monitor/pom.xml b/modules/job-monitor/email-monitor/pom.xml
index 2d7f8eba98..21837db680 100644
--- a/modules/job-monitor/email-monitor/pom.xml
+++ b/modules/job-monitor/email-monitor/pom.xml
@@ -40,6 +40,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
index b061c7268f..b7d3c00f6c 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/EmailBasedMonitor.java
@@ -19,29 +19,22 @@
*/
package org.apache.airavata.monitor.email;
+import jakarta.mail.*;
+import jakarta.mail.search.FlagTerm;
+import jakarta.mail.search.SearchTerm;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.ApplicationSettings;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
import org.apache.airavata.monitor.AbstractMonitor;
import org.apache.airavata.monitor.JobStatusResult;
-import org.apache.airavata.monitor.kafka.MessageProducer;
import org.apache.airavata.monitor.email.parser.EmailParser;
import org.apache.airavata.monitor.email.parser.ResourceConfig;
-import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
-import jakarta.mail.Address;
-import jakarta.mail.Flags;
-import jakarta.mail.Folder;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
-import jakarta.mail.Session;
-import jakarta.mail.Store;
-import jakarta.mail.search.FlagTerm;
-import jakarta.mail.search.SearchTerm;
import java.io.InputStream;
import java.util.*;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
index 20c561207e..aa51641999 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/AiravataCustomMailParser.java
@@ -19,6 +19,8 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.monitor.JobStatusResult;
@@ -26,8 +28,6 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
index 2996dd50cd..5baa877279 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/EmailParser.java
@@ -19,13 +19,12 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.monitor.JobStatusResult;
import org.apache.airavata.registry.api.RegistryService;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
-
public interface EmailParser {
static final String STATUS = "status";
static final String JOBID = "jobId";
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
index 5e9d5d15ee..11a66074a7 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/HTCondorEmailParser.java
@@ -19,6 +19,8 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.status.JobState;
@@ -27,9 +29,6 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
-import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.regex.Matcher;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
index be61fad37e..c1214b1003 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/LSFEmailParser.java
@@ -19,6 +19,8 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.monitor.JobStatusResult;
@@ -26,8 +28,6 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
index 2da293d827..6b44cce4fa 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/PBSEmailParser.java
@@ -19,6 +19,8 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.monitor.JobStatusResult;
@@ -26,9 +28,6 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
-import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
index 0e8b4b3386..bcb2773dbb 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/SLURMEmailParser.java
@@ -19,6 +19,8 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.monitor.JobStatusResult;
@@ -26,8 +28,6 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
index 728182d128..df0642bee0 100644
--- a/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
+++ b/modules/job-monitor/email-monitor/src/main/java/org/apache/airavata/monitor/email/parser/UGEEmailParser.java
@@ -19,6 +19,8 @@
*/
package org.apache.airavata.monitor.email.parser;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.monitor.JobStatusResult;
@@ -26,8 +28,6 @@ import org.apache.airavata.registry.api.RegistryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/modules/job-monitor/job-monitor-api/pom.xml b/modules/job-monitor/job-monitor-api/pom.xml
index 28b880aa35..18c29e1fd1 100644
--- a/modules/job-monitor/job-monitor-api/pom.xml
+++ b/modules/job-monitor/job-monitor-api/pom.xml
@@ -34,7 +34,6 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>0.21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java b/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java
index 57bdb5237d..bd6973208a 100644
--- a/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java
+++ b/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/JobStateValidator.java
@@ -21,15 +21,7 @@ package org.apache.airavata.monitor;
import org.apache.airavata.model.status.JobState;
-import static org.apache.airavata.model.status.JobState.SUBMITTED;
-import static org.apache.airavata.model.status.JobState.QUEUED;
-import static org.apache.airavata.model.status.JobState.ACTIVE;
-import static org.apache.airavata.model.status.JobState.COMPLETE;
-import static org.apache.airavata.model.status.JobState.CANCELED;
-import static org.apache.airavata.model.status.JobState.FAILED;
-import static org.apache.airavata.model.status.JobState.NON_CRITICAL_FAIL;
-import static org.apache.airavata.model.status.JobState.SUSPENDED;
-import static org.apache.airavata.model.status.JobState.UNKNOWN;
+import static org.apache.airavata.model.status.JobState.*;
public class JobStateValidator {
diff --git a/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java b/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java
index 8b7cfe77da..28d7d1be8d 100644
--- a/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java
+++ b/modules/job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultDeserializer.java
@@ -19,8 +19,8 @@
*/
package org.apache.airavata.monitor.kafka;
-import org.apache.airavata.monitor.JobStatusResult;
import org.apache.airavata.model.status.JobState;
+import org.apache.airavata.monitor.JobStatusResult;
import org.apache.kafka.common.serialization.Deserializer;
import java.util.Map;
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index 74ad530e72..bdea010d88 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -41,12 +41,10 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>${jakarta.mail.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/job-monitor/real-time-monitor/src/main/resources/log4j.properties b/modules/job-monitor/real-time-monitor/src/main/resources/log4j.properties
deleted file mode 100644
index a2c8d8360a..0000000000
--- a/modules/job-monitor/real-time-monitor/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,28 +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.
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, A1
-
-log4j.category.org.apache.helix=WARN
-log4j.category.org.apache.kafka=INFO
-log4j.category.org.apache.zookeeper=WARN
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-4r [%t] %-5p %c %x - %m [E=%X{experiment},P=%X{process},T=%X{task},G=%X{gateway}]%n
\ No newline at end of file
diff --git a/modules/job-monitor/real-time-monitor/src/main/resources/log4j2.xml b/modules/job-monitor/real-time-monitor/src/main/resources/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/job-monitor/real-time-monitor/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
- 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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/job-monitor/real-time-monitor/src/main/resources/logback.xml b/modules/job-monitor/real-time-monitor/src/main/resources/logback.xml
new file mode 100644
index 0000000000..87b0c71f18
--- /dev/null
+++ b/modules/job-monitor/real-time-monitor/src/main/resources/logback.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <!-- Console Appender -->
+ <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d [%thread] %-5level %logger{30} %X - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <!-- Rolling File Appender -->
+ <appender name="RollingFileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>../logs/airavata.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>logs/%d{yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz</fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>50MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <maxHistory>20</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d [%thread] %-5level %logger{30} %X - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <!-- Loggers -->
+ <logger name="ch.qos.logback" level="WARN"/>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.kafka" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <!-- Root Logger -->
+ <root level="INFO">
+ <appender-ref ref="Console"/>
+ <appender-ref ref="RollingFileAppender"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml
index 04a54b3ea2..5cdf1fa61a 100644
--- a/modules/messaging/client/pom.xml
+++ b/modules/messaging/client/pom.xml
@@ -39,7 +39,10 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -54,17 +57,14 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
index bd7da896e7..7a77ae645b 100644
--- a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
+++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
@@ -30,21 +30,13 @@ import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.*;
import org.apache.thrift.TBase;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java
index 5461e66d02..bfa0683176 100644
--- a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java
+++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java
@@ -19,9 +19,6 @@
*/
package org.apache.airavata.messaging.client;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
//import java.util.stream.Stream;
public class TestReader {
diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml
index 6a2d476a72..426029e504 100644
--- a/modules/messaging/core/pom.xml
+++ b/modules/messaging/core/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -48,23 +47,24 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${log4j2.slf4j.impl}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
</dependency>
</dependencies>
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
index 51995ca63e..7cb2a7c7e4 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
@@ -23,14 +23,7 @@ import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.DBEventManagerConstants;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.messaging.core.impl.*;
-import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.JobIdentifier;
-import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.MessageType;
-import org.apache.airavata.model.messaging.event.ProcessIdentifier;
-import org.apache.airavata.model.messaging.event.ProcessStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.TaskOutputChangeEvent;
-import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
+import org.apache.airavata.model.messaging.event.*;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
index e4e681face..2887f265e5 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
@@ -20,7 +20,6 @@
package org.apache.airavata.messaging.core;
import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
import org.apache.airavata.model.messaging.event.MessageType;
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java
index 16b75275ad..5025a5e7ca 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java
@@ -23,26 +23,29 @@ import com.rabbitmq.client.AMQP;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.Envelope;
-import com.rabbitmq.client.QueueingConsumer;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessageHandler;
-import org.apache.airavata.model.messaging.event.*;
+import org.apache.airavata.model.messaging.event.ExperimentIntermediateOutputsEvent;
+import org.apache.airavata.model.messaging.event.ExperimentSubmitEvent;
+import org.apache.airavata.model.messaging.event.Message;
+import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.thrift.TBase;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rabbitmq.client.DefaultConsumer;
import java.io.IOException;
-public class ExperimentConsumer extends QueueingConsumer {
+public class ExperimentConsumer extends DefaultConsumer {
private static final Logger log = LoggerFactory.getLogger(ExperimentConsumer.class);
- private MessageHandler handler;
+ private final MessageHandler handler;
private Channel channel;
- private Connection connection;
+ private final Connection connection;
public ExperimentConsumer(MessageHandler messageHandler, Connection connection, Channel channel) {
super(channel);
@@ -51,12 +54,11 @@ public class ExperimentConsumer extends QueueingConsumer {
this.channel = channel;
}
-
@Override
public void handleDelivery(String consumerTag,
- Envelope envelope,
- AMQP.BasicProperties properties,
- byte[] body) throws IOException {
+ Envelope envelope,
+ AMQP.BasicProperties properties,
+ byte[] body) throws IOException {
Message message = new Message();
@@ -99,7 +101,7 @@ public class ExperimentConsumer extends QueueingConsumer {
messageContext.setIsRedeliver(envelope.isRedeliver());
handler.onMessage(messageContext);
- }else {
+ } else {
log.error("{} message type is not handle in ProcessLaunch Subscriber. Sending ack for " +
"delivery tag {} ", message.getMessageType().name(), deliveryTag);
sendAck(deliveryTag);
@@ -112,11 +114,11 @@ public class ExperimentConsumer extends QueueingConsumer {
}
- private void sendAck(long deliveryTag){
+ private void sendAck(long deliveryTag) {
try {
- if (channel.isOpen()){
- channel.basicAck(deliveryTag,false);
- }else {
+ if (channel.isOpen()) {
+ channel.basicAck(deliveryTag, false);
+ } else {
channel = connection.createChannel();
channel.basicQos(ServerSettings.getRabbitmqPrefetchCount());
channel.basicAck(deliveryTag, false);
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
index 306a41f9c2..c5b1d364b4 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
@@ -19,28 +19,29 @@
*/
package org.apache.airavata.messaging.core.impl;
-import com.rabbitmq.client.*;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.Envelope;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessageHandler;
import org.apache.airavata.model.dbevent.DBEventMessage;
-import org.apache.airavata.model.dbevent.DBEventMessageContext;
-import org.apache.airavata.model.messaging.event.ExperimentSubmitEvent;
import org.apache.airavata.model.messaging.event.Message;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.thrift.TBase;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.thrift.TException;
+import com.rabbitmq.client.DefaultConsumer;
import java.io.IOException;
-public class MessageConsumer extends QueueingConsumer {
+public class MessageConsumer extends DefaultConsumer {
private static final Logger logger = LogManager.getLogger(MessageConsumer.class);
- private MessageHandler handler;
+ private final MessageHandler handler;
private Channel channel;
- private Connection connection;
+ private final Connection connection;
public MessageConsumer(MessageHandler messageHandler, Connection connection, Channel channel) {
super(channel);
@@ -65,7 +66,7 @@ public class MessageConsumer extends QueueingConsumer {
DBEventMessage dBEventMessage = new DBEventMessage();
ThriftUtils.createThriftFromBytes(message.getEvent(), dBEventMessage);
- MessageContext messageContext = new MessageContext((TBase) dBEventMessage, message.getMessageType(), message.getMessageId(), "gatewayId", envelope.getDeliveryTag());
+ MessageContext messageContext = new MessageContext(dBEventMessage, message.getMessageType(), message.getMessageId(), "gatewayId", envelope.getDeliveryTag());
handler.onMessage(messageContext);
//sendAck(deliveryTag);
@@ -76,12 +77,12 @@ public class MessageConsumer extends QueueingConsumer {
}
- private void sendAck(long deliveryTag){
+ private void sendAck(long deliveryTag) {
logger.info("sendAck() -> Sending ack. Delivery Tag : " + deliveryTag);
try {
- if (channel.isOpen()){
- channel.basicAck(deliveryTag,false);
- }else {
+ if (channel.isOpen()) {
+ channel.basicAck(deliveryTag, false);
+ } else {
channel = connection.createChannel();
channel.basicQos(20);
channel.basicAck(deliveryTag, false);
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java
index f6f1127e8c..c3b0dcd397 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java
@@ -23,7 +23,6 @@ import com.rabbitmq.client.AMQP;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.Envelope;
-import com.rabbitmq.client.QueueingConsumer;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.ThriftUtils;
@@ -37,28 +36,29 @@ import org.apache.thrift.TBase;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rabbitmq.client.DefaultConsumer;
import java.io.IOException;
-public class ProcessConsumer extends QueueingConsumer{
+public class ProcessConsumer extends DefaultConsumer {
private static final Logger log = LoggerFactory.getLogger(ProcessConsumer.class);
- private MessageHandler handler;
+ private final MessageHandler handler;
private Channel channel;
- private Connection connection;
+ private final Connection connection;
- public ProcessConsumer(MessageHandler messageHandler, Connection connection, Channel channel){
+ public ProcessConsumer(MessageHandler messageHandler, Connection connection, Channel channel) {
super(channel);
this.handler = messageHandler;
this.connection = connection;
this.channel = channel;
}
-
- @Override public void handleDelivery(String consumerTag,
- Envelope envelope,
- AMQP.BasicProperties basicProperties,
- byte[] body) throws IOException {
+ @Override
+ public void handleDelivery(String consumerTag,
+ Envelope envelope,
+ AMQP.BasicProperties basicProperties,
+ byte[] body) throws IOException {
Message message = new Message();
@@ -105,11 +105,11 @@ public class ProcessConsumer extends QueueingConsumer{
}
- private void sendAck(long deliveryTag){
+ private void sendAck(long deliveryTag) {
try {
- if (channel.isOpen()){
- channel.basicAck(deliveryTag,false);
- }else {
+ if (channel.isOpen()) {
+ channel.basicAck(deliveryTag, false);
+ } else {
channel = connection.createChannel();
channel.basicQos(ServerSettings.getRabbitmqPrefetchCount());
channel.basicAck(deliveryTag, false);
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
index c11a3ff526..f7b384f3c2 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
@@ -19,12 +19,7 @@
*/
package org.apache.airavata.messaging.core.impl;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.MessageProperties;
-import com.rabbitmq.client.ShutdownListener;
-import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.*;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.messaging.core.MessageContext;
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
index 4a4413b0f6..99223d5916 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
@@ -19,15 +19,10 @@
*/
package org.apache.airavata.messaging.core.impl;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.Consumer;
-import com.rabbitmq.client.ShutdownListener;
-import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.*;
import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.messaging.core.Subscriber;
import org.apache.airavata.messaging.core.RabbitMQProperties;
+import org.apache.airavata.messaging.core.Subscriber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java
index 4cdafab2ab..212d3d726b 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java
@@ -19,24 +19,12 @@
*/
package org.apache.airavata.messaging.core.impl;
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.DefaultConsumer;
-import com.rabbitmq.client.Envelope;
+import com.rabbitmq.client.*;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessageHandler;
-import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.Message;
-import org.apache.airavata.model.messaging.event.MessageType;
-import org.apache.airavata.model.messaging.event.ProcessStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.TaskOutputChangeEvent;
-import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.ProcessSubmitEvent;
-import org.apache.airavata.model.messaging.event.ProcessTerminateEvent;
+import org.apache.airavata.model.messaging.event.*;
import org.apache.thrift.TBase;
import org.apache.thrift.TException;
import org.slf4j.Logger;
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
index 3864394ca0..ae5a1d6074 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
@@ -20,7 +20,6 @@
package org.apache.airavata.messaging.core.stats;
import java.io.*;
-import java.util.List;
import java.util.Map;
import java.util.TimerTask;
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
index 69d828a0fe..f4acacf5f0 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
@@ -22,7 +22,7 @@ package org.apache.airavata.messaging.core.stats;
import org.apache.airavata.model.messaging.event.Message;
-import java.io.*;
+import java.io.File;
import java.util.*;
public class StatCounter {
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java
index 9e4ad7c44c..1964c13f61 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java
@@ -26,13 +26,7 @@ import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessagingFactory;
import org.apache.airavata.messaging.core.Publisher;
-import org.apache.airavata.model.dbevent.CrudType;
-import org.apache.airavata.model.dbevent.DBEventMessage;
-import org.apache.airavata.model.dbevent.DBEventMessageContext;
-import org.apache.airavata.model.dbevent.DBEventPublisher;
-import org.apache.airavata.model.dbevent.DBEventPublisherContext;
-import org.apache.airavata.model.dbevent.DBEventType;
-import org.apache.airavata.model.dbevent.EntityType;
+import org.apache.airavata.model.dbevent.*;
import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.thrift.TBase;
import org.slf4j.Logger;
diff --git a/modules/orchestrator/orchestrator-client/pom.xml b/modules/orchestrator/orchestrator-client/pom.xml
index 937b8569ed..64ebe7e435 100644
--- a/modules/orchestrator/orchestrator-client/pom.xml
+++ b/modules/orchestrator/orchestrator-client/pom.xml
@@ -40,27 +40,26 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-api-stubs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-base-api</artifactId>
- <version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
- <version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-client-configuration</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index e8d54953f6..8c84f9efce 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -39,45 +39,22 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-credential-store</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -87,18 +64,15 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>registry-api-stubs</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java
index 30c7965f03..a8a0638093 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/schedule/HostScheduler.java
@@ -19,10 +19,10 @@
*/
package org.apache.airavata.orchestrator.core.schedule;
-import java.util.List;
-
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
+import java.util.List;
+
public interface HostScheduler {
/**
* This method will pick a host among set of hosts based on the algorithm users wants to implement, For a single instance
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
index ce5bf20d7b..be318f77cd 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
@@ -47,7 +47,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
/**
* This contains orchestrator specific utilities
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java
index ba04b04685..21150e7566 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/JobMetadataValidator.java
@@ -22,7 +22,6 @@ package org.apache.airavata.orchestrator.core.validator;
import org.apache.airavata.model.error.ValidationResults;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.model.task.TaskModel;
/**
* This is the interface to implement a validation logic, users can implement their validation
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
index 50651c90ce..5f16937d9b 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
@@ -25,7 +25,8 @@ import org.apache.airavata.model.appcatalog.computeresource.BatchQueue;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
import org.apache.airavata.model.error.ValidationResults;
import org.apache.airavata.model.error.ValidatorResult;
-import org.apache.airavata.model.experiment.*;
+import org.apache.airavata.model.experiment.ExperimentModel;
+import org.apache.airavata.model.experiment.UserConfigurationDataModel;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml
index c8fa5f3f6c..33ba5f3fc6 100644
--- a/modules/orchestrator/orchestrator-service/pom.xml
+++ b/modules/orchestrator/orchestrator-service/pom.xml
@@ -40,62 +40,54 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-credential-store</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-orchestrator-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>cluster-monitoring</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>metascheduler-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>process-scheduler</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>metadata-analyzer</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>computer-resource-monitoring-service</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index e3eac12661..3d9f59ec14 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -61,7 +61,7 @@ import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.RegistryService.Client;
import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java
index 9566f8cc02..52a3e51287 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/util/OrchestratorServerThreadPoolExecutor.java
@@ -19,15 +19,14 @@
*/
package org.apache.airavata.orchestrator.util;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
public class OrchestratorServerThreadPoolExecutor {
private final static Logger logger = LoggerFactory.getLogger(OrchestratorServerThreadPoolExecutor.class);
public static final String AIRAVATA_SERVER_THREAD_POOL_SIZE = "airavata.server.thread.pool.size";
diff --git a/modules/platform-monitoring/pom.xml b/modules/platform-monitoring/pom.xml
index 75725ab0b6..d9629f4e3e 100644
--- a/modules/platform-monitoring/pom.xml
+++ b/modules/platform-monitoring/pom.xml
@@ -54,7 +54,7 @@
<!-- Pushgateway exposition-->
<dependency>
<groupId>io.prometheus</groupId>
- <artifactId>simpleclient_pushgateway</artifactId>
+ <artifactId>simpleclient_pushgateway</artifactId>
<version>${prometheus.version}</version>
</dependency>
</dependencies>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index 93ac0a4af0..a8403b1199 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -33,74 +33,35 @@
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-core</artifactId>
- <properties>
- <derby.version>10.11.1.1</derby.version>
- <surefire.version>2.18.1</surefire.version>
- <skipTests>false</skipTests>
- <mysql.connector.version>8.0.31</mysql.connector.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>${dozer.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate-core.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -110,18 +71,15 @@
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-cpi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
- <version>${ibatis-sqlmap.version}</version>
</dependency>
<!-- For MariaDB based schema migrations -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb-java-client.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -131,13 +89,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
- <!--<compilerArgs>-->
- <!--<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>-->
- <!--</compilerArgs>-->
- <!--<fork>true</fork>-->
</configuration>
</plugin>
<plugin>
@@ -225,11 +179,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
<configuration>
<failIfNoTests>false</failIfNoTests>
- <skipTests>${skipTests}</skipTests>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
</configuration>
</plugin>
@@ -259,7 +210,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
index dbac506777..9b5785d6f4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowEntity.java
@@ -20,6 +20,7 @@
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
index 6075873508..cb2897bd41 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowErrorEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
index 480db8264d..b2d1d5d502 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/AiravataWorkflowStatusEntity.java
@@ -19,9 +19,9 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.workflow.WorkflowState;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
index 3fb368095f..9528960c7c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationErrorEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
index 35907c2a4d..4e2ae5ea10 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/ApplicationStatusEntity.java
@@ -19,9 +19,9 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.workflow.ApplicationState;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
index 8041855b64..072b24ab00 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerErrorEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
index 06328c3c24..1d235938f6 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerInputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
index dc0140b293..b0190675db 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerOutputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
index 476e695d8a..d3d9b44aaa 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/HandlerStatusEntity.java
@@ -20,6 +20,7 @@
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
index 27c243795e..2d27ef7290 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowApplicationEntity.java
@@ -19,9 +19,8 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
-import org.apache.airavata.registry.core.entities.expcatalog.ProcessEntity;
-
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
index 8f342c30b7..22e4ceb082 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowConnectionEntity.java
@@ -19,9 +19,9 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.workflow.ComponentType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
index 703a93c509..0a905dc860 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowDataBlockEntity.java
@@ -20,6 +20,7 @@
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
index a1eab80949..537af76b90 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/airavataworkflowcatalog/WorkflowHandlerEntity.java
@@ -19,9 +19,9 @@
*/
package org.apache.airavata.registry.core.entities.airavataworkflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.workflow.HandlerType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
index 7f8d1b98cb..9081921557 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
index bb6f8cd48a..6d4f7a4114 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
index 8836c589d9..f3bb85e93d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.parallelism.ApplicationParallelismType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
index 709d1a3916..ecc940177e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
index 50255b7fff..21fec09587 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
index 2b8ee2f73d..19f8c2d277 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
@@ -24,6 +24,7 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
index 41924b2b44..6f3724692f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
index 6cace49203..28cd63bd67 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
index 0bfa6b7f21..1372b148d2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
@@ -19,10 +19,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.appcatalog.computeresource.ProviderName;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
index cdb83f33c2..5520193b8d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
@@ -21,10 +21,10 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
-import java.util.Map;
/**
* The persistent class for the compute_resource database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
index 988dc9228a..1f7a98698b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.appcatalog.computeresource.FileSystems;
-import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
index c855437c51..541bc912f2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
index 61681e2bfe..ba6230ea95 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceReservationEntity.java
@@ -19,22 +19,12 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinColumns;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-
/**
* The persistent class for the COMPUTE_RESOURCE_RESERVATION database table.
*/
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
index 328c29ccaa..7f1e827d8e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
index 787a36ce0a..0b000049a4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
@@ -24,6 +24,7 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
+
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
index 4835b04b59..644eba7d54 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
index 93d45ce67b..55657c5649 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
index 80105a01d1..d8c1bbd8e2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
index afefee06ee..7ef6cfb2a6 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
index 41e77d4fdd..ee96b15d36 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
index 6632bc5f95..2dcc1d114c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
@@ -19,24 +19,11 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OrderBy;
-import jakarta.persistence.Table;
import java.io.Serializable;
-import java.sql.Timestamp;
import java.util.List;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java
index 8e5487d10b..49fe255084 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupResourceProfileEntity.java
@@ -19,13 +19,8 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
index 074904523b..973f70ffbe 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java
@@ -19,15 +19,8 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinColumns;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
index 3d60ca0b2e..2d1522faf0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
index 833c055fa1..d3dd697ef2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
index 10ba332f15..c4672c6e88 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
index 65ecbc8275..2cc3f03c2f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java
@@ -24,6 +24,7 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
index 8940d83919..d21637ea91 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
index 0f1ee7e32c..bbb8c8b61f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
index 5074cfb797..684b92514c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
index 9538894f0a..3b1933f063 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java
index 26ec1b8965..966c96ba9e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java
@@ -24,6 +24,7 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
+
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
index 7b1570520f..d6e6234243 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
index b63e9410e4..8cf42ba2ce 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java
@@ -19,7 +19,9 @@
*
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
index 993e7c798b..6dc6a88206 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.parallelism.ApplicationParallelismType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
index e49521d88a..8034a96d61 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
index 3e4c89cc1c..9b47bec2ae 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java
index b75a19280c..0b47e69321 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
index 22ed5f051a..61c760ff07 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
index e34fe408d4..6a01203659 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java
index 8f1c23f679..2f6613d978 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
index 341e435553..8d6095645d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
index 971d98767c..396ce7ef5a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
index e227f90395..430af7f6a8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
index bbcea3b995..d6be925d1f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
index f5f2ee7f33..59dade7f12 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
index 2f7a554b4e..ffefb4fbc3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
index 985aaedce2..5465a0eff9 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
index 65062a5dd1..5cf27f0741 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StoragePreferenceEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
index f517b37b21..f559026304 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
index 602914277c..071bfef6ae 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
@@ -20,14 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
index 33a95c8f9d..be21c03346 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.movement.SecurityProtocol;
-import jakarta.persistence.*;
import java.io.Serializable;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java
index 68eaf8c838..a0acb93c2c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserComputeResourcePreferenceEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.appcatalog;
import jakarta.persistence.*;
+
import java.sql.Timestamp;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java
index c55f964197..39519d1b73 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UserResourceProfileEntity.java
@@ -20,9 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
-import java.util.*;
import jakarta.persistence.*;
+
import java.sql.Timestamp;
+import java.util.List;
/**
* The persistent class for the user_resource_profile database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
index 69bed11152..f01b8544d8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingEntity.java
@@ -1,6 +1,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index f4259ef470..a994830aef 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.experiment.ExperimentType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
index 5b8c3fcf81..f3d12877c8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
@@ -21,9 +21,9 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
-import java.util.List;
/**
* The persistent class for the experiment_error database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index ddfe9d93d7..62b851afa4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
index 1eb50a1e9f..870205cc07 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
index 7fd47159b0..db17238b6b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.status.ExperimentState;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
index 28a4dcf99d..d356181af5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
@@ -19,7 +19,10 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
index 42ca12e5d9..9089d225c5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.workspace.GatewayApprovalStatus;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
index 6e7371e752..52973f53bf 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayUsageReportingCommandEntity.java
@@ -20,6 +20,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
@Entity
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
index 8b5d58d111..94cf632d20 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
index 176ccfefc3..04261aaaa3 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
index e6d74846ad..6378c8f850 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.status.JobState;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
index 6c4d329623..bff9b2ae69 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.workspace.NotificationPriority;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index 90e4570958..7be782dcc4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -22,6 +22,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Collection;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
index 7a1d2ad716..49652491a2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
@@ -21,9 +21,9 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
-import java.util.List;
/**
* The persistent class for the process_error database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
index d2f1a7ea41..db2e494790 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
index c8c7ccec33..7df2044691 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.application.io.DataType;
-import jakarta.persistence.*;
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
index b167438216..1cdd5e6456 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
index b33dc6e6c8..c519df4287 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.status.ProcessState;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
index 7436e560be..1d9fc2b96c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessWorkflowPK.java
@@ -1,7 +1,5 @@
package org.apache.airavata.registry.core.entities.expcatalog;
-import jakarta.persistence.Column;
-import jakarta.persistence.Id;
import java.io.Serializable;
public class ProcessWorkflowPK implements Serializable {
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java
index 519a603115..85e365d982 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectEntity.java
@@ -20,8 +20,11 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import jakarta.persistence.*;
-import java.util.List;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java
index 54a68fb290..45db5ee019 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
index 4f93fe16e5..26e78e231e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
@@ -21,9 +21,9 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.math.BigInteger;
-import java.sql.Timestamp;
/**
* The persistent class for the queue_status database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java
index 05b8097ac0..0447c8ec3c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java
@@ -22,7 +22,6 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import java.io.Serializable;
import java.math.BigInteger;
-import java.sql.Timestamp;
/**
* The primary key class for the queue_status database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
index 03904b0cee..56bf8d1bcc 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.task.TaskTypes;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
index 32cd7e5d75..f88751d9be 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
@@ -21,9 +21,9 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
-import java.util.List;
/**
* The persistent class for the task_error database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
index 4e0bb568fe..2c1f2a4bdc 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.status.TaskState;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
index 629c62158a..86be95318f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.expcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/ConfigurationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/ConfigurationEntity.java
index 7c39c10204..94fb7ec549 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/ConfigurationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/ConfigurationEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.replicacatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java
index 9639cc2c94..183ef40222 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.replicacatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.replica.DataProductType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductMetadataEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductMetadataEntity.java
index 5cf844b78f..53d329ca08 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductMetadataEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductMetadataEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.replicacatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java
index 89b9bd3d64..fb00966a88 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java
@@ -20,10 +20,10 @@
*/
package org.apache.airavata.registry.core.entities.replicacatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.data.replica.ReplicaLocationCategory;
import org.apache.airavata.model.data.replica.ReplicaPersistentType;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Map;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaMetadataEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaMetadataEntity.java
index bf50f8cdfe..5d5cc790fb 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaMetadataEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaMetadataEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.replicacatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java
index 9276bf94fa..985c084178 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/ComponentStatusEntity.java
@@ -24,6 +24,7 @@ import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
+
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java
index 9c99a1b9b3..74e81beae0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/EdgeEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.workflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.ComponentStatus;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java
index ff6c006216..ab1175eb77 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/NodeEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.workflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.ComponentStatus;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java
index 6891e133fb..3dcf5afef5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/PortEntity.java
@@ -20,9 +20,9 @@
*/
package org.apache.airavata.registry.core.entities.workflowcatalog;
+import jakarta.persistence.*;
import org.apache.airavata.model.ComponentStatus;
-import jakarta.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
index 3f75cfec31..ea2ecd2b43 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java
@@ -20,14 +20,11 @@
*/
package org.apache.airavata.registry.core.entities.workflowcatalog;
-import org.apache.airavata.model.application.io.InputDataObjectType;
-import org.apache.airavata.model.application.io.OutputDataObjectType;
-
-//import java.nio.ByteBuffer;
-import java.util.List;
import jakarta.persistence.*;
+
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.List;
/**
* The persistent class for the workflow database table.
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
index 5777584ae5..a7f9e32b7d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowInputEntity.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.entities.workflowcatalog;
import jakarta.persistence.*;
+
import java.io.Serializable;
/**
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowOutputEntity.java
index f6c3dadf04..eaecdc0bc6 100644
... 4457 lines suppressed ...
(airavata) 08/09: update airavata distribution module to match deployment structure
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit d567d3ea272e01356970bf4e6270a3588997c6cc
Author: yasithdev <ya...@icloud.com>
AuthorDate: Sun Apr 27 19:01:30 2025 -0500
update airavata distribution module to match deployment structure
---
.../src/main/assembly/bin-assembly.xml | 53 +-
.../airavata-cpp-sdk/src/main/resources/INSTALL | 30 -
.../airavata-cpp-sdk/src/main/resources/LICENSE | 2272 --------------------
.../airavata-cpp-sdk/src/main/resources/README | 7 -
.../src/main/assembly/bin-assembly.xml | 56 +-
modules/agent-framework/agent-service/pom.xml | 24 +-
.../credential-store-service/pom.xml | 10 +-
modules/distribution/agent-service-dist/pom.xml | 114 +
.../main/assembly/agent-service-bin-assembly.xml | 51 +-
.../main/resources}/bin/agent-service-daemon.sh | 0
.../src/main/resources}/bin/agent-service.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../src/main/resources}/conf/application.yml | 0
.../src/main/resources}/conf/log4j2.xml | 0
.../src/main/resources}/conf/truststore.jks | Bin
modules/distribution/api-server-dist/pom.xml | 114 +
.../src/main/assembly/api-server-bin-assembly.xml | 108 +
.../src/main/docker}/Dockerfile | 0
.../src/main/docker}/wait-for-it.sh | 0
.../src/main/resources}/INSTALL | 0
.../src/main/resources}/LICENSE | 0
.../api-server-dist}/src/main/resources/NOTICE | 0
.../src/main/resources}/README | 0
.../main/resources}/bin/airavata-server-start.sh | 0
.../main/resources}/bin/airavata-server-stop.sh | 0
.../src/main/resources}/bin/airavata-server.bat | 0
.../src/main/resources}/bin/derby.sh | 0
.../src/main/resources}/bin/logo.txt | 0
.../src/main/resources}/bin/setenv.bat | 0
.../src/main/resources}/bin/setenv.sh | 0
.../src/main/resources}/bin/startNetworkServer | 0
modules/distribution/controller-dist/pom.xml | 98 +
.../src/main/assembly/controller-bin-assembly.xml} | 66 +-
.../src/main/docker}/Dockerfile | 0
.../src/main/docker}/wait-for-it.sh | 0
.../src/main/resources}/bin/controller-daemon.sh | 0
.../src/main/resources}/bin/controller.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/log4j2.xml | 0
.../{src/main/docker => }/docker-compose.yml | 0
modules/distribution/email-monitor-dist/pom.xml | 98 +
.../main/assembly/email-monitor-bin-assembly.xml} | 66 +-
.../src/main/docker}/Dockerfile | 0
.../src/main/docker}/wait-for-it.sh | 0
.../main/resources}/bin/email-monitor-daemon.sh | 0
.../src/main/resources}/bin/email-monitor.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/email-config.yaml | 0
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/file-server-dist/pom.xml | 82 +
.../main/assembly/file-server-bin-assembly.xml} | 52 +-
.../src/main/resources}/bin/file-service-daemon.sh | 0
.../src/main/resources}/bin/file-service.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../main/resources}/conf/application.properties | 0
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/parser-wm-dist/pom.xml | 82 +
.../src/main/assembly/parser-wm-bin-assembly.xml} | 65 +-
.../src/main/resources}/bin/parser-wm-daemon.sh | 0
.../src/main/resources}/bin/parser-wm.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/participant-dist/pom.xml | 98 +
.../main/assembly/participant-bin-assembly.xml} | 66 +-
.../src/main/docker}/Dockerfile | 0
.../src/main/docker}/wait-for-it.sh | 0
.../src/main/resources}/bin/participant-daemon.sh | 0
.../src/main/resources}/bin/participant.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/cred_store.jks | Bin
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/pom.xml | 737 +------
modules/distribution/post-wm-dist/pom.xml | 98 +
.../src/main/assembly/post-wm-bin-assembly.xml} | 68 +-
.../src/main/docker}/Dockerfile | 0
.../src/main/docker}/wait-for-it.sh | 0
.../src/main/resources}/bin/post-wm-daemon.sh | 0
.../src/main/resources}/bin/post-wm.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/pre-wm-dist/pom.xml | 98 +
.../src/main/assembly/pre-wm-bin-assembly.xml} | 54 +-
.../src/main/docker}/Dockerfile | 0
.../src/main/docker}/wait-for-it.sh | 0
.../src/main/resources}/bin/pre-wm-daemon.sh | 0
.../src/main/resources}/bin/pre-wm.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/realtime-monitor-dist/pom.xml | 82 +
.../assembly/realtime-monitor-bin-assembly.xml} | 65 +-
.../main/resources}/bin/realtime-monitor-daemon.sh | 0
.../src/main/resources}/bin/realtime-monitor.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../resources}/conf/airavata-server.properties | 0
.../src/main/resources}/conf/log4j2.xml | 0
modules/distribution/research-service-dist/pom.xml | 82 +
.../assembly/research-service-bin-assembly.xml | 50 +-
.../main/resources}/bin/research-service-daemon.sh | 0
.../src/main/resources}/bin/research-service.sh | 0
.../src/main/resources}/bin/setenv.sh | 0
.../src/main/resources}/conf/application.yml | 0
.../src/main/resources}/conf/log4j2.xml | 0
.../src/main/assembly/api-server-bin-assembly.xml | 219 --
.../src/main/assembly/controller-bin-assembly.xml | 108 -
.../src/main/assembly/distribution-assembly.xml | 92 +
.../main/assembly/email-monitor-bin-assembly.xml | 131 --
.../src/main/assembly/parser-wm-bin-assembly.xml | 106 -
.../src/main/assembly/participant-bin-assembly.xml | 159 --
.../src/main/assembly/post-wm-bin-assembly.xml | 142 --
.../src/main/assembly/pre-wm-bin-assembly.xml | 143 --
.../assembly/realtime-monitor-bin-assembly.xml | 128 --
.../src/main/resources/api-server/NOTICE | 163 --
.../resources/dockerfiles/controller/Dockerfile | 3 -
modules/file-server/pom.xml | 22 -
modules/registry/registry-core/pom.xml | 4 +-
.../research-framework/research-service/pom.xml | 23 +-
modules/sharing-registry/pom.xml | 1 -
.../sharing-registry-distribution/pom.xml | 97 -
.../src/main/resources/bin/setenv.sh | 61 -
.../src/main/resources/bin/sharing-registry.sh | 90 -
pom.xml | 14 +-
.../src/main/assembly/load-client-bin-assembly.xml | 57 +-
128 files changed, 1583 insertions(+), 5126 deletions(-)
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/assembly/bin-assembly.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/assembly/bin-assembly.xml
index 09a1b1beb0..10efc7a66f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/assembly/bin-assembly.xml
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/assembly/bin-assembly.xml
@@ -1,6 +1,4 @@
<!--
-
-
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
@@ -17,60 +15,45 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${archive.name}-${version}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
+
<fileSets>
- <!-- ********************** copy release notes files ********************** -->
<fileSet>
- <directory>../../../</directory>
+ <directory>${project.basedir}/../../..</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
</includes>
</fileSet>
- <!-- ********************** copy licenses, readme etc. ********************** -->
<fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory>.</outputDirectory>
+ <directory>${project.basedir}/src/main/resources/lib</directory>
+ <outputDirectory>lib</outputDirectory>
<includes>
- <include>conf/*</include>
- <include>lib/*</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>INSTALL</include>
+ <include>*</include>
</includes>
</fileSet>
- <fileSet>
+ <fileSet>
<directory>${project.build.directory}/conf</directory>
<outputDirectory>conf</outputDirectory>
- <includes>
- <include>*.properties</include>
+ <includes>
+ <include>*</include>
</includes>
</fileSet>
</fileSets>
+
</assembly>
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/INSTALL b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/INSTALL
deleted file mode 100644
index 50c7822070..0000000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-Installing Apache Airavata Client 0.14
---------------------------------------
-
-Prerequisites
--------------
-Java 1.5 or later
-Maven (tested on v 3.0.2)
-
-Build Apache Airavata from Source
----------------------------------
-* Unzip/untar the source file or check out from svn.
-* cd to project folder and type
- $ mvn clean install
- Note: in order to skip tests use the command
- $ mvn clean install -Dmaven.test.skip=true
-* The compressed binary distribution is created at <PROJECT DIR>/modules/distribution/airavata-client/target
-
-Installing the Airavata Client Libraries
-----------------------------------------
-* Add all the libraries (jar files) in the <AIRAVATA_CLIENT_HOME>/lib directory to the classpath
-* Add the <AIRAVATA_CLIENT_HOME>/conf directory to the classpath
-
-Running Tests
--------------
-Once the binary is unzipped, instructions to run the tests should be follow from README
-
-Tutorials
-----------
-The airavata website has instructions for basic tutorials:
-* For basic understanding on how to use Airavata API please look at the samples shipped with the distribution
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE
deleted file mode 100644
index 5b99dde6ac..0000000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/LICENSE
+++ /dev/null
@@ -1,2272 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-===================================================================================
-The Apache Airavata distribution includes a number of run time
-dependencies with separate copyright notices and license terms. Your use of the
-Apache Airavata code is subject to the terms and conditions of the following licenses.
-===================================================================================
-
-===============================================================================
-The following components come under Apache Software License 2.0
-===============================================================================
-
-apache axiom, apache axis2, apache commons, apache derby, apache geronimo,
-apache httpcore components, apache log4j, apache xmlbeans, apache xmlschema,
-aws-java-sdk-1.1.8.jar, bcel-5.1.jar, Codehaus Jackson (jackson-core-2.15.4.jar,
-jackson-jaxrs-json-provider-2.15.4.jar, jackson-databind-2.15.4.jar, jackson-module-jaxb-annotations-2.15.4.jar,
-jets3t-0.8.0.jar, jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries
-(pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar
-
-===============================================================================
-The following components use Apache based Licenses
-===============================================================================
-
-===============================================================================
-For: jdom-1.0.jar
- Containing Project URL: http://www.jdom.org/
-/*--
-
- $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions, and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions, and the disclaimer that follows
- these conditions in the documentation and/or other materials
- provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact <request_AT_jdom_DOT_org>.
-
- 4. Products derived from this software may not be called "JDOM", nor
- may "JDOM" appear in their name, without prior written permission
- from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
- In addition, we request (but do not require) that you include in the
- end-user documentation provided with the redistribution and/or in the
- software itself an acknowledgement equivalent to the following:
- "This product includes software developed by the
- JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the JDOM Project and was originally
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
- on the JDOM Project, please see <http://www.jdom.org/>.
-
- */
-
-===============================================================================
-
-ASM bytecode manipulation library (asm)
- Containing Project URL: http://asm.ow2.org/
-
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-For: cryptix-asn1-versionless.jar, cryptix32-versionless.jar
- Containing Project URL: http://www.cryptix.org/
-
-Cryptix General License
-
-Copyright (c) 1995-2005 The Cryptix Foundation Limited.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- 1. Redistributions of source code must retain the copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE CRYPTIX FOUNDATION LIMITED AND
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE CRYPTIX FOUNDATION LIMITED OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-The following components come under Extreme! Lab Software License
-===============================================================================
-
-XPP3
- Containing Project URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/
-xsul, xsul5, xutil
- Containing Project URL: http://www.extreme.indiana.edu/xgws/xsul/
-wsmg
- Containing Project URL: http://www.extreme.indiana.edu/xgws/messenger/index.html
-gpel, weps-beans, pegasuswebservice, mapReduce-service-client, atomixmiser
- Containing Project URL: http://www.extreme.indiana.edu/xgws/
-
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any,
- must include the following acknowledgment:
-
- "This product includes software developed by the Indiana University
- Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
-must not be used to endorse or promote products derived from this
-software without prior written permission. For written permission,
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy"
-name nor may "Indiana Univeristy" appear in their name, without prior
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-========================================================================
-The following components are MIT Licensed
-========================================================================
-
-SLF4J,log4j-over-slf4j, jcl-over-slf4j, slf4j-api,mockito-all-1.8.5,jopt-simple-3.2.jar
- Containing Project URL: http://www.slf4j.org/
-
-Copyright (c) 2004-2008 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-========================================================================
-
-For dom4j-1.6.1.jar:
- Containing Project URL: http://dom4j.sourceforge.net/
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
-2. Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. The name "DOM4J" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of MetaStuff, Ltd. For written permission,
- please contact dom4j-info@metastuff.com.
-
-4. Products derived from this Software may not be called "DOM4J"
- nor may "DOM4J" appear in their names without prior written
- permission of MetaStuff, Ltd. DOM4J is a registered
- trademark of MetaStuff, Ltd.
-
-5. Due credit should be given to the DOM4J Project -
- http://www.dom4j.org
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-====================================================================================================
-
-For Bouncy Castle:
- Containing Project URL: http://www.bouncycastle.org/
-
-Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission iss software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-=======================================================================================================
-
-For: The International Components for Unicode (icu4j-2.6.1.jar)
- Containing Project URL: http://site.icu-project.org/
-
- Copyright (c) 1995-2009 International Business Machines Corporation
- and others
-
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies
- of the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
- BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
- OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder shall
- not be used in advertising or otherwise to promote the sale, use or other
- dealings in this Software without prior written authorization of the
- copyright holder.
-
-======================================================================
-The following components are CDDL based License
-======================================================================
-
-For activation-1.1.jar, jaxb-api-2.1.jar, mail-1.4.jar, junit,
-Servlet Specification 2.5 API (servlet-api-2.5-6.1.14.jar),
-Classfish Jasper API (jsp-api-2.1-6.1.14.jar), and
-JSP2.1 Jasper implementation from Glassfish (jsp-2.1-6.1.14.jar),
-Jersey from Glassfish (jersey-client-1.13.jar, jersey-core-1.13.jar,
-jersey-json-1.13.jar, jersey-multipart-1.13.jar) and JSP2.1 Jasper
-implementation from Glassfish (jsp-2.1-6.1.14.jar),whirr-core-0.7.1.jar, whirr-hadoop-0.7.1.jar:
-
-NOTE: jersey is dual licensed (http://jersey.java.net/CDDL+GPL.html),
-Apahce Airavata elects to include jersey in this distribution under the
-[CDDLv_1.0] license.
-
- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
- 1. Definitions.
-
- 1.1. Contributor means each individual or entity that creates or
- contributes to the creation of Modifications.
-
- 1.2. Contributor Version means the combination of the Original Software,
- prior Modifications used by a Contributor (if any), and the Modifications
- made by that particular Contributor.
-
- 1.3. Covered Software means (a) the Original Software, or
- (b) Modifications, or (c) the combination of files containing Original
- Software with files containing Modifications, in each case including
- portions thereof.
-
- 1.4. Executable means the Covered Software in any form other than Source
- Code.
-
- 1.5. Initial Developer means the individual or entity that first makes
- Original Software available under this License.
-
- 1.6. Larger Work means a work which combines Covered Software or portions
- thereof with code not governed by the terms of this License.
-
- 1.7. License means this document.
-
- 1.8. Licensable means having the right to grant, to the maximum extent
- possible, whether at the time of the initial grant or subsequently
- acquired, any and all of the rights conveyed herein.
-
- 1.9. Modifications means the Source Code and Executable form of any of
- the following: A. Any file that results from an addition to, deletion
- from or modification of the contents of a file containing Original
- Software or previous Modifications; B. Any new file that contains any
- part of the Original Software or previous Modification; or C. Any new
- file that is contributed or otherwise made available under the terms of
- this License.
-
- 1.10. Original Software means the Source Code and Executable form of
- computer software code that is originally released under this License.
-
- 1.11. Patent Claims means any patent claim(s), now owned or hereafter
- acquired, including without limitation, method, process, and apparatus
- claims, in any patent Licensable by grantor.
-
- 1.12. Source Code means (a) the common form of computer software code in
- which modifications are made and (b) associated documentation included in
- or with such code.
-
- 1.13. You (or Your) means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License. For
- legal entities, You includes any entity which controls, is controlled by,
- or is under common control with You. For purposes of this definition,
- control means (a) the power, direct or indirect, to cause the direction
- or management of such entity, whether by contract or otherwise, or
- (b) ownership of more than fifty percent (50%) of the outstanding shares
- or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant. Conditioned upon Your compliance with
- Section 3.1 below and subject to third party intellectual property
- claims, the Initial Developer hereby grants You a world-wide,
- royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Initial Developer, to use, reproduce, modify, display,
- perform, sublicense and distribute the Original Software (or portions
- thereof), with or without Modifications, and/or as part of a Larger
- Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of
- Original Software, to make, have made, use, practice, sell, and offer
- for sale, and/or otherwise dispose of the Original Software (or
- portions thereof);
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
- date Initial Developer first distributes or otherwise makes the
- Original Software available to a third party under the terms of
- this License;
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
- (1) for code that You delete from the Original Software, or (2) for
- infringements caused by: (i) the modification of the Original
- Software, or (ii) the combination of the Original Software with other
- software or devices.
-
- 2.2. Contributor Grant. Conditioned upon Your compliance with Section 3.1
- below and subject to third party intellectual property claims, each
- Contributor hereby grants You a world-wide, royalty-free, non-exclusive
- license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Contributor to use, reproduce, modify, display, perform,
- sublicense and distribute the Modifications created by such
- Contributor (or portions thereof), either on an unmodified basis,
- with other Modifications, as Covered Software and/or as part of a
- Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in
- combination with its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale, have made, and/or
- otherwise dispose of: (1) Modifications made by that Contributor (or
- portions thereof); and (2) the combination of Modifications made by
- that Contributor with its Contributor Version (or portions of such
- combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
- the date Contributor first distributes or otherwise makes the
- Modifications available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
- (1) for any code that Contributor has deleted from the Contributor
- Version; (2) for infringements caused by: (i) third party
- modifications of Contributor Version, or (ii) the combination of
- Modifications made by that Contributor with other software (except
- as part of the Contributor Version) or other devices; or (3) under
- Patent Claims infringed by Covered Software in the absence of
- Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code. Any Covered Software that You distribute
- or otherwise make available in Executable form must also be made available
- in Source Code form and that Source Code form must be distributed only
- under the terms of this License. You must include a copy of this License
- with every copy of the Source Code form of the Covered Software You
- distribute or otherwise make available. You must inform recipients of any
- such Covered Software in Executable form as to how they can obtain such
- Covered Software in Source Code form in a reasonable manner on or through
- a medium customarily used for software exchange.
-
- 3.2. Modifications. The Modifications that You create or to which You
- contribute are governed by the terms of this License. You represent that
- You believe Your Modifications are Your original creation(s) and/or You
- have sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices. You must include a notice in each of Your
- Modifications that identifies You as the Contributor of the Modification.
- You may not remove or alter any copyright, patent or trademark notices
- contained within the Covered Software, or any notices of licensing or any
- descriptive text giving attribution to any Contributor or the Initial
- Developer.
-
- 3.4. Application of Additional Terms. You may not offer or impose any
- terms on any Covered Software in Source Code form that alters or restricts
- the applicable version of this License or the recipients rights hereunder.
- You may choose to offer, and to charge a fee for, warranty, support,
- indemnity or liability obligations to one or more recipients of Covered
- Software. However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You must make it
- absolutely clear that any such warranty, support, indemnity or liability
- obligation is offered by You alone, and You hereby agree to indemnify the
- Initial Developer and every Contributor for any liability incurred by the
- Initial Developer or such Contributor as a result of warranty, support,
- indemnity or liability terms You offer.
-
- 3.5. Distribution of Executable Versions. You may distribute the
- Executable form of the Covered Software under the terms of this License or
- under the terms of a license of Your choice, which may contain terms
- different from this License, provided that You are in compliance with the
- terms of this License and that the license for the Executable form does
- not attempt to limit or alter the recipients rights in the Source Code
- form from the rights set forth in this License. If You distribute the
- Covered Software in Executable form under a different license, You must
- make it absolutely clear that any terms which differ from this License
- are offered by You alone, not by the Initial Developer or Contributor.
- You hereby agree to indemnify the Initial Developer and every Contributor
- for any liability incurred by the Initial Developer or such Contributor as
- a result of any such terms You offer.
-
- 3.6. Larger Works. You may create a Larger Work by combining Covered
- Software with other code not governed by the terms of this License and
- distribute the Larger Work as a single product. In such a case, You must
- make sure the requirements of this License are fulfilled for the Covered
- Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions. Sun Microsystems, Inc. is the initial license steward
- and may publish revised and/or new versions of this License from time to
- time. Each version will be given a distinguishing version number. Except
- as provided in Section 4.3, no one other than the license steward has the
- right to modify this License.
-
- 4.2. Effect of New Versions. You may always continue to use, distribute
- or otherwise make the Covered Software available under the terms of the
- version of the License under which You originally received the Covered
- Software. If the Initial Developer includes a notice in the Original
- Software prohibiting it from being distributed or otherwise made
- available under any subsequent version of the License, You must
- distribute and make the Covered Software available under the terms of
- the version of the License under which You originally received the
- Covered Software. Otherwise, You may also choose to use, distribute or
- otherwise make the Covered Software available under the terms of any
- subsequent version of the License published by the license steward.
-
- 4.3. Modified Versions. When You are an Initial Developer and You want
- to create a new license for Your Original Software, You may create and
- use a modified version of this License if You: (a) rename the license and
- remove any references to the name of the license steward (except to note
- that the license differs from this License); and (b) otherwise make it
- clear that the license contains terms which differ from this License.
-
- 5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE
- ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
- IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
- SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
- OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
- THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
- DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
- CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
- CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF
- THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER
- EXCEPT UNDER THIS DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure
- such breach within 30 days of becoming aware of the breach. Provisions
- which, by their nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory
- judgment actions) against Initial Developer or a Contributor (the Initial
- Developer or Contributor against whom You assert such claim is referred
- to as Participant) alleging that the Participant Software (meaning the
- Contributor Version where the Participant is a Contributor or the
- Original Software where the Participant is the Initial Developer)
- directly or indirectly infringes any patent, then any and all rights
- granted directly or indirectly to You by such Participant, the Initial
- Developer (if the Initial Developer is not the Participant) and all
- Contributors under Sections 2.1 and/or 2.2 of this License shall, upon
- 60 days notice from Participant terminate prospectively and automatically
- at the expiration of such 60 day notice period, unless if within such
- 60 day period You withdraw Your claim with respect to the Participant
- Software against such Participant either unilaterally or pursuant to a
- written agreement with Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end
- user licenses that have been validly granted by You or any distributor
- hereunder prior to termination (excluding licenses granted to You by any
- distributor) shall survive termination.
-
- 7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
- THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL
- YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
- COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
- PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF
- ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS,
- LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY
- AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
- BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
- RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW
- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
- OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
- AND LIMITATION MAY NOT APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS. The Covered Software is a commercial item,
- as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
- commercial computer software (as that term is defined at 48 C.F.R.
- 252.227-7014(a)(1)) and commercial computer software documentation as such
- terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R.
- 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S.
- Government End Users acquire Covered Software with only those rights set
- forth herein. This U.S. Government Rights clause is in lieu of, and
- supersedes, any other FAR, DFAR, or other clause or provision that
- addresses Government rights in computer software under this License.
-
- 9. MISCELLANEOUS. This License represents the complete agreement
- concerning subject matter hereof. If any provision of this License is
- held to be unenforceable, such provision shall be reformed only to the
- extent necessary to make it enforceable. This License shall be governed
- by the law of the jurisdiction specified in a notice contained within
- the Original Software (except to the extent applicable law, if any,
- provides otherwise), excluding such jurisdictions conflict-of-law
- provisions. Any litigation relating to this License shall be subject to
- the jurisdiction of the courts located in the jurisdiction and venue
- specified in a notice contained within the Original Software, with the
- losing party responsible for costs, including, without limitation, court
- costs and reasonable attorneys fees and expenses. The application of the
- United Nations Convention on Contracts for the International Sale of
- Goods is expressly excluded. Any law or regulation which provides that
- the language of a contract shall be construed against the drafter shall
- not apply to this License. You agree that You alone are responsible for
- compliance with the United States export administration regulations (and
- the export control laws and regulation of any other countries) when You
- use, distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the
- Contributors, each party is responsible for claims and damages arising,
- directly or indirectly, out of its utilization of rights under this
- License and You agree to work with Initial Developer and Contributors
- to distribute such responsibility on an equitable basis. Nothing herein
- is intended or shall be deemed to constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
- LICENSE (CDDL) The code released under the CDDL shall be governed by the
- laws of the State of California (excluding conflict-of-law provisions).
- Any litigation relating to this License shall be subject to the
- jurisdiction of the Federal Courts of the Northern District of California
- and the state courts of the State of California, with venue lying in
- Santa Clara County, California.
-
-
-==============================================================================
-
-For: jaxb-xjc-2.1.7.jar
- Containing Project URL:
-
-Copyright (c) 2004 Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall
-be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-===============================================================================
-The following components are BSD Licensed
-===============================================================================
-
-For jibx-bind-1.2.1.jar,jibx-run-1.2.1.jar, antlr-2.7.7.jar,hamcrest-all-1.1.jar,whirr-core-0.7.1.jar, whirr-hadoop-0.7.1.jar:
- Containing Project URL: http://jibx.sourceforge.net, http://www.antlr.org/
-
-Copyright (c) 2003-2007, Dennis M. Sosnoski
-All rights reserved.
-
-Copyright (c) 2010 Terence Parr
-All rights reserved.
-
-[The BSD License]
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of JiBX nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==============================================================================
-
-For YFilter:
- Containing Project URL: http://yfilter.cs.umass.edu/
-
-YFilter 1.0 COPYRIGHT, LICENSE and DISCLAIMER
-
-Copyright (c) 2002, 2004, Regents of the University of California All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or other
- materials provided with the distribution.
- * Neither the name of the University of California at Berkeley nor the names of
- its contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================================================
-For jaxen-1.1.1.jar:
- Containing Project URL: http://jaxen.codehaus.org/
-
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of the Jaxen Project nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-The following components are CPL Licensed
-===============================================================================
-
-For wsdl4j-1.6.2.jar:
- Containing Project URL: http://sourceforge.net/projects/wsdl4j/
-
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-1. DEFINITIONS
-"Contribution" means:
-a) in the case of the initial Contributor, the initial code and
documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from a
Contributor if it was added to the Program by such Contributor itself or anyone
acting on such Contributor's behalf. Contributions do not include additions to
the Program which: (i) are separate modules of software distributed in
conjunction with the Program under their own license agreement, and (ii) are not
derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-"Licensed Patents " mean patent claims licensable by a Contributor which are
necessarily infringed by the use or sale of its Contribution alone or when
combined with the Program.
-"Program" means the Contributions distributed in accordance with this Agreement.
-"Recipient" means anyone who receives the Program under this Agreement,
including all Contributors.
-2. GRANT OF RIGHTS
-a) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free copyright license to
reproduce, prepare derivative works of, publicly display, publicly perform,
distribute and sublicense the Contribution of such Contributor, if any, and such
derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
Patents to make, use, sell, offer to sell, import and otherwise transfer the
Contribution of such Contributor, if any, in source code and object code form.
This patent license shall apply to the combination of the Contribution and the
Program if, at the time the Contribution is added by the Contributor, such
addition of the Contribution causes such combination to be covered by the
Licensed Patents. The patent license shall not apply to any other combinations
which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses
to its Contributions set forth herein, no assurances are provided by any
Contributor that the Program does not infringe the patent or other intellectual
property rights of any other entity. Each Contributor disclaims any liability to
Recipient for claims brought by any other entity based on infringement of
intellectual property rights or otherwise. As a condition to exercising the
rights and licenses granted hereunder, each Recipient hereby assumes sole
responsibility to secure any other intellectual property rights needed, if any.
For example, if a third party patent license is required to allow Recipient to
distribute the Program, it is Recipient's responsibility to acquire that license
before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient
copyright rights in its Contribution, if any, to grant the copyright license set
forth in this Agreement.
-3. REQUIREMENTS
-A Contributor may choose to distribute the Program in object code form under its
own license agreement, provided that:
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and
conditions, express and implied, including warranties or conditions of title and
non-infringement, and implied warranties or conditions of merchantability and
fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for
damages, including direct, indirect, special, incidental and consequential
damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered
by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such
Contributor, and informs licensees how to obtain it in a reasonable manner on or
through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the
Program.
-Each Contributor must identify itself as the originator of its Contribution, if
any, in a manner that reasonably allows subsequent Recipients to identify the
originator of the Contribution.
-4. COMMERCIAL DISTRIBUTION
-Commercial distributors of software may accept certain responsibilities with
respect to end users, business partners and the like. While this license is
intended to facilitate the commercial use of the Program, the Contributor who
includes the Program in a commercial product offering should do so in a manner
which does not create potential liability for other Contributors. Therefore, if
a Contributor includes the Program in a commercial product offering, such
Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
every other Contributor ("Indemnified Contributor") against any losses, damages
and costs (collectively "Losses") arising from claims, lawsuits and other legal
actions brought by a third party against the Indemnified Contributor to the
extent caused by the acts or omissions of such Commercial Contributor in
connection with its distribution of the Program in a commercial product
offering. The obligations in this section do not ap
ply to any claims or Losses
relating to any actual or alleged intellectual property infringement. In order
to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
Contributor in writing of such claim, and b) allow the Commercial Contributor to
control, and cooperate with the Commercial Contributor in, the defense and any
related settlement negotiations. The Indemnified Contributor may participate in
any such claim at its own expense.
-For example, a Contributor might include the Program in a commercial product
offering, Product X. That Contributor is then a Commercial Contributor. If that
Commercial Contributor then makes performance claims, or offers warranties
related to Product X, those performance claims and warranties are such
Commercial Contributor's responsibility alone. Under this section, the
Commercial Contributor would have to defend claims against the other
Contributors related to those performance claims and warranties, and if a court
requires any other Contributor to pay any damages as a result, the Commercial
Contributor must pay those damages.
-5. NO WARRANTY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
Recipient is solely responsible for determining the appropriateness of using and
distributing the Program and assumes all risks associated with its exercise of
rights under this Agreement, including but not limited to the risks and costs of
program errors, compliance with applicable laws, damage to or loss of data,
programs or equipment, and unavailability or interruption of operations.
-6. DISCLAIMER OF LIABILITY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-7. GENERAL
-If any provision of this Agreement is invalid or unenforceable under applicable
law, it shall not affect the validity or enforceability of the remainder of the
terms of this Agreement, and without further action by the parties hereto, such
provision shall be reformed to the minimum extent necessary to make such
provision valid and enforceable.
-If Recipient institutes patent litigation against a Contributor with respect to
a patent applicable to software (including a cross-claim or counterclaim in a
lawsuit), then any patent licenses granted by that Contributor to such Recipient
under this Agreement shall terminate as of the date such litigation is filed. In
addition, if Recipient institutes patent litigation against any entity
(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
itself (excluding combinations of the Program with other software or hardware)
infringes such Recipient's patent(s), then such Recipient's rights granted under
Section 2(b) shall terminate as of the date such litigation is filed.
-All Recipient's rights under this Agreement shall terminate if it fails to
comply with any of the material terms or conditions of this Agreement and does
not cure such failure in a reasonable period of time after becoming aware of
such noncompliance. If all Recipient's rights under this Agreement terminate,
Recipient agrees to cease use and distribution of the Program as soon as
reasonably practicable. However, Recipient's obligations under this Agreement
and any licenses granted by Recipient relating to the Program shall continue and
survive.
-Everyone is permitted to copy and distribute copies of this Agreement, but in
order to avoid inconsistency the Agreement is copyrighted and may only be
modified in the following manner. The Agreement Steward reserves the right to
publish new versions (including revisions) of this Agreement from time to time.
No one other than the Agreement Steward has the right to modify this Agreement.
IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
as the Agreement Steward to a suitable separate entity. Each new version of the
Agreement will be given a distinguishing version number. The Program (including
Contributions) may always be distributed subject to the version of the Agreement
under which it was received. In addition, after a new version of the Agreement
is published, Contributor may elect to distribute the Program (including its
Contributions) under the new version. Except as expressly stated in Sections
2(a) and 2(b) above, Recipie
nt receives no rights or licenses to the
intellectual property of any Contributor under this Agreement, whether
expressly, by implication, estoppel or otherwise. All rights in the Program not
expressly granted under this Agreement are reserved.
-This Agreement is governed by the laws of the State of New York and the
intellectual property laws of the United States of America. No party to this
Agreement will bring a legal action under this Agreement more than one year
after the cause of action arose. Each party waives its rights to a jury trial in
any resulting litigation.
-
-==========================================================================================
-==========================================================================================
-
-For puretls:
- Containing Project URL:
-
- This package is a SSLv3/TLS implementation written by Eric Rescorla
- <ek...@rtfm.com> and licensed by Claymore Systems, Inc.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of Claymore Systems, Inc. nor the name of Eric
- Rescorla may be used to endorse or promote products derived from this
- software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY CLAYMORE SYSTEMS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-==============================================================================
-
-For xml-api,woden-api-1.0M8.jar,woden-impl-dom-1.0M8.jar:
- Containing Project URL:
-
-For the W3C schema and DTD files in the org.apache.woden.resolver package:
-
-W3C® DOCUMENT LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
-
-Public documents on the W3C site are provided by the copyright holders under
-the following license. By using and/or copying this document, or the W3C
-document from which this statement is linked, you (the licensee) agree that
-you have read, understood, and will comply with the following terms and
-conditions:
-
-Permission to copy, and distribute the contents of this document, or the W3C
-document from which this statement is linked, in any medium for any purpose
-and without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the document, or portions thereof, that you use:
-
- 1. A link or URL to the original W3C document.
- 2. The pre-existing copyright notice of the original author, or if it
- doesn't exist, a notice (hypertext is preferred, but a textual
- representation is permitted) of the form: "Copyright © [$date-of-document]
- World Wide Web Consortium, (Massachusetts Institute of Technology,
- European Research Consortium for Informatics and Mathematics, Keio
- University). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231"
- 3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should be
-provided. We request that authorship attribution be provided in any software,
-documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.
-
-No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license. However, if additional requirements (documented in
-the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with
-those requirements.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
-FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
-INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
-PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
-
-The name and trademarks of copyright holders may NOT be used in advertising
-or publicity pertaining to this document or its contents without specific,
-written prior permission. Title to copyright in this document will at all
-times remain with copyright holders.
-
-This formulation of W3C's notice and license became active on December 31 2002.
-This version removes the copyright ownership notice such that this license can
-be used with materials other than those owned by the W3C, reflects that ERCIM is
-now a host of the W3C, includes references to this specific dated version of the
-license, and removes the ambiguous grant of "use". Otherwise, this version is the
-same as the previous version and is written so as to preserve the Free Software
-Foundation's assessment of GPL compatibility and OSI's certification under the
-Open Source Definition. Please see our Copyright FAQ for common questions about
-using materials from our site, including specific terms and conditions for packages
-like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed
-o site-policy@w3.org.
-
-Joseph Reagle <si...@w3.org>
-
-Last revised $Id: copyright-software-20021231.html,v 1.11 2004/07/06 16:02:49 slesch Exp $
-
-==========================================================================================
-
-XML API library, org.w3c classes (xml-apis)
- Containing Project URL:
-
- DOM Java Language Binding:
- http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/java-binding.html
-
- W3C IPR SOFTWARE NOTICE
- Copyright (C) 2000 World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University). All Rights Reserved.
-
- The DOM bindings are published under the W3C Software Copyright Notice
- and License. The software license requires "Notice of any changes or
- modifications to the W3C files, including the date changes were made."
- Consequently, modified versions of the DOM bindings must document that
- they do not conform to the W3C standard; in the case of the IDL binding,
- the pragma prefix can no longer be 'w3c.org'; in the case of the Java
- binding, the package names can no longer be in the 'org.w3c' package.
-
- Note: The original version of the W3C Software Copyright Notice and
- License could be found at
- http://www.w3.org/Consortium/Legal/copyright-software-19980720
-
- Copyright (C) 1994-2000 World Wide Web Consortium, (Massachusetts
- Institute of Technology, Institut National de Recherche en Informatique
- et en Automatique, Keio University). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/
-
- This W3C work (including software, documents, or other related items) is
- being provided by the copyright holders under the following license. By
- obtaining, using and/or copying this work, you (the licensee) agree that
- you have read, understood, and will comply with the following terms and
- conditions:
-
- Permission to use, copy, and modify this software and its documentation,
- with or without modification, for any purpose and without fee or royalty
- is hereby granted, provided that you include the following on ALL copies
- of the software and documentation or portions thereof, including
- modifications, that you make:
-
- 1. The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
-
- 2. Any pre-existing intellectual property disclaimers, notices, or
- terms and conditions. If none exist, a short notice of the following
- form (hypertext is preferred, text is permitted) should be used
- within the body of any redistributed or derivative code:
- "Copyright (C) [$date-of-software] World Wide Web Consortium,
- (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved. http://www.w3.org/Consortium/Legal/"
-
- 3. Notice of any changes or modifications to the W3C files, including
- the date changes were made. (We recommend you provide URIs to the
- location from which the code is derived.)
-
- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
- MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT
- NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
- PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
- ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
- OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
- DOCUMENTATION.
-
- The name and trademarks of copyright holders may NOT be used in
- advertising or publicity pertaining to the software without specific,
- written prior permission. Title to copyright in this software and any
- associated documentation will at all times remain with copyright holders.
-
-===============================================================================
-The following components come under the Eclipse Public 1.0 License
-===============================================================================
-Eclipse JDT Core (core-3.1.1.jar)
-
- Eclipse Public License - v 1.0
-
- THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
- PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
- THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
- 1. DEFINITIONS
-
- "Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
-
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and
- are distributed by that particular Contributor. A Contribution
- 'originates' from a Contributor if it was added to the Program by
- such Contributor itself or anyone acting on such Contributor's behalf.
- Contributions do not include additions to the Program which: (i) are
- separate modules of software distributed in conjunction with the
- Program under their own license agreement, and (ii) are not derivative
- works of the Program.
-
- "Contributor" means any person or entity that distributes the Program.
-
- "Licensed Patents " mean patent claims licensable by a Contributor which
- are necessarily infringed by the use or sale of its Contribution alone or
- when combined with the Program.
-
- "Program" means the Contributions distributed in accordance with this
- Agreement.
-
- "Recipient" means anyone who receives the Program under this Agreement,
- including all Contributors.
-
- 2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free copyright license to
- reproduce, prepare derivative works of, publicly display, publicly
- perform, distribute and sublicense the Contribution of such
- Contributor, if any, and such derivative works, in source code and
- object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free patent license under
- Licensed Patents to make, use, sell, offer to sell, import and
- otherwise transfer the Contribution of such Contributor, if any, in
- source code and object code form. This patent license shall apply to
- the combination of the Contribution and the Program if, at the time
- the Contribution is added by the Contributor, such addition of the
- Contribution causes such combination to be covered by the Licensed
- Patents. The patent license shall not apply to any other combinations
- which include the Contribution. No hardware per se is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the
- licenses to its Contributions set forth herein, no assurances are
- provided by any Contributor that the Program does not infringe the
- patent or other intellectual property rights of any other entity. Each
- Contributor disclaims any liability to Recipient for claims brought by
- any other entity based on infringement of intellectual property rights
- or otherwise. As a condition to exercising the rights and licenses
- granted hereunder, each Recipient hereby assumes sole responsibility
- to secure any other intellectual property rights needed, if any. For
- example, if a third party patent license is required to allow Recipient
- to distribute the Program, it is Recipient's responsibility to acquire
- that license before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has sufficient
- copyright rights in its Contribution, if any, to grant the copyright
- license set forth in this Agreement.
-
- 3. REQUIREMENTS
-
- A Contributor may choose to distribute the Program in object code form
- under its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties
- and conditions, express and implied, including warranties or
- conditions of title and non-infringement, and implied warranties
- or conditions of merchantability and fitness for a particular
- purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability
- for damages, including direct, indirect, special, incidental and
- consequential damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are
- offered by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such
- Contributor, and informs licensees how to obtain it in a
- reasonable manner on or through a medium customarily used for
- software exchange.
-
- When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the
- Program.
-
- Contributors may not remove or alter any copyright notices contained
- within the Program.
-
- Each Contributor must identify itself as the originator of its
- Contribution, if any, in a manner that reasonably allows subsequent
- Recipients to identify the originator of the Contribution.
-
- 4. COMMERCIAL DISTRIBUTION
-
- Commercial distributors of software may accept certain responsibilities
- with respect to end users, business partners and the like. While this
- license is intended to facilitate the commercial use of the Program,
- the Contributor who includes the Program in a commercial product offering
- should do so in a manner which does not create potential liability for
- other Contributors. Therefore, if a Contributor includes the Program in
- a commercial product offering, such Contributor ("Commercial Contributor")
- hereby agrees to defend and indemnify every other Contributor
- ("Indemnified Contributor") against any losses, damages and costs
- (collectively "Losses") arising from claims, lawsuits and other legal
- actions brought by a third party against the Indemnified Contributor to
- the extent caused by the acts or omissions of such Commercial Contributor
- in connection with its distribution of the Program in a commercial
- product offering. The obligations in this section do not apply to any
- claims or Losses relating to any actual or alleged intellectual property
- infringement. In order to qualify, an Indemnified Contributor must:
- a) promptly notify the Commercial Contributor in writing of such claim,
- and b) allow the Commercial Contributor to control, and cooperate with
- the Commercial Contributor in, the defense and any related settlement
- negotiations. The Indemnified Contributor may participate in any such
- claim at its own expense.
-
- For example, a Contributor might include the Program in a commercial
- product offering, Product X. That Contributor is then a Commercial
- Contributor. If that Commercial Contributor then makes performance claims,
- or offers warranties related to Product X, those performance claims and
- warranties are such Commercial Contributor's responsibility alone. Under
- this section, the Commercial Contributor would have to defend claims
- against the other Contributors related to those performance claims and
- warranties, and if a court requires any other Contributor to pay any
- damages as a result, the Commercial Contributor must pay those damages.
-
- 5. NO WARRANTY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
- ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
- EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
- CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
- PARTICULAR PURPOSE. Each Recipient is solely responsible for determining
- the appropriateness of using and distributing the Program and assumes all
- risks associated with its exercise of rights under this Agreement ,
- including but not limited to the risks and costs of program errors,
- compliance with applicable laws, damage to or loss of data, programs or
- equipment, and unavailability or interruption of operations.
-
- 6. DISCLAIMER OF LIABILITY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
- ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
- WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
- DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
- HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- 7. GENERAL
-
- If any provision of this Agreement is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability of
- the remainder of the terms of this Agreement, and without further action
- by the parties hereto, such provision shall be reformed to the minimum
- extent necessary to make such provision valid and enforceable.
-
- If Recipient institutes patent litigation against any entity (including
- a cross-claim or counterclaim in a lawsuit) alleging that the Program
- itself (excluding combinations of the Program with other software or
- hardware) infringes such Recipient's patent(s), then such Recipient's
- rights granted under Section 2(b) shall terminate as of the date such
- litigation is filed.
-
- All Recipient's rights under this Agreement shall terminate if it fails
- to comply with any of the material terms or conditions of this Agreement
- and does not cure such failure in a reasonable period of time after
- becoming aware of such noncompliance. If all Recipient's rights under
- this Agreement terminate, Recipient agrees to cease use and distribution
- of the Program as soon as reasonably practicable. However, Recipient's
- obligations under this Agreement and any licenses granted by Recipient
- relating to the Program shall continue and survive.
-
- Everyone is permitted to copy and distribute copies of this Agreement,
- but in order to avoid inconsistency the Agreement is copyrighted and may
- only be modified in the following manner. The Agreement Steward reserves
- the right to publish new versions (including revisions) of this Agreement
- from time to time. No one other than the Agreement Steward has the right
- to modify this Agreement. The Eclipse Foundation is the initial Agreement
- Steward. The Eclipse Foundation may assign the responsibility to serve as
- the Agreement Steward to a suitable separate entity. Each new version of
- the Agreement will be given a distinguishing version number. The Program
- (including Contributions) may always be distributed subject to the version
- of the Agreement under which it was received. In addition, after a new
- version of the Agreement is published, Contributor may elect to distribute
- the Program (including its Contributions) under the new version. Except as
- expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
- rights or licenses to the intellectual property of any Contributor under
- this Agreement, whether expressly, by implication, estoppel or otherwise.
- All rights in the Program not expressly granted under this Agreement
- are reserved.
-
- This Agreement is governed by the laws of the State of New York and the
- intellectual property laws of the United States of America. No party to
- this Agreement will bring a legal action under this Agreement more than
- one year after the cause of action arose. Each party waives its rights to
- a jury trial in any resulting litigation.
-
-===============================================================================
-
-Logback library (logback-core, logback-classic)
- Containing Project URL: http://logback.qos.ch/
-
- Logback: the reliable, generic, fast and flexible logging framework.
- Copyright (C) 1999-2009, QOS.ch. All rights reserved.
-
- This program and the accompanying materials are dual-licensed under
- either the terms of the Eclipse Public License v1.0 as published by
- the Eclipse Foundation
-
- or (per the licensee's choosing)
-
- under the terms of the GNU Lesser General Public License version 2.1
- as published by the Free Software Foundation.
-
-===============================================================================
-The following components are in the public domain
-===============================================================================
-
-For Sax: http://www.saxproject.org/
- Containing Project URL: http://www.megginson.com/SAX/
-
-This license came from: http://www.megginson.com/SAX/copying.html
- However please note future versions of SAX may be covered
- under http://saxproject.org/?selected=pd
-
-
-This page is now out of date -- see the new SAX site at
-http://www.saxproject.org/ for more up-to-date
-releases and other information. Please change your bookmarks.
-
-
-SAX2 is Free!
-
-I hereby abandon any property rights to SAX 2.0 (the Simple API for
-XML), and release all of the SAX 2.0 source code, compiled code, and
-documentation contained in this distribution into the Public Domain.
-SAX comes with NO WARRANTY or guarantee of fitness for any
-purpose.
-
-David Megginson, david@megginson.com
-2000-05-05
-
-==========================================================================
-
-Metadata extractor library (metadata-extractor)
- Containing Project URL: http://www.drewnoakes.com/code/exif/
-
- This is public domain software - that is, you can do whatever you want
- with it, and include it software that is licensed under the GNU or the
- BSD license, or whatever other licence you choose, including proprietary
- closed source licenses. I do ask that you leave this header in tact.
-
- If you make modifications to this code that you think would benefit the
- wider community, please send me a copy and I'll post it on my site.
-
- If you make use of this code, I'd appreciate hearing about it.
- metadata_extractor [at] drewnoakes [dot] com
- Latest version of this software kept at
- http://drewnoakes.com/
-
-===============================================================================
-
-Adobe Font Metrics (AFM) for PDF Core 14 Fonts
- Containing Project URL:
-
- This file and the 14 PostScript(R) AFM files it accompanies may be used,
- copied, and distributed for any purpose and without charge, with or without
- modification, provided that all copyright notices are retained; that the
- AFM files are not distributed without this file; that all modifications
- to this file or any of the AFM files are prominently noted in the modified
- file(s); and that this paragraph is not modified. Adobe Systems has no
- responsibility or obligation to support the use of the AFM files.
-
-CMaps for PDF Fonts (http://www.adobe.com/devnet/font/#pcfi and
-ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/)
-
- Copyright 1990-2001 Adobe Systems Incorporated.
- All Rights Reserved.
-
- Patents Pending
-
- NOTICE: All information contained herein is the property
- of Adobe Systems Incorporated.
-
- Permission is granted for redistribution of this file
- provided this copyright notice is maintained intact and
- that the contents of this file are not altered in any
- way from its original form.
-
- PostScript and Display PostScript are trademarks of
- Adobe Systems Incorporated which may be registered in
- certain jurisdictions.
-
-================================================================================
-
-Glyphlist (http://www.adobe.com/devnet/opentype/archives/glyph.html)
- Containing Project URL:
-
- Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this documentation file to use, copy, publish, distribute,
- sublicense, and/or sell copies of the documentation, and to permit
- others to do the same, provided that:
- - No modification, editing or other alteration of this document is
- allowed; and
- - The above copyright notice and this permission notice shall be
- included in all copies of the documentation.
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this documentation file, to create their own derivative works
- from the content of this document to use, copy, publish, distribute,
- sublicense, and/or sell the derivative works, and to permit others to do
- the same, provided that the derived work is not represented as being a
- copy or version of this document.
-
- Adobe shall not be liable to any party for any loss of revenue or profit
- or for indirect, incidental, special, consequential, or other similar
- damages, whether based on tort (including without limitation negligence
- or strict liability), contract or other legal or equitable grounds even
- if Adobe has been advised or had reason to know of the possibility of
- such damages. The Adobe materials are provided on an "AS IS" basis.
- Adobe specifically disclaims all express, statutory, or implied
- warranties relating to the Adobe materials, including but not limited to
- those concerning merchantability or fitness for a particular purpose or
- non-infringement of any third party rights regarding the Adobe
- materials.
-
-================================================================================
-
-MIME type information from file-4.26.tar.gz (http://www.darwinsys.com/file/)
- Containing Project URL:
-
- Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
- Software written by Ian F. Darwin and others;
- maintained 1994- Christos Zoulas.
-
- This software is not subject to any export provision of the United States
- Department of Commerce, and may be exported to any country or planet.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice immediately at the beginning of the file, without modification,
- this list of conditions, and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-================================================================================
-
-Concurrent library (concurrent-1.3.4.jar)
- Containing Project URL:
- http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-
- All classes are released to the public domain and may be used for any
- purpose whatsoever without permission or acknowledgment. Portions of
- the CopyOnWriteArrayList and ConcurrentReaderHashMap classes are adapted
- from Sun JDK source code. These are copyright of Sun Microsystems, Inc,
- and are used with their kind permission, as described in this license:
-
- TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. TO DOUG LEA
-
- Whereas Doug Lea desires to utlized certain Java Software technologies
- in the util.concurrent technology; and Whereas Sun Microsystems, Inc.
- ("Sun") desires that Doug Lea utilize certain Java Software technologies
- in the util.concurrent technology;
-
- Therefore the parties agree as follows, effective May 31, 2002:
-
- "Java Software technologies" means
-
- classes/java/util/ArrayList.java, and
- classes/java/util/HashMap.java.
-
- The Java Software technologies are Copyright (c) 1994-2000 Sun
- Microsystems, Inc. All rights reserved.
-
- Sun hereby grants Doug Lea a non-exclusive, worldwide, non-transferrable
- license to use, reproduce, create derivate works of, and distribute the
- Java Software and derivative works thereof in source and binary forms
- as part of a larger work, and to sublicense the right to use, reproduce
- and distribute the Java Software and Doug Lea's derivative works as the
- part of larger works through multiple tiers of sublicensees provided that
- the following conditions are met:
-
- -Neither the name of or trademarks of Sun may be used to endorse or
- promote products including or derived from the Java Software technology
- without specific prior written permission; and
- -Redistributions of source or binary code must contain the above
- copyright notice, this notice and and the following disclaimers:
-
- This software is provided "AS IS," without a warranty of any kind.
- ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
- SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
- THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC.
- OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
- HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
- THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
- HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- You acknowledge that Software is not designed,licensed or intended for
- use in the design, construction, operation or maintenance of any nuclear
- facility.
-
-=============================================================================
-
-Office Open XML schemas (ooxml-schemas-1.0.jar)
- Containing Project URL:
-
- The Office Open XML schema definitions used by Apache POI are
- a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
- As defined in section 9.4 of the ECMA bylaws [2], this specification
- is available to all interested parties without restriction:
-
- 9.4 All documents when approved shall be made available to
- all interested parties without restriction.
-
- Furthermore, both Microsoft and Adobe have granted patent licenses
- to this work [3,4,5].
-
- [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
- [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
- [3] http://www.microsoft.com/interop/osp/
- [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf
- [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf
-
-==========================================================================================
-
-Unicode conversion code in Lucene Java (lucene-core)
-
- Copyright 2001-2004 Unicode, Inc.
-
- Disclaimer
-
- This source code is provided as is by Unicode, Inc. No claims are
- made as to fitness for any particular purpose. No warranties of any
- kind are expressed or implied. The recipient agrees to determine
- applicability of information provided. If this file has been
- purchased on magnetic or optical media from Unicode, Inc., the
- sole remedy for any claim will be exchange of defective media
- within 90 days of receipt.
-
- Limitations on Rights to Redistribute This Code
-
- Unicode, Inc. hereby grants the right to freely use the information
- supplied in this file in the creation of products supporting the
- Unicode Standard, and to make copies of this file in any form
- for internal or external distribution as long as this notice
- remains attached.
-
-==========================================================================================
-For jython-2.5.1.jar, Array utility code in Lucene Java (lucene-core):
- Containing Project URL: http://www.jython.org
-
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual
- or Organization ("Licensee") accessing and otherwise using this software ("Jython") in source
- or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a
-nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display
-publicly, prepare derivative works, distribute, and otherwise use Jython alone or in any derivative
-version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e.,
-"Copyright (c) 2007 Python Software Foundation; All Rights Reserved" are retained in Jython alone
-or in any derivative version prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on or incorporates Jython or any part
-thereof, and wants to make the derivative work available to others as provided herein, then Licensee
-hereby agrees to include in any such work a brief summary of the changes made to Jython.
-
-4. PSF is making Jython available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR
-WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS
-ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
-THE USE OF JYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON FOR ANY INCIDENTAL, SPECIAL,
-OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership,
-or joint venture between PSF and Licensee. This License Agreement does not grant permission to use
- PSF trademarks or trade name in a trademark sense to endorse or promote products or services of
- Licensee, or any third party.
-
-8. By copying, installing or otherwise using Jython, Licensee agrees to be bound by the
-terms and conditions of this License Agreement.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers All rights reserved.
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or other
-materials provided with the distribution.
-Neither the name of the Jython Developers nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-============================================================================
-
- BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
- -------------------------------------------
-
- BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
- 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
- office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
- Individual or Organization ("Licensee") accessing and otherwise using
- this software in source or binary form and its associated
- documentation ("the Software").
-
- 2. Subject to the terms and conditions of this BeOpen Python License
- Agreement, BeOpen hereby grants Licensee a non-exclusive,
- royalty-free, world-wide license to reproduce, analyze, test, perform
- and/or display publicly, prepare derivative works, distribute, and
- otherwise use the Software alone or in any derivative version,
- provided, however, that the BeOpen Python License is retained in the
- Software, alone or in any derivative version prepared by Licensee.
-
- 3. BeOpen is making the Software available to Licensee on an "AS IS"
- basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
-
- 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
- SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
- AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
- DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
- 5. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
-
- 6. This License Agreement shall be governed by and interpreted in all
- respects by the law of the State of California, excluding conflict of
- law provisions. Nothing in this License Agreement shall be deemed to
- create any relationship of agency, partnership, or joint venture
- between BeOpen and Licensee. This License Agreement does not grant
- permission to use BeOpen trademarks or trade names in a trademark
- sense to endorse or promote products or services of Licensee, or any
- third party. As an exception, the "BeOpen Python" logos available at
- http://www.pythonlabs.com/logos.html may be used according to the
- permissions granted on that web page.
-
- 7. By copying, installing or otherwise using the software, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
-
-===========================================================================
-
- CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
- ---------------------------------------
-
- 1. This LICENSE AGREEMENT is between the Corporation for National
- Research Initiatives, having an office at 1895 Preston White Drive,
- Reston, VA 20191 ("CNRI"), and the Individual or Organization
- ("Licensee") accessing and otherwise using Python 1.6.1 software in
- source or binary form and its associated documentation.
-
- 2. Subject to the terms and conditions of this License Agreement, CNRI
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python 1.6.1
- alone or in any derivative version, provided, however, that CNRI's
- License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
- 1995-2001 Corporation for National Research Initiatives; All Rights
- Reserved" are retained in Python 1.6.1 alone or in any derivative
- version prepared by Licensee. Alternately, in lieu of CNRI's License
- Agreement, Licensee may substitute the following text (omitting the
- quotes): "Python 1.6.1 is made available subject to the terms and
- conditions in CNRI's License Agreement. This Agreement together with
- Python 1.6.1 may be located on the Internet using the following
- unique, persistent identifier (known as a handle): 1895.22/1013. This
- Agreement may also be obtained from a proxy server on the Internet
- using the following URL: http://hdl.handle.net/1895.22/1013".
-
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python 1.6.1 or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python 1.6.1.
-
- 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
- basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
-
- 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
-
- 7. This License Agreement shall be governed by the federal
- intellectual property law of the United States, including without
- limitation the federal copyright law, and, to the extent such
- U.S. federal law does not apply, by the law of the Commonwealth of
- Virginia, excluding Virginia's conflict of law provisions.
- Notwithstanding the foregoing, with regard to derivative works based
- on Python 1.6.1 that incorporate non-separable material that was
- previously distributed under the GNU General Public License (GPL), the
- law of the Commonwealth of Virginia shall govern this License
- Agreement only as to issues arising under or with respect to
- Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
- License Agreement shall be deemed to create any relationship of
- agency, partnership, or joint venture between CNRI and Licensee. This
- License Agreement does not grant permission to use CNRI trademarks or
- trade name in a trademark sense to endorse or promote products or
- services of Licensee, or any third party.
-
- 8. By clicking on the "ACCEPT" button where indicated, or by copying,
- installing or otherwise using Python 1.6.1, Licensee agrees to be
- bound by the terms and conditions of this License Agreement.
-
- ACCEPT
-
-============================================================================
-
- CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
- --------------------------------------------------
-
- Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
- The Netherlands. All rights reserved.
-
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Stichting Mathematisch
- Centrum or CWI not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission.
-
- STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-==============================================================================
-
-JCR 2.0 API (jcr-2.0.jar)
-
- [Day Specification License]
-
- Day Management AG ("Licensor") is willing to license this specification
- to you ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED
- IN THIS LICENSE AGREEMENT ("Agreement"). Please read the terms and
- conditions of this Agreement carefully.
-
- Content Repository for JavaTM Technology API Specification ("Specification")
- Version: 2.0
- Status: FCS
- Release: 10 August 2009
-
- Copyright 2009 Day Management AG
- Barfüsserplatz 6, 4001 Basel, Switzerland.
- All rights reserved.
-
- NOTICE; LIMITED LICENSE GRANTS
-
- 1. License for Purposes of Evaluation and Developing Applications.
- Licensor hereby grants you a fully-paid, non-exclusive, non-transferable,
- worldwide, limited license (without the right to sublicense), under
- Licensor's applicable intellectual property rights to view, download,
- use and reproduce the Specification only for the purpose of internal
- evaluation. This includes developing applications intended to run on an
- implementation of the Specification provided that such applications do
- not themselves implement any portion(s) of the Specification.
-
- 2. License for the Distribution of Compliant Implementations. Licensor
- also grants you a perpetual, non-exclusive, non-transferable, worldwide,
- fully paid-up, royalty free, limited license (without the right to
- sublicense) under any applicable copyrights or, subject to the provisions
- of subsection 4 below, patent rights it may have covering the
- Specification to create and/or distribute an Independent Implementation
- of the Specification that: (a) fully implements the Specification
- including all its required interfaces and functionality; (b) does not
- modify, subset, superset or otherwise extend the Licensor Name Space, or
- include any public or protected packages, classes, Java interfaces, fields
- or methods within the Licensor Name Space other than those
- required/authorized by the Specification or Specifications being
- implemented; and (c) passes the Technology Compatibility Kit (including
- satisfying the requirements of the applicable TCK Users Guide) for such
- Specification ("Compliant Implementation"). In addition, the foregoing
- license is expressly conditioned on your not acting outside its scope.
- No license is granted hereunder for any other purpose (including, for
- example, modifying the Specification, other than to the extent of your
- fair use rights, or distributing the Specification to third parties).
-
- 3. Pass-through Conditions. You need not include limitations (a)-(c) from
- the previous paragraph or any other particular "pass through" requirements
- in any license You grant concerning the use of your Independent
- Implementation or products derived from it. However, except with respect
- to Independent Implementations (and products derived from them) that
- satisfy limitations (a)-(c) from the previous paragraph, You may neither:
- (a) grant or otherwise pass through to your licensees any licenses under
- Licensor's applicable intellectual property rights; nor (b) authorize your
- licensees to make any claims concerning their implementation's compliance
- with the Specification.
-
- 4. Reciprocity Concerning Patent Licenses. With respect to any patent
- claims covered by the license granted under subparagraph 2 above that
- would be infringed by all technically feasible implementations of the
- Specification, such license is conditioned upon your offering on fair,
- reasonable and non-discriminatory terms, to any party seeking it from
- You, a perpetual, non-exclusive, non-transferable, worldwide license
- under Your patent rights that are or would be infringed by all technically
- feasible implementations of the Specification to develop, distribute and
- use a Compliant Implementation.
-
- 5. Definitions. For the purposes of this Agreement: "Independent
- Implementation" shall mean an implementation of the Specification that
- neither derives from any of Licensor's source code or binary code
- materials nor, except with an appropriate and separate license from
- Licensor, includes any of Licensor's source code or binary code materials;
- "Licensor Name Space" shall mean the public class or interface
- declarations whose names begin with "java", "javax", "javax.jcr" or their
- equivalents in any subsequent naming convention adopted by Licensor
- through the Java Community Process, or any recognized successors or
- replacements thereof; and "Technology Compatibility Kit" or "TCK" shall
- mean the test suite and accompanying TCK User's Guide provided by
- Licensor which corresponds to the particular version of the Specification
- being tested.
-
- 6. Termination. This Agreement will terminate immediately without notice
- from Licensor if you fail to comply with any material provision of or act
- outside the scope of the licenses granted above.
-
- 7. Trademarks. No right, title, or interest in or to any trademarks,
- service marks, or trade names of Licensor is granted hereunder. Java is
- a registered trademark of Sun Microsystems, Inc. in the United States and
- other countries.
-
- 8. Disclaimer of Warranties. The Specification is provided "AS IS".
- LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A
- CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR
- THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE.
- This document does not represent any commitment to release or implement
- any portion of the Specification in any product.
-
- The Specification could include technical inaccuracies or typographical
- errors. Changes are periodically added to the information therein; these
- changes will be incorporated into new versions of the Specification, if
- any. Licensor may make improvements and/or changes to the product(s)
- and/or the program(s) described in the Specification at any time. Any
- use of such changes in the Specification will be governed by the
- then-current license for the applicable version of the Specification.
-
- 9. Limitation of Liability. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
- EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT
- LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT,
- CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY
- FURNISHING, PRACTICING, MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN
- IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- 10. Report. If you provide Licensor with any comments or suggestions in
- connection with your use of the Specification ("Feedback"), you hereby:
- (i) agree that such Feedback is provided on a non-proprietary and
- non-confidential basis, and (ii) grant Licensor a perpetual,
- non-exclusive, worldwide, fully paid-up, irrevocable license, with the
- right to sublicense through multiple levels of sublicensees, to
- incorporate, disclose, and use without limitation the Feedback for any
- purpose related to the Specification and future versions,
- implementations, and test suites thereof.
-
- [Addendum to the Day Specification License]
-
- In addition to the permissions granted under the Specification
- License, Day Management AG hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- license to reproduce, publicly display, publicly perform,
- sublicense, and distribute unmodified copies of the Content
- Repository for Java Technology API (JCR 2.0) Java Archive (JAR)
- file ("jcr-2.0.jar") and to make, have made, use, offer to sell,
- sell, import, and otherwise transfer said file on its own or
- as part of a larger work that makes use of the JCR API.
-
- With respect to any patent claims covered by this license
- that would be infringed by all technically feasible implementations
- of the Specification, such license is conditioned upon your
- offering on fair, reasonable and non-discriminatory terms,
- to any party seeking it from You, a perpetual, non-exclusive,
- non-transferable, worldwide license under Your patent rights
- that are or would be infringed by all technically feasible
- implementations of the Specification to develop, distribute
- and use a Compliant Implementation.
-================================================================================
-
-APACHE HADOOP SUBCOMPONENTS:
-
-The Apache Hadoop project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-For the org.apache.hadoop.util.bloom.* classes:
-
-/**
- *
- * Copyright (c) 2005, European Commission project OneLab under contract
- * 034819 (http://www.one-lab.org)
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the distribution.
- * - Neither the name of the University Catholique de Louvain - UCL
- * nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-=================================================================================
-
-==========================================================================
-The following license applies to the whirr-core-0.7.1.jar, whirr-hadoop-0.7.1.jar
---------------------------------------------------------------------------
-
-Copyright (C) <year> by <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-================================================================================
-whirr-core-0.7.1.jar, whirr-hadoop-0.7.1.jar, jsch-0.1.44.jar
-================================================================================
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008,2009 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-The following license applies to the whirr-core-0.7.1.jar whirr-hadoop-0.7.1.jar
---------------------------------------------------------------------------
-
-Copyright (c) 2007-2009, JSR305 expert group
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the JSR305 expert group nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-gsabes-client-1.6.0.jar
-
-================================================================================
-Copyright (c) 2004-2010
-CINECA, Fujitsu Labs Europe, ICM Warsaw, Intel Corporation,
-Research Centre Juelich, University of Manchester, T-Systems,
-and other contributors to UNICORE: http://www.unicore.eu
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-(1) Redistributions of source code must retain the above copyright
- notice, this list of conditions and the disclaimer at the end.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-(2) Neither the name of the copyright holders nor the names of their
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-DISCLAIMER
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/README b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/README
deleted file mode 100644
index e4a4864bce..0000000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Airavata Thrift C++ Software Development Kit.
-
-Prerequisites:
-Since C++ thrift libraries are platform dependent, we encourage you to compile apache thrift locally.
-
-Conveniance Binaries:
-Airavata will bundle conveniance binaries, but again we encourage to build from source.
\ No newline at end of file
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
index fa29c8ac28..cbfed6b991 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
@@ -1,6 +1,4 @@
<!--
-
-
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
@@ -17,25 +15,11 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<baseDirectory>${archive.name}-${version}</baseDirectory>
@@ -43,35 +27,33 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+
<fileSets>
- <!-- ********************** copy release notes files ********************** -->
<fileSet>
- <directory>../../../</directory>
- <outputDirectory>${archive.name}-${version}</outputDirectory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
<includes>
<include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
</includes>
</fileSet>
- <!-- ********************** copy licenses, readme etc. ********************** -->
<fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory>${archive.name}-${version}</outputDirectory>
+ <directory>${project.basedir}/src/main/resources/lib</directory>
+ <outputDirectory>lib</outputDirectory>
<includes>
- <include>php-cli-samples/*</include>
- <include>lib/**</include>
- <include>conf/*</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>INSTALL</include>
+ <include>*</include>
</includes>
</fileSet>
-<!-- <fileSet>
+ <fileSet>
<directory>${project.build.directory}/conf</directory>
<outputDirectory>conf</outputDirectory>
- <includes>
- <include>*.properties</include>
+ <includes>
+ <include>*</include>
</includes>
- </fileSet>-->
+ </fileSet>
</fileSets>
+
</assembly>
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index 4afeddab24..8a4ae0dff2 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -127,28 +127,6 @@
</extensions>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
- <executions>
- <execution>
- <id>mft-controller-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>
@@ -156,7 +134,7 @@
<configuration>
<protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
- <sourceDirectory>${project.basedir}/../proto</sourceDirectory>
+ <sourceDirectory>../proto</sourceDirectory>
</sourceDirectories>
</configuration>
<executions>
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 3c02b217ba..ff61805c7a 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -115,7 +115,7 @@
<inherited>true</inherited>
<configuration>
<systemPropertyVariables>
- <credential.module.directory>${basedir}</credential.module.directory>
+ <credential.module.directory>.</credential.module.directory>
</systemPropertyVariables>
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
@@ -126,18 +126,18 @@
<exclude>**/DAOBaseTestCase.java</exclude>
<exclude>**/MappingDAOTest.java</exclude>
</excludes>
- <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
</configuration>
</plugin>
</plugins>
- <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<testResources>
<testResource>
- <directory>${project.basedir}/src/test/resources</directory>
+ <directory>src/test/resources</directory>
</testResource>
<testResource>
- <directory>${project.basedir}/../../../keystores</directory>
+ <directory>../../../keystores</directory>
<targetPath>keystores</targetPath>
<includes>
<include>*.jks</include>
diff --git a/modules/distribution/agent-service-dist/pom.xml b/modules/distribution/agent-service-dist/pom.xml
new file mode 100644
index 0000000000..adece4adf0
--- /dev/null
+++ b/modules/distribution/agent-service-dist/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>agent-service-dist</artifactId>
+ <name>Airavata Agent Service Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>agent-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <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>
+ <executions>
+ <execution>
+ <id>agent-service-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-agent-service-configuration</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/conf</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../configuration/server/src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-agent-service-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${agent.service.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/agent-service</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml b/modules/distribution/agent-service-dist/src/main/assembly/agent-service-bin-assembly.xml
similarity index 55%
rename from modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
rename to modules/distribution/agent-service-dist/src/main/assembly/agent-service-bin-assembly.xml
index 6fee2fb3a5..7eb541af8d 100644
--- a/modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
+++ b/modules/distribution/agent-service-dist/src/main/assembly/agent-service-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,44 +15,29 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${agent.service.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.yml</include>
@@ -69,23 +52,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh b/modules/distribution/agent-service-dist/src/main/resources/bin/agent-service-daemon.sh
similarity index 100%
rename from modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
rename to modules/distribution/agent-service-dist/src/main/resources/bin/agent-service-daemon.sh
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh b/modules/distribution/agent-service-dist/src/main/resources/bin/agent-service.sh
similarity index 100%
rename from modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
rename to modules/distribution/agent-service-dist/src/main/resources/bin/agent-service.sh
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh b/modules/distribution/agent-service-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
rename to modules/distribution/agent-service-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml b/modules/distribution/agent-service-dist/src/main/resources/conf/application.yml
similarity index 100%
rename from modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
rename to modules/distribution/agent-service-dist/src/main/resources/conf/application.yml
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml b/modules/distribution/agent-service-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml
rename to modules/distribution/agent-service-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/truststore.jks b/modules/distribution/agent-service-dist/src/main/resources/conf/truststore.jks
similarity index 100%
rename from modules/agent-framework/agent-service/src/main/resources/distribution/conf/truststore.jks
rename to modules/distribution/agent-service-dist/src/main/resources/conf/truststore.jks
diff --git a/modules/distribution/api-server-dist/pom.xml b/modules/distribution/api-server-dist/pom.xml
new file mode 100644
index 0000000000..eac90d1b90
--- /dev/null
+++ b/modules/distribution/api-server-dist/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>api-server-dist</artifactId>
+ <name>Airavata API Server Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-standalone-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${api.server.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>api-server-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-api-server-configuration</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/conf</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../configuration/server/src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-api-server-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${api.server.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/api-server</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/distribution/api-server-dist/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/api-server-dist/src/main/assembly/api-server-bin-assembly.xml
new file mode 100644
index 0000000000..7b338ffaf0
--- /dev/null
+++ b/modules/distribution/api-server-dist/src/main/assembly/api-server-bin-assembly.xml
@@ -0,0 +1,108 @@
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${api.server.dist.name}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ <include>logo.txt</include>
+ <include>startNetworkServer</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./</directory>
+ <outputDirectory>logs</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <!-- ********************** copy database scripts ********************** -->
+ <fileSet>
+ <directory>../../registry/registry-core/src/main/resources/</directory>
+ <outputDirectory>conf/database_scripts</outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../credential-store/credential-store-service/src/main/resources/</directory>
+ <outputDirectory>conf/database_scripts</outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../sharing-registry/sharing-registry-server/src/main/resources/</directory>
+ <outputDirectory>conf/database_scripts</outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../../airavata-services/profile-service/profile-user-core/src/main/resources/</directory>
+ <outputDirectory>conf/database_scripts</outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
diff --git a/modules/distribution/src/main/docker/api-server/Dockerfile b/modules/distribution/api-server-dist/src/main/docker/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/api-server/Dockerfile
rename to modules/distribution/api-server-dist/src/main/docker/Dockerfile
diff --git a/modules/distribution/src/main/docker/api-server/wait-for-it.sh b/modules/distribution/api-server-dist/src/main/docker/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/api-server/wait-for-it.sh
rename to modules/distribution/api-server-dist/src/main/docker/wait-for-it.sh
diff --git a/modules/distribution/src/main/resources/api-server/INSTALL b/modules/distribution/api-server-dist/src/main/resources/INSTALL
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/INSTALL
rename to modules/distribution/api-server-dist/src/main/resources/INSTALL
diff --git a/modules/distribution/src/main/resources/api-server/LICENSE b/modules/distribution/api-server-dist/src/main/resources/LICENSE
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/LICENSE
rename to modules/distribution/api-server-dist/src/main/resources/LICENSE
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/NOTICE b/modules/distribution/api-server-dist/src/main/resources/NOTICE
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/NOTICE
rename to modules/distribution/api-server-dist/src/main/resources/NOTICE
diff --git a/modules/distribution/src/main/resources/api-server/README b/modules/distribution/api-server-dist/src/main/resources/README
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/README
rename to modules/distribution/api-server-dist/src/main/resources/README
diff --git a/modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh b/modules/distribution/api-server-dist/src/main/resources/bin/airavata-server-start.sh
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh
rename to modules/distribution/api-server-dist/src/main/resources/bin/airavata-server-start.sh
diff --git a/modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh b/modules/distribution/api-server-dist/src/main/resources/bin/airavata-server-stop.sh
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh
rename to modules/distribution/api-server-dist/src/main/resources/bin/airavata-server-stop.sh
diff --git a/modules/distribution/src/main/resources/api-server/bin/airavata-server.bat b/modules/distribution/api-server-dist/src/main/resources/bin/airavata-server.bat
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/airavata-server.bat
rename to modules/distribution/api-server-dist/src/main/resources/bin/airavata-server.bat
diff --git a/modules/distribution/src/main/resources/api-server/bin/derby.sh b/modules/distribution/api-server-dist/src/main/resources/bin/derby.sh
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/derby.sh
rename to modules/distribution/api-server-dist/src/main/resources/bin/derby.sh
diff --git a/modules/distribution/src/main/resources/api-server/bin/logo.txt b/modules/distribution/api-server-dist/src/main/resources/bin/logo.txt
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/logo.txt
rename to modules/distribution/api-server-dist/src/main/resources/bin/logo.txt
diff --git a/modules/distribution/src/main/resources/api-server/bin/setenv.bat b/modules/distribution/api-server-dist/src/main/resources/bin/setenv.bat
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/setenv.bat
rename to modules/distribution/api-server-dist/src/main/resources/bin/setenv.bat
diff --git a/modules/distribution/src/main/resources/api-server/bin/setenv.sh b/modules/distribution/api-server-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/setenv.sh
rename to modules/distribution/api-server-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/api-server/bin/startNetworkServer b/modules/distribution/api-server-dist/src/main/resources/bin/startNetworkServer
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/startNetworkServer
rename to modules/distribution/api-server-dist/src/main/resources/bin/startNetworkServer
diff --git a/modules/distribution/controller-dist/pom.xml b/modules/distribution/controller-dist/pom.xml
new file mode 100644
index 0000000000..f3bc5bfd9d
--- /dev/null
+++ b/modules/distribution/controller-dist/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>controller-dist</artifactId>
+ <name>Airavata Controller Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${controller.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/controller-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>controller-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-controller-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${controller.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/controller</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/controller-dist/src/main/assembly/controller-bin-assembly.xml
similarity index 54%
copy from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
copy to modules/distribution/controller-dist/src/main/assembly/controller-bin-assembly.xml
index 8d72d47391..a5045de771 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/controller-dist/src/main/assembly/controller-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${controller.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,19 +30,29 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
- <include>application.properties</include>
- <include>log4j2.xml</include>
+ <include>*</include>
</includes>
</fileSet>
<fileSet>
@@ -68,23 +62,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/docker/controller/Dockerfile b/modules/distribution/controller-dist/src/main/docker/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/controller/Dockerfile
rename to modules/distribution/controller-dist/src/main/docker/Dockerfile
diff --git a/modules/distribution/src/main/docker/controller/wait-for-it.sh b/modules/distribution/controller-dist/src/main/docker/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/controller/wait-for-it.sh
rename to modules/distribution/controller-dist/src/main/docker/wait-for-it.sh
diff --git a/modules/distribution/src/main/resources/controller/bin/controller-daemon.sh b/modules/distribution/controller-dist/src/main/resources/bin/controller-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/controller/bin/controller-daemon.sh
rename to modules/distribution/controller-dist/src/main/resources/bin/controller-daemon.sh
diff --git a/modules/distribution/src/main/resources/controller/bin/controller.sh b/modules/distribution/controller-dist/src/main/resources/bin/controller.sh
similarity index 100%
rename from modules/distribution/src/main/resources/controller/bin/controller.sh
rename to modules/distribution/controller-dist/src/main/resources/bin/controller.sh
diff --git a/modules/distribution/src/main/resources/controller/bin/setenv.sh b/modules/distribution/controller-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/controller/bin/setenv.sh
rename to modules/distribution/controller-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/controller/conf/airavata-server.properties b/modules/distribution/controller-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/controller/conf/airavata-server.properties
rename to modules/distribution/controller-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/distribution/src/main/resources/controller/conf/log4j2.xml b/modules/distribution/controller-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/controller/conf/log4j2.xml
rename to modules/distribution/controller-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/src/main/docker/docker-compose.yml b/modules/distribution/docker-compose.yml
similarity index 100%
rename from modules/distribution/src/main/docker/docker-compose.yml
rename to modules/distribution/docker-compose.yml
diff --git a/modules/distribution/email-monitor-dist/pom.xml b/modules/distribution/email-monitor-dist/pom.xml
new file mode 100644
index 0000000000..e88bca8c68
--- /dev/null
+++ b/modules/distribution/email-monitor-dist/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>email-monitor-dist</artifactId>
+ <name>Airavata Email Monitor Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>email-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${email.monitor.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/email-monitor-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>email-monitor-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-email-monitor-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${email.monitor.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/email-monitor</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/email-monitor-dist/src/main/assembly/email-monitor-bin-assembly.xml
similarity index 54%
copy from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
copy to modules/distribution/email-monitor-dist/src/main/assembly/email-monitor-bin-assembly.xml
index 8d72d47391..2fca4f5644 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/email-monitor-dist/src/main/assembly/email-monitor-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${email.monitor.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,18 +30,30 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
- <include>application.properties</include>
+ <include>airavata-server.properties</include>
+ <include>email-config.yaml</include>
<include>log4j2.xml</include>
</includes>
</fileSet>
@@ -68,23 +64,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/docker/email-monitor/Dockerfile b/modules/distribution/email-monitor-dist/src/main/docker/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/email-monitor/Dockerfile
rename to modules/distribution/email-monitor-dist/src/main/docker/Dockerfile
diff --git a/modules/distribution/src/main/docker/email-monitor/wait-for-it.sh b/modules/distribution/email-monitor-dist/src/main/docker/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/email-monitor/wait-for-it.sh
rename to modules/distribution/email-monitor-dist/src/main/docker/wait-for-it.sh
diff --git a/modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh b/modules/distribution/email-monitor-dist/src/main/resources/bin/email-monitor-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh
rename to modules/distribution/email-monitor-dist/src/main/resources/bin/email-monitor-daemon.sh
diff --git a/modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh b/modules/distribution/email-monitor-dist/src/main/resources/bin/email-monitor.sh
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh
rename to modules/distribution/email-monitor-dist/src/main/resources/bin/email-monitor.sh
diff --git a/modules/distribution/src/main/resources/email-monitor/bin/setenv.sh b/modules/distribution/email-monitor-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/bin/setenv.sh
rename to modules/distribution/email-monitor-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties b/modules/distribution/email-monitor-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties
rename to modules/distribution/email-monitor-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml b/modules/distribution/email-monitor-dist/src/main/resources/conf/email-config.yaml
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
rename to modules/distribution/email-monitor-dist/src/main/resources/conf/email-config.yaml
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/log4j2.xml b/modules/distribution/email-monitor-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/conf/log4j2.xml
rename to modules/distribution/email-monitor-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/file-server-dist/pom.xml b/modules/distribution/file-server-dist/pom.xml
new file mode 100644
index 0000000000..876ae0855a
--- /dev/null
+++ b/modules/distribution/file-server-dist/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>file-server-dist</artifactId>
+ <name>Airavata File Server Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>file-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${file.server.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/file-server-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>file-server-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-file-server-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${file.server.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/file-server-dist/src/main/assembly/file-server-bin-assembly.xml
similarity index 53%
copy from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
copy to modules/distribution/file-server-dist/src/main/assembly/file-server-bin-assembly.xml
index 8d72d47391..3e93cbe04f 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/file-server-dist/src/main/assembly/file-server-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${file.server.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,15 +30,15 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.properties</include>
@@ -68,23 +52,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/file-server/src/main/resources/distribution/bin/file-service-daemon.sh b/modules/distribution/file-server-dist/src/main/resources/bin/file-service-daemon.sh
similarity index 100%
rename from modules/file-server/src/main/resources/distribution/bin/file-service-daemon.sh
rename to modules/distribution/file-server-dist/src/main/resources/bin/file-service-daemon.sh
diff --git a/modules/file-server/src/main/resources/distribution/bin/file-service.sh b/modules/distribution/file-server-dist/src/main/resources/bin/file-service.sh
similarity index 100%
rename from modules/file-server/src/main/resources/distribution/bin/file-service.sh
rename to modules/distribution/file-server-dist/src/main/resources/bin/file-service.sh
diff --git a/modules/file-server/src/main/resources/distribution/bin/setenv.sh b/modules/distribution/file-server-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/file-server/src/main/resources/distribution/bin/setenv.sh
rename to modules/distribution/file-server-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/file-server/src/main/resources/distribution/conf/application.properties b/modules/distribution/file-server-dist/src/main/resources/conf/application.properties
similarity index 100%
rename from modules/file-server/src/main/resources/distribution/conf/application.properties
rename to modules/distribution/file-server-dist/src/main/resources/conf/application.properties
diff --git a/modules/distribution/src/main/resources/parser-wm/conf/log4j2.xml b/modules/distribution/file-server-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/parser-wm/conf/log4j2.xml
rename to modules/distribution/file-server-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/parser-wm-dist/pom.xml b/modules/distribution/parser-wm-dist/pom.xml
new file mode 100644
index 0000000000..82d8df1931
--- /dev/null
+++ b/modules/distribution/parser-wm-dist/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>parser-wm-dist</artifactId>
+ <name>Airavata Parser Workflow Manager Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${parser.wm.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/parser-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>parser-wm-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-parser-wm-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${parser.wm.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/parser-wm-dist/src/main/assembly/parser-wm-bin-assembly.xml
similarity index 54%
copy from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
copy to modules/distribution/parser-wm-dist/src/main/assembly/parser-wm-bin-assembly.xml
index 8d72d47391..c1bfafefc0 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/parser-wm-dist/src/main/assembly/parser-wm-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${parser.wm.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,18 +30,29 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
- <include>application.properties</include>
+ <include>airavata-server.properties</include>
<include>log4j2.xml</include>
</includes>
</fileSet>
@@ -68,23 +63,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh b/modules/distribution/parser-wm-dist/src/main/resources/bin/parser-wm-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh
rename to modules/distribution/parser-wm-dist/src/main/resources/bin/parser-wm-daemon.sh
diff --git a/modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh b/modules/distribution/parser-wm-dist/src/main/resources/bin/parser-wm.sh
similarity index 100%
rename from modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh
rename to modules/distribution/parser-wm-dist/src/main/resources/bin/parser-wm.sh
diff --git a/modules/distribution/src/main/resources/parser-wm/bin/setenv.sh b/modules/distribution/parser-wm-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/parser-wm/bin/setenv.sh
rename to modules/distribution/parser-wm-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties b/modules/distribution/parser-wm-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties
rename to modules/distribution/parser-wm-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/distribution/src/main/resources/participant/conf/log4j2.xml b/modules/distribution/parser-wm-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/participant/conf/log4j2.xml
rename to modules/distribution/parser-wm-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/participant-dist/pom.xml b/modules/distribution/participant-dist/pom.xml
new file mode 100644
index 0000000000..3b7f90c849
--- /dev/null
+++ b/modules/distribution/participant-dist/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>participant-dist</artifactId>
+ <name>Airavata Participant Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${participant.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/participant-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>participant-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-participant-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${participant.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/participant</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/participant-dist/src/main/assembly/participant-bin-assembly.xml
similarity index 54%
copy from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
copy to modules/distribution/participant-dist/src/main/assembly/participant-bin-assembly.xml
index 8d72d47391..361e81b9d3 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/participant-dist/src/main/assembly/participant-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${participant.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,19 +30,31 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
- <include>application.properties</include>
+ <include>airavata-server.properties</include>
<include>log4j2.xml</include>
+ <include>cred_store.jks</include>
</includes>
</fileSet>
<fileSet>
@@ -68,23 +64,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/docker/participant/Dockerfile b/modules/distribution/participant-dist/src/main/docker/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/participant/Dockerfile
rename to modules/distribution/participant-dist/src/main/docker/Dockerfile
diff --git a/modules/distribution/src/main/docker/participant/wait-for-it.sh b/modules/distribution/participant-dist/src/main/docker/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/participant/wait-for-it.sh
rename to modules/distribution/participant-dist/src/main/docker/wait-for-it.sh
diff --git a/modules/distribution/src/main/resources/participant/bin/participant-daemon.sh b/modules/distribution/participant-dist/src/main/resources/bin/participant-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/participant/bin/participant-daemon.sh
rename to modules/distribution/participant-dist/src/main/resources/bin/participant-daemon.sh
diff --git a/modules/distribution/src/main/resources/participant/bin/participant.sh b/modules/distribution/participant-dist/src/main/resources/bin/participant.sh
similarity index 100%
rename from modules/distribution/src/main/resources/participant/bin/participant.sh
rename to modules/distribution/participant-dist/src/main/resources/bin/participant.sh
diff --git a/modules/distribution/src/main/resources/participant/bin/setenv.sh b/modules/distribution/participant-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/participant/bin/setenv.sh
rename to modules/distribution/participant-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/participant/conf/airavata-server.properties b/modules/distribution/participant-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/participant/conf/airavata-server.properties
rename to modules/distribution/participant-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/distribution/src/main/resources/participant/conf/cred_store.jks b/modules/distribution/participant-dist/src/main/resources/conf/cred_store.jks
similarity index 100%
rename from modules/distribution/src/main/resources/participant/conf/cred_store.jks
rename to modules/distribution/participant-dist/src/main/resources/conf/cred_store.jks
diff --git a/modules/distribution/src/main/resources/post-wm/conf/log4j2.xml b/modules/distribution/participant-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/post-wm/conf/log4j2.xml
rename to modules/distribution/participant-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index ec2364402b..0bf69076c4 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-
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
@@ -18,7 +16,6 @@
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">
@@ -31,723 +28,63 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-airavata-distribution</artifactId>
- <name>Airavata server distribution</name>
+ <name>Airavata Distribution</name>
+ <url>http://airavata.apache.org/</url>
<packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-standalone-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-service</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-service</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!--Cloud module -->
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <!-- end Cloud module -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro-core.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat-embed-logging-juli.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>${tomcat-embed-core.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation.api.version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>${icu4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>${hamcrest.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>${jopt-simple.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ebaysf.web</groupId>
- <artifactId>cors-filter</artifactId>
- <version>${ebay.cors.filter}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <!-- Keycloak admin client requires Jackson 2.8.6 -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <!-- zookeeper dependencies -->
-
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</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>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp-client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <!-- ======================== Profile Service module =================== -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- ======================== Sample =================== -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-samples</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>db-event-manager</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>helix-spectator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>email-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <modules>
+ <module>api-server-dist</module>
+ <module>controller-dist</module>
+ <module>email-monitor-dist</module>
+ <module>parser-wm-dist</module>
+ <module>participant-dist</module>
+ <module>post-wm-dist</module>
+ <module>pre-wm-dist</module>
+ <module>realtime-monitor-dist</module>
+ <module>file-server-dist</module>
+ <module>research-service-dist</module>
+ <module>agent-service-dist</module>
+ </modules>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>realtime-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- </dependencies>
-
- <url>http://airavata.apache.org/</url>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
+ <controller.dist.name>apache-airavata-controller-${project.version}</controller.dist.name>
+ <participant.dist.name>apache-airavata-participant-${project.version}</participant.dist.name>
+ <pre.wm.dist.name>apache-airavata-pre-wm-${project.version}</pre.wm.dist.name>
+ <post.wm.dist.name>apache-airavata-post-wm-${project.version}</post.wm.dist.name>
+ <parser.wm.dist.name>apache-airavata-parser-wm-${project.version}</parser.wm.dist.name>
+ <email.monitor.dist.name>apache-airavata-email-monitor-${project.version}</email.monitor.dist.name>
+ <realtime.monitor.dist.name>apache-airavata-realtime-monitor-${project.version}</realtime.monitor.dist.name>
+ <file.server.dist.name>apache-airavata-file-server-${project.version}</file.server.dist.name>
+ <research.service.dist.name>apache-airavata-research-service-${project.version}</research.service.dist.name>
+ <agent.service.dist.name>apache-airavata-agent-service-${project.version}</agent.service.dist.name>
+ </properties>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${maven-dependency-plugin.version}</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <!--includes>**/*.war</includes -->
- <outputDirectory>${project.build.directory}/conf</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/main/assembly/distribution-assembly.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
<executions>
<execution>
- <id>api-server-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${api.server.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
- <!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>controller-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${controller.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/controller-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>participant-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${participant.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/participant-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>pre-wm-distribution-package</id>
+ <id>distribution-package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${pre.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/pre-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>post-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${post.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/post-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>parser-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${parser.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/parser-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>email-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${email.monitor.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/email-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>realtime-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${realtime.monitor.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
- <executions>
- <execution>
- <id>copy-api-server-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.api.server.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.api.server.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${api.server.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-controller-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.controller.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.controller.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${controller.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-pre-wm-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.pre.wm.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.pre.wm.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${pre.wm.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-post-wm-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.post.wm.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.post.wm.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${post.wm.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-participant-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.participant.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.participant.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${participant.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-email-monitor-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.email.monitor.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.email.monitor.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${email.monitor.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
- <configuration>
- <verbose>true</verbose>
- <images>
- <image>
- <name>airavata/api-server</name>
- <build>
- <dockerFile>${docker.api.server.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/controller</name>
- <build>
- <dockerFile>${docker.controller.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/pre-wm</name>
- <build>
- <dockerFile>${docker.pre.wm.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/post-wm</name>
- <build>
- <dockerFile>${docker.post.wm.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/participant</name>
- <build>
- <dockerFile>${docker.participant.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/email-monitor</name>
- <build>
- <dockerFile>${docker.email.monitor.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- </images>
- </configuration>
- </plugin>
</plugins>
</build>
-
- <properties>
-
- <docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
- <docker.api.server.image.src.root>src/main/docker/api-server</docker.api.server.image.src.root>
-
- <docker.controller.build.directory>${project.build.directory}/controller_docker_img_build</docker.controller.build.directory>
- <docker.controller.image.src.root>src/main/docker/controller</docker.controller.image.src.root>
-
- <docker.pre.wm.build.directory>${project.build.directory}/pre_wm_docker_img_build</docker.pre.wm.build.directory>
- <docker.pre.wm.image.src.root>src/main/docker/pre-wm</docker.pre.wm.image.src.root>
-
- <docker.post.wm.build.directory>${project.build.directory}/post_wm_docker_img_build</docker.post.wm.build.directory>
- <docker.post.wm.image.src.root>src/main/docker/post-wm</docker.post.wm.image.src.root>
-
- <docker.participant.build.directory>${project.build.directory}/participant_docker_img_build</docker.participant.build.directory>
- <docker.participant.image.src.root>src/main/docker/participant</docker.participant.image.src.root>
-
- <docker.email.monitor.build.directory>${project.build.directory}/email_monitor_docker_img_build</docker.email.monitor.build.directory>
- <docker.email.monitor.image.src.root>src/main/docker/email-monitor</docker.email.monitor.image.src.root>
-
- <jersey.version>1.13</jersey.version>
- <grizzly.version>2.0.0-M3</grizzly.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
- <controller.dist.name>apache-airavata-controller-${project.version}</controller.dist.name>
- <participant.dist.name>apache-airavata-participant-${project.version}</participant.dist.name>
- <pre.wm.dist.name>apache-airavata-pre-wm-${project.version}</pre.wm.dist.name>
- <post.wm.dist.name>apache-airavata-post-wm-${project.version}</post.wm.dist.name>
- <parser.wm.dist.name>apache-airavata-parser-wm-${project.version}</parser.wm.dist.name>
- <email.monitor.dist.name>apache-airavata-email-monitor-${project.version}</email.monitor.dist.name>
- <realtime.monitor.dist.name>apache-airavata-realtime-monitor-${project.version}</realtime.monitor.dist.name>
- </properties>
</project>
diff --git a/modules/distribution/post-wm-dist/pom.xml b/modules/distribution/post-wm-dist/pom.xml
new file mode 100644
index 0000000000..4d2360df01
--- /dev/null
+++ b/modules/distribution/post-wm-dist/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>post-wm-dist</artifactId>
+ <name>Airavata Post Workflow Manager Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${post.wm.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/post-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>post-wm-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-post-wm-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${post.wm.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/post-wm</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/post-wm-dist/src/main/assembly/post-wm-bin-assembly.xml
similarity index 50%
rename from modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
rename to modules/distribution/post-wm-dist/src/main/assembly/post-wm-bin-assembly.xml
index 038a0651d3..6708255b32 100644
--- a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/post-wm-dist/src/main/assembly/post-wm-bin-assembly.xml
@@ -1,6 +1,4 @@
<!--
-
-
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
@@ -17,59 +15,63 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
- http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>sharing-registry</baseDirectory>
+ <baseDirectory>${post.wm.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
+ <format>zip</format>
</formats>
<fileSets>
<fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
<includes>
- <include>*.sh</include>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
</includes>
- <fileMode>755</fileMode>
</fileSet>
-
- <!-- ********************** copy airavata-server.properties and key stores ********************** -->
<fileSet>
- <directory>../../configuration/server/src/main/resources/</directory>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
<includes>
- <include>airavata-server.properties</include>
- <include>log4j.properties</include>
- <include>airavata.jks</include>
- <include>client_truststore.jks</include>
+ <include>*.sh</include>
</includes>
</fileSet>
-
- <!-- ********************** copy database scripts ********************** -->
<fileSet>
- <directory>../sharing-registry-server/src/main/resources/
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
<includes>
- <include>*sql*</include>
+ <include>airavata-server.properties</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>./</directory>
+ <outputDirectory>logs</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>*:jar:*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+
+</assembly>
diff --git a/modules/distribution/src/main/docker/post-wm/Dockerfile b/modules/distribution/post-wm-dist/src/main/docker/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/post-wm/Dockerfile
rename to modules/distribution/post-wm-dist/src/main/docker/Dockerfile
diff --git a/modules/distribution/src/main/docker/post-wm/wait-for-it.sh b/modules/distribution/post-wm-dist/src/main/docker/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/post-wm/wait-for-it.sh
rename to modules/distribution/post-wm-dist/src/main/docker/wait-for-it.sh
diff --git a/modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh b/modules/distribution/post-wm-dist/src/main/resources/bin/post-wm-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh
rename to modules/distribution/post-wm-dist/src/main/resources/bin/post-wm-daemon.sh
diff --git a/modules/distribution/src/main/resources/post-wm/bin/post-wm.sh b/modules/distribution/post-wm-dist/src/main/resources/bin/post-wm.sh
similarity index 100%
rename from modules/distribution/src/main/resources/post-wm/bin/post-wm.sh
rename to modules/distribution/post-wm-dist/src/main/resources/bin/post-wm.sh
diff --git a/modules/distribution/src/main/resources/post-wm/bin/setenv.sh b/modules/distribution/post-wm-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/post-wm/bin/setenv.sh
rename to modules/distribution/post-wm-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties b/modules/distribution/post-wm-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties
rename to modules/distribution/post-wm-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/distribution/src/main/resources/pre-wm/conf/log4j2.xml b/modules/distribution/post-wm-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/pre-wm/conf/log4j2.xml
rename to modules/distribution/post-wm-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/pre-wm-dist/pom.xml b/modules/distribution/pre-wm-dist/pom.xml
new file mode 100644
index 0000000000..df598f3874
--- /dev/null
+++ b/modules/distribution/pre-wm-dist/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>pre-wm-dist</artifactId>
+ <name>Airavata Pre Workflow Manager Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${pre.wm.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/pre-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-wm-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-pre-wm-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${pre.wm.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/pre-wm</name>
+ <build>
+ <dockerFile>${project.build.directory}/docker/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/pre-wm-dist/src/main/assembly/pre-wm-bin-assembly.xml
similarity index 52%
copy from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
copy to modules/distribution/pre-wm-dist/src/main/assembly/pre-wm-bin-assembly.xml
index 8d72d47391..30a785c676 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/pre-wm-dist/src/main/assembly/pre-wm-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${pre.wm.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,18 +30,18 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
- <include>application.properties</include>
+ <include>airavata-server.properties</include>
<include>log4j2.xml</include>
</includes>
</fileSet>
@@ -68,23 +52,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/docker/pre-wm/Dockerfile b/modules/distribution/pre-wm-dist/src/main/docker/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/pre-wm/Dockerfile
rename to modules/distribution/pre-wm-dist/src/main/docker/Dockerfile
diff --git a/modules/distribution/src/main/docker/pre-wm/wait-for-it.sh b/modules/distribution/pre-wm-dist/src/main/docker/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/pre-wm/wait-for-it.sh
rename to modules/distribution/pre-wm-dist/src/main/docker/wait-for-it.sh
diff --git a/modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh b/modules/distribution/pre-wm-dist/src/main/resources/bin/pre-wm-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh
rename to modules/distribution/pre-wm-dist/src/main/resources/bin/pre-wm-daemon.sh
diff --git a/modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh b/modules/distribution/pre-wm-dist/src/main/resources/bin/pre-wm.sh
similarity index 100%
rename from modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh
rename to modules/distribution/pre-wm-dist/src/main/resources/bin/pre-wm.sh
diff --git a/modules/distribution/src/main/resources/pre-wm/bin/setenv.sh b/modules/distribution/pre-wm-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/pre-wm/bin/setenv.sh
rename to modules/distribution/pre-wm-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties b/modules/distribution/pre-wm-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties
rename to modules/distribution/pre-wm-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/distribution/src/main/resources/realtime-monitor/conf/log4j2.xml b/modules/distribution/pre-wm-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/realtime-monitor/conf/log4j2.xml
rename to modules/distribution/pre-wm-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/realtime-monitor-dist/pom.xml b/modules/distribution/realtime-monitor-dist/pom.xml
new file mode 100644
index 0000000000..b55b6c3753
--- /dev/null
+++ b/modules/distribution/realtime-monitor-dist/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>realtime-monitor-dist</artifactId>
+ <name>Airavata Realtime Monitor Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>realtime-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${realtime.monitor.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>realtime-monitor-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-realtime-monitor-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${realtime.monitor.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml b/modules/distribution/realtime-monitor-dist/src/main/assembly/realtime-monitor-bin-assembly.xml
similarity index 54%
rename from modules/file-server/src/main/assembly/file-service-bin-assembly.xml
rename to modules/distribution/realtime-monitor-dist/src/main/assembly/realtime-monitor-bin-assembly.xml
index 8d72d47391..313c6ab16d 100644
--- a/modules/file-server/src/main/assembly/file-service-bin-assembly.xml
+++ b/modules/distribution/realtime-monitor-dist/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,28 +15,14 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${realtime.monitor.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -46,18 +30,29 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/../../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>INSTALL</include>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
- <include>application.properties</include>
+ <include>airavata-server.properties</include>
<include>log4j2.xml</include>
</includes>
</fileSet>
@@ -68,23 +63,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh b/modules/distribution/realtime-monitor-dist/src/main/resources/bin/realtime-monitor-daemon.sh
similarity index 100%
rename from modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh
rename to modules/distribution/realtime-monitor-dist/src/main/resources/bin/realtime-monitor-daemon.sh
diff --git a/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh b/modules/distribution/realtime-monitor-dist/src/main/resources/bin/realtime-monitor.sh
similarity index 100%
rename from modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh
rename to modules/distribution/realtime-monitor-dist/src/main/resources/bin/realtime-monitor.sh
diff --git a/modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh b/modules/distribution/realtime-monitor-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh
rename to modules/distribution/realtime-monitor-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties b/modules/distribution/realtime-monitor-dist/src/main/resources/conf/airavata-server.properties
similarity index 100%
rename from modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
rename to modules/distribution/realtime-monitor-dist/src/main/resources/conf/airavata-server.properties
diff --git a/modules/file-server/src/main/resources/distribution/conf/log4j2.xml b/modules/distribution/realtime-monitor-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/file-server/src/main/resources/distribution/conf/log4j2.xml
rename to modules/distribution/realtime-monitor-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/research-service-dist/pom.xml b/modules/distribution/research-service-dist/pom.xml
new file mode 100644
index 0000000000..efcd64f6fc
--- /dev/null
+++ b/modules/distribution/research-service-dist/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>apache-airavata-distribution</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>research-service-dist</artifactId>
+ <name>Airavata Research Service Distribution</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.build.directory>${project.build.directory}/docker</docker.build.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>research-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <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>
+ <executions>
+ <execution>
+ <id>research-service-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>copy-research-service-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${research.service.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/modules/research-framework/research-service/src/main/assembly/research-service-bin-assembly.xml b/modules/distribution/research-service-dist/src/main/assembly/research-service-bin-assembly.xml
similarity index 56%
rename from modules/research-framework/research-service/src/main/assembly/research-service-bin-assembly.xml
rename to modules/distribution/research-service-dist/src/main/assembly/research-service-bin-assembly.xml
index 00291df69b..6f818329c5 100644
--- a/modules/research-framework/research-service/src/main/assembly/research-service-bin-assembly.xml
+++ b/modules/distribution/research-service-dist/src/main/assembly/research-service-bin-assembly.xml
@@ -1,6 +1,4 @@
-
<!--
-
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
@@ -17,25 +15,11 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${research.service.dist.name}</baseDirectory>
@@ -46,15 +30,15 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/distribution/bin</directory>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
<include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/distribution/conf</directory>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
<include>application.yml</include>
@@ -69,23 +53,15 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/bin/research-service-daemon.sh b/modules/distribution/research-service-dist/src/main/resources/bin/research-service-daemon.sh
similarity index 100%
rename from modules/research-framework/research-service/src/main/resources/distribution/bin/research-service-daemon.sh
rename to modules/distribution/research-service-dist/src/main/resources/bin/research-service-daemon.sh
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/bin/research-service.sh b/modules/distribution/research-service-dist/src/main/resources/bin/research-service.sh
similarity index 100%
rename from modules/research-framework/research-service/src/main/resources/distribution/bin/research-service.sh
rename to modules/distribution/research-service-dist/src/main/resources/bin/research-service.sh
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/bin/setenv.sh b/modules/distribution/research-service-dist/src/main/resources/bin/setenv.sh
similarity index 100%
rename from modules/research-framework/research-service/src/main/resources/distribution/bin/setenv.sh
rename to modules/distribution/research-service-dist/src/main/resources/bin/setenv.sh
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml b/modules/distribution/research-service-dist/src/main/resources/conf/application.yml
similarity index 100%
rename from modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
rename to modules/distribution/research-service-dist/src/main/resources/conf/application.yml
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/conf/log4j2.xml b/modules/distribution/research-service-dist/src/main/resources/conf/log4j2.xml
similarity index 100%
rename from modules/research-framework/research-service/src/main/resources/distribution/conf/log4j2.xml
rename to modules/distribution/research-service-dist/src/main/resources/conf/log4j2.xml
diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
deleted file mode 100644
index 41075e685f..0000000000
--- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
+++ /dev/null
@@ -1,219 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${api.server.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy release notes files ********************** -->
- <fileSet>
- <directory>../../../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <!-- ********************** copy licenses, readme etc. ********************** -->
- <fileSet>
- <directory>src/main/resources/api-server</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>INSTALL</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy database scripts ********************** -->
- <fileSet>
- <directory>../registry/registry-core/src/main/resources/
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../credential-store/credential-store-service/src/main/resources/
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../sharing-registry/sharing-registry-server/src/main/resources/
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../airavata-services/profile-service/profile-user-core/src/main/resources/
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/api-server/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- <include>logo.txt</include>
- <include>startNetworkServer</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/conf</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>zoo.cfg</include>
- <include>registry.properties</include>
- <include>logback.xml</include>
- <include>host.xml</include>
- <include>persistence.xml</include>
- <include>provenance.sql</include>
- <include>gfac-config.yaml</include>
- <include>PBS_Groovy.template</include>
- <include>SLURM_Groovy.template</include>
- <include>LSF_Groovy.template</include>
- <include>UGE_Groovy.template</include>
- <include>FORK_Groovy.template</include>
- <include>gsissh.properties</include>
- <include>airavata.jks</include>
- <include>client_truststore.jks</include>
- <include>airavata-default-xacml-policy.xml</include>
- <include>enableLegacyTLS.properties</include>
- </includes>
- </fileSet>
-
- <!-- Create logs directory -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.mariadb.jdbc:mariadb-java-client:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.apache.airavata:airavata-api-server:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-credential-store:jar</include>
- <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-orchestrator-client:jar</include>
- <include>org.apache.airavata:airavata-orchestrator-core:jar</include>
- <include>org.apache.airavata:airavata-orchestrator-service:jar</include>
- <include>org.apache.airavata:airavata-registry-core:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
- <include>org.apache.airavata:airavata-server-configuration:jar</include>
- <include>org.apache.airavata:airavata-sharing-registry-server:jar</include>
- <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
- <include>org.apache.airavata:airavata-standalone-server:jar</include>
- <include>org.apache.airavata:db-event-manager:jar</include>
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>org.apache.airavata:registry-api-service:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_hotspot:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_pushgateway:jar</include>
- <include>com.rabbitmq:amqp-client:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.commons:commons-dbcp2:jar</include>
- <include>commons-io:commons-io:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>org.apache.curator:curator-framework:jar</include>
- <include>com.google.code.gson:gson:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.helix:helix-core:jar</include>
- <include>org.apache.airavata:helix-spectator:jar</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>ch.qos.logback:logback-classic:jar</include>
- <include>ch.qos.logback:logback-core:jar</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
-</assembly>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
deleted file mode 100644
index d39d564ecd..0000000000
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ /dev/null
@@ -1,108 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${controller.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/controller/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/controller/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-registry-core:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-server-configuration:jar</include>
- <include>com.rabbitmq:amqp-client:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.commons:commons-dbcp2:jar</include>
- <include>commons-io:commons-io:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>org.apache.curator:curator-framework:jar</include>
- <include>com.google.code.gson:gson:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.helix:helix-core:jar</include>
- <include>org.apache.airavata:helix-spectator:jar</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/distribution/src/main/assembly/distribution-assembly.xml b/modules/distribution/src/main/assembly/distribution-assembly.xml
new file mode 100644
index 0000000000..a1b0d0c218
--- /dev/null
+++ b/modules/distribution/src/main/assembly/distribution-assembly.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
+ <id>distributions</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/agent-service-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/api-server-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/controller-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/email-monitor-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/file-server-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/parser-wm-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/participant-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/post-wm-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/pre-wm-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/realtime-monitor-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/research-service-dist/target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
deleted file mode 100644
index 24f3e4ac0a..0000000000
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ /dev/null
@@ -1,131 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
-
- <fileSet>
- <directory>src/main/resources/email-monitor/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/email-monitor/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>airavata-server.properties</include>
- <include>email-config.yaml</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- Create logs directory -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
-
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.airavata:email-monitor:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
-
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
-
- <include>org.eclipse.angus:jakarta.mail:jar</include>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
-
- <!-- kafka specific jars -->
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
-
- <!-- curator and zookeeper jars -->
- <include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>io.netty:netty-handler:jar</include>
-
- <include>com.google.code.gson:gson:jar</include>
-
- <!-- logging jars -->
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
- <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- <include>org.json:json:jar</include>
-
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
deleted file mode 100644
index 90396d9179..0000000000
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ /dev/null
@@ -1,106 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${parser.wm.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/parser-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/parser-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-registry-core:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-server-configuration:jar</include>
- <include>com.rabbitmq:amqp-client:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.commons:commons-dbcp2:jar</include>
- <include>commons-io:commons-io:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>org.apache.curator:curator-framework:jar</include>
- <include>com.google.code.gson:gson:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.helix:helix-core:jar</include>
- <include>org.apache.airavata:helix-spectator:jar</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
deleted file mode 100644
index 6f397304e1..0000000000
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ /dev/null
@@ -1,159 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${participant.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/participant/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/participant/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- <include>cred_store.jks</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:agent-api:jar</include>
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-registry-core:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-server-configuration:jar</include>
- <include>org.apache.airavata:profile-service-stubs:jar</include>
- <include>com.rabbitmq:amqp-client:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.commons:commons-dbcp2:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- <include>commons-io:commons-io:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>com.google.code.gson:gson:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.helix:helix-core:jar</include>
- <include>org.apache.airavata:helix-spectator:jar</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
- <include>org.apache.airavata:ssh-agent:jar</include>
- <include>com.hierynomus:sshj:jar</include>
- <include>org.apache.airavata:sshj-agent:jar</include>
- <include>org.apache.airavata:task-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
- <include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>io.netty:netty-handler:jar</include>
- <include>org.apache.airavata:services-security:jar</include>
- <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
- <include>org.apache.airavata:airavata-model-utils:jar</include>
-
- <!-- Docker Java dependencies -->
- <include>com.github.docker-java:docker-java:jar</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</include>
- <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</include>
- <include>org.glassfish.jersey.connectors:jersey-apache-connector:jar</include>
- <include>org.glassfish.jersey.core:jersey-common:jar</include>
- <include>jakarta.annotation:jakarta.annotation-api:jar</include>
- <include>org.glassfish.hk2:osgi-resource-locator:jar</include>
- <include>org.glassfish.jersey.core:jersey-client:jar</include>
- <include>org.glassfish.hk2:hk2-api:jar</include>
- <include>org.glassfish.hk2:hk2-utils:jar</include>
- <include>org.glassfish.hk2.external:aopalliance-repackaged:jar</include>
- <include>org.glassfish.hk2:hk2-locator:jar</include>
- <include>org.javassist:javassist:jar</include>
- <include>com.kohlschutter.junixsocket:junixsocket-common:jar</include>
- <include>com.kohlschutter.junixsocket:junixsocket-native-common:jar</include>
- <include>org.apache.commons:commons-compress:jar</include>
- <include>org.slf4j:jcl-over-slf4j:jar</include>
- <include>io.netty:netty-codec-http:jar</include>
- <include>io.netty:netty-codec:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
deleted file mode 100644
index 6a994c6e66..0000000000
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ /dev/null
@@ -1,142 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${post.wm.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/post-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/post-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:agent-api:jar</include>
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-registry-core:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-server-configuration:jar</include>
- <include>com.rabbitmq:amqp-client:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.commons:commons-dbcp2:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- <include>commons-io:commons-io:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>com.google.code.gson:gson:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.helix:helix-core:jar</include>
- <include>org.apache.airavata:helix-spectator:jar</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
- <include>org.apache.airavata:ssh-agent:jar</include>
- <include>com.hierynomus:sshj:jar</include>
- <include>org.apache.airavata:sshj-agent:jar</include>
- <include>org.apache.airavata:task-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:profile-service-stubs:jar</include>
- <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
- <include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>io.netty:netty-handler:jar</include>
- <include>org.apache.airavata:services-security:jar</include>
- <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
- <include>org.json:json:jar</include>
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
- </includes>
- <excludes>
- <exclude>com.mysql:mysql-connector-j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
deleted file mode 100644
index 6e74e7a1fc..0000000000
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ /dev/null
@@ -1,143 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${pre.wm.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/pre-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/pre-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>jakarta.activation:jakarta.activation-api:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:agent-api:jar</include>
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-registry-core:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-server-configuration:jar</include>
- <include>com.rabbitmq:amqp-client:jar</include>
- <include>org.bouncycastle:bcpkix-jdk18on:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.commons:commons-dbcp2:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- <include>commons-io:commons-io:jar</include>
- <include>org.apache.commons:commons-lang3:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>com.google.code.gson:gson:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.helix:helix-core:jar</include>
- <include>org.apache.airavata:helix-spectator:jar</include>
- <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>com.fasterxml.jackson.core:jackson-core:jar</include>
- <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
- <include>org.apache.airavata:ssh-agent:jar</include>
- <include>com.hierynomus:sshj:jar</include>
- <include>org.apache.airavata:sshj-agent:jar</include>
- <include>org.apache.airavata:task-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:profile-service-stubs:jar</include>
- <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
- <include>org.apache.airavata:workflow-impl:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>io.netty:netty-handler:jar</include>
- <include>org.apache.airavata:services-security:jar</include>
- <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
- <include>org.json:json:jar</include>
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
- </includes>
- <excludes>
- <exclude>com.mysql:mysql-connector-j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
deleted file mode 100644
index 4c5927f3a5..0000000000
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ /dev/null
@@ -1,128 +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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${realtime.monitor.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
-
- <fileSet>
- <directory>src/main/resources/realtime-monitor/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/realtime-monitor/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- Create logs directory -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
-
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.airavata:realtime-monitor:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:airavata-base-api:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
-
- <include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
-
- <include>org.yaml:snakeyaml:jar</include>
-
- <!-- kafka specific jars -->
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
-
- <!-- curator and zookeeper jars -->
- <include>org.apache.curator:curator-framework:jar</include>
- <include>org.apache.curator:curator-client:jar</include>
- <include>com.google.guava:guava:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
- <include>org.apache.zookeeper:zookeeper-jute:jar</include>
- <include>io.netty:netty-handler:jar</include>
-
- <include>com.google.code.gson:gson:jar</include>
-
- <!-- logging jars -->
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-api:jar</include>
- <include>org.apache.logging.log4j:log4j-core:jar</include>
- <include>org.apache.logging.log4j:log4j-1.2-api:jar</include>
- <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.commons:commons-pool2:jar</include>
- <include>org.json:json:jar</include>
-
- <include>org.apache.airavata:platform-monitoring:jar</include>
- <include>io.prometheus:simpleclient:jar</include>
- <include>io.prometheus:simpleclient_httpserver:jar</include>
- <include>io.prometheus:simpleclient_common:jar</include>
- <include>org.apache.commons:commons-lang:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/distribution/src/main/resources/api-server/NOTICE b/modules/distribution/src/main/resources/api-server/NOTICE
deleted file mode 100644
index fa7cba5cb8..0000000000
--- a/modules/distribution/src/main/resources/api-server/NOTICE
+++ /dev/null
@@ -1,163 +0,0 @@
-Apache Airavata
-Copyright 2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-Apache Xerces Java Notice:
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
-
-================================================================================
-Apache XmlBeans Notice:
-
- Portions of this software were originally based on the following:
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
- Aside from contributions to the Apache XMLBeans project, this
- software also includes:
-
- - one or more source files from the Apache Xerces-J and Apache Axis
- products, Copyright (c) 1999-2003 Apache Software Foundation
-
- - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
- Consortium (Massachusetts Institute of Technology, European Research
- Consortium for Informatics and Mathematics, Keio University)
-
- - resolver.jar from Apache Xml Commons project,
- Copyright (c) 2001-2003 Apache Software Foundation
-
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
- Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
-
- - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
-
-=========================================================================================
-Apache Axis2 Notice: (axis2-*, mex-1.5.1-impl)
-
-Portions Copyright 2006 International Business Machines Corp.
-Portions Copyright 2005-2007 WSO2, Inc.
-
-This product also includes schemas and specification developed by:
-- the W3C consortium (http://www.w3c.org)
-
-This product also includes WS-* schemas developed by International
-Business Machines Corporation, Microsoft Corporation, BEA Systems,
-TIBCO Software, SAP AG, Sonic Software, and VeriSign
-
-This product also includes a WSDL developed by salesforce.com
-- Copyright 1999-2006 salesforce.com, inc.
-Portions of the included xmlbeans library were originally based on the following:
-- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-====================================================================================
-Apache Derby Notice:
-
-Portions of Derby were originally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
-informally known as the "Derby CLA".
-The following copyright notice(s) were affixed to portions of the code
-with which this file is now or was at one time distributed
-and are placed here unaltered.
-
-(C) Copyright 1997,2004 International Business Machines Corporation. All rights reserved.
-
-(C) Copyright IBM Corp. 2003.
-
-=======================
-
-The portion of the functionTests under 'nist' was originally
-developed by the National Institute of Standards and Technology (NIST),
-an agency of the United States Department of Commerce, and adapted by
-International Business Machines Corporation in accordance with the NIST
-Software Acknowledgment and Redistribution document at
-http://www.itl.nist.gov/div897/ctg/sql_form.htm
-
-========================
-
-The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
-java/stubs/jdbc3) were produced by trimming sources supplied by the
-Apache Harmony project. In addition, the Harmony SerialBlob and
-SerialClob implementations are used. The following notice covers the Harmony sources:
-
-Portions of Harmony were originally developed by
-Intel Corporation and are licensed to the Apache Software
-Foundation under the "Software Grant and Corporate Contribution
-License Agreement", informally known as the "Intel Harmony CLA".
-
-=============================================================================
-Apache Woden Notice:
-
- This product also includes software developed by :
-
- - IBM Corporation (http://www.ibm.com),
- WSDL4J was the initial code contribution for the Apache Woden
- project and some of the WSDL4J design and code has been reused.
- - The W3C Consortium (http://www.w3c.org),
- Common W3C XML Schema and DTD files are packaged with Apache Woden.
-
- Please read the different LICENSE files present in the root directory of
- this distribution.
-
-=========================================================================
-Woodstox Notice:
-
-This product includes software developed by the Woodstox Project
-(http://woodstox.codehaus.org/)
-
-This product currently only contains code developed by authors
-of specific components, as identified by the source code files.
-
-Since product implements StAX API, it has dependencies to StAX API
-classes.
-
-For additional credits (generally to people who reported problems)
-see CREDITS file.
-
-===========================================================================
-Apache xml-commons xml-apis Notice:
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
-
-================================================================================================
-Apache Xalan Notice:
-
-Portions of this software was originally based on the following:
- - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
- - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
- - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
- - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the
- Apache Software Foundation and was originally developed at Hewlett Packard Company.
-================================================================================================
-Apache OpenJPA Notice:
-
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
-OpenJPA includes the persistence and orm schemas from the JPA specifications.
-Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
-OpenJPA elects to include this software in this distribution under the
-CDDL license. You can obtain a copy of the License at:
- https://glassfish.dev.java.net/public/CDDL+GPL.html
-The source code is available at:
- https://glassfish.dev.java.net/source/browse/glassfish/
-
-OpenJPA includes software written by Miroslav Nachev
-OpenJPA uses test code written by Charles Tillman.
-================================================================================================
-Apache XmlSchema Notice:
-
-Portions Copyright 2006 International Business Machines Corp.
-================================================================================================
diff --git a/modules/distribution/src/main/resources/dockerfiles/controller/Dockerfile b/modules/distribution/src/main/resources/dockerfiles/controller/Dockerfile
deleted file mode 100644
index 22cc2d32aa..0000000000
--- a/modules/distribution/src/main/resources/dockerfiles/controller/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-from adoptopenjdk/openjdk11
-
-COPY apache-airavata-controller-0.21-SNAPSHOT-bin.zip /opt/apache-airavata-controller-0.21-SNAPSHOT-bin.zip
\ No newline at end of file
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index e89bdce503..261f1369b8 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -59,28 +59,6 @@
<release>17</release>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
- <executions>
- <execution>
- <id>file-service-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${file.service.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/file-service-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index a8403b1199..7ae26269c6 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -195,7 +195,7 @@
<goal>up</goal>
</goals>
<configuration>
- <composeFile>${project.basedir}/src/main/resources/migrations-util/mysql/docker-compose.yml</composeFile>
+ <composeFile>src/main/resources/migrations-util/mysql/docker-compose.yml</composeFile>
<detachedMode>true</detachedMode>
</configuration>
</execution>
@@ -205,7 +205,7 @@
<goal>down</goal>
</goals>
<configuration>
- <composeFile>${project.basedir}/src/main/resources/migrations-util/mysql/docker-compose.yml</composeFile>
+ <composeFile>src/main/resources/migrations-util/mysql/docker-compose.yml</composeFile>
</configuration>
</execution>
</executions>
diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml
index 33bb0c2874..b37d3a1dcf 100644
--- a/modules/research-framework/research-service/pom.xml
+++ b/modules/research-framework/research-service/pom.xml
@@ -149,27 +149,6 @@
</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-0.01</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>
@@ -177,7 +156,7 @@
<configuration>
<protocVersion>${protobuf-java.version}</protocVersion>
<sourceDirectories>
- <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory>
+ <sourceDirectory>src/main/proto</sourceDirectory>
</sourceDirectories>
<outputDirectory>${project.build.directory}/generated-sources/protobuf/java</outputDirectory>
</configuration>
diff --git a/modules/sharing-registry/pom.xml b/modules/sharing-registry/pom.xml
index c296735e6a..a7899bc2a0 100644
--- a/modules/sharing-registry/pom.xml
+++ b/modules/sharing-registry/pom.xml
@@ -39,6 +39,5 @@
<module>sharing-registry-stubs</module>
<module>sharing-registry-server</module>
<module>sharing-data-migrator</module>
- <module>sharing-registry-distribution</module>
</modules>
</project>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml
deleted file mode 100644
index 87d4eac2ee..0000000000
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
- 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-sharing-registry</artifactId>
- <groupId>org.apache.airavata</groupId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>airavata-sharing-registry-distribution</artifactId>
- <packaging>jar</packaging>
- <name>Sharing Registry Distribution</name>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j2.slf4j.impl}</version>
- </dependency>
- </dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
deleted file mode 100644
index 1e5475d9de..0000000000
--- a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# Get standard environment variables
-# if JAVA_HOME is not set we're not happy
-if [ -z "$JAVA_HOME" ]; then
- echo "You must set the JAVA_HOME variable before running sharing-registry scripts."
- exit 1
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set SHARING_REGISTRY_HOME if not already set
-[ -z "$SHARING_REGISTRY_HOME" ] && SHARING_REGISTRY_HOME=`cd "$PRGDIR/.." ; pwd`
-
-SHARING_REGISTRY_CLASSPATH=""
-
-for f in "$SHARING_REGISTRY_HOME"/lib/*.jar
-do
- SHARING_REGISTRY_CLASSPATH="$SHARING_REGISTRY_CLASSPATH":$f
-done
-
-export SHARING_REGISTRY_HOME
-export SHARING_REGISTRY_CLASSPATH
\ No newline at end of file
diff --git a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
deleted file mode 100644
index 07c76127c1..0000000000
--- a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-. `dirname $0`/setenv.sh
-cd $SHARING_REGISTRY_HOME/bin
-
-IS_DAEMON_MODE=false
-SHARING_REGISTRY_COMMAND=""
-STOP=false
-FORCE=false
-JAVA_OPTS=""
-
-for var in "$@"
-do
- case $var in
- -xdebug)
- AIRAVATA_COMMAND="${AIRAVATA_COMMAND}"
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
- shift
- ;;
- start)
- IS_DAEMON_MODE=true
- shift
- ;;
- stop)
- STOP=true
- SHARING_REGISTRY_COMMAND="$
- SHARING_REGISTRY_COMMAND $var"
- shift
- ;;
- -h)
- echo "Usage: sharing-registry.sh [command-options]"
- echo "command options:"
- echo " start Start server in daemon mode"
- echo " stop Stop server."
- echo " -xdebug Start Sharing Registry Server under JPDA debugger"
- echo " -h Display this help and exit"
- shift
- exit 0
- ;;
- *)
- SHARING_REGISTRY_COMMAND="$SHARING_REGISTRY_COMMAND $var"
- shift
- esac
-done
-
-if $STOP;
-then
- for f in `find . -name "server_start_*"`; do
- IFS='_' read -a f_split <<< "$f"
- echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[2]}..."
- out=`kill -9 ${f_split[2]} 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- echo -n " Removing process file..."
- out=`rm $f 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- done
-else
- if $IS_DAEMON_MODE ; then
- echo "Starting Sharing Registry Server in daemon mode..."
- $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath "$SHARING_REGISTRY_CLASSPATH" org.apache.airavata.sharing.registry.server.ServerMain $* > /dev/null 2>&1 &
- else
- $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath "$SHARING_REGISTRY_CLASSPATH" org.apache.airavata.sharing.registry.server.ServerMain $*
- fi
-fi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index accc575b35..c29886fb64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,6 +370,11 @@
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -441,6 +446,11 @@
<artifactId>json</artifactId>
<version>${json.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.helix</groupId>
+ <artifactId>helix-core</artifactId>
+ <version>${helix.version}</version>
+ </dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
@@ -925,10 +935,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
+ <outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/main/assembly/dist</directory>
+ <directory>src/main/assembly/dist</directory>
<filtering>true</filtering>
</resource>
</resources>
diff --git a/tools/load-client/src/main/assembly/load-client-bin-assembly.xml b/tools/load-client/src/main/assembly/load-client-bin-assembly.xml
index 964fafa6ef..2a183087d2 100644
--- a/tools/load-client/src/main/assembly/load-client-bin-assembly.xml
+++ b/tools/load-client/src/main/assembly/load-client-bin-assembly.xml
@@ -1,5 +1,4 @@
<!--
-
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
@@ -16,25 +15,11 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>load-client</baseDirectory>
@@ -45,38 +30,36 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/bin</directory>
+ <directory>${project.basedir}/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <fileMode>0755</fileMode>
<includes>
- <include>load-client.sh</include>
- <include>setenv.sh</include>
+ <include>*.sh</include>
</includes>
</fileSet>
<fileSet>
- <directory>../../keystores</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
+ <directory>${project.basedir}/src/main/resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
<includes>
- <include>client_truststore.jks</include>
+ <include>load-config.yml</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
+ <directory>${project.basedir}/../../keystores</directory>
+ <outputDirectory>bin</outputDirectory>
<includes>
- <include>load-config.yml</include>
+ <include>client_truststore.jks</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
</dependencySets>
+
</assembly>
(airavata) 02/09: regenerated thrift stubs with version 0.21.0 and fix issues
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6849228a90a7b92d57c1b596ed41f6f883d6a624
Author: yasith <ya...@gatech.edu>
AuthorDate: Thu Mar 20 20:07:35 2025 +0000
regenerated thrift stubs with version 0.21.0 and fix issues
---
.../java/org/apache/airavata/api/Airavata.java | 3876 +++++++++++++-----
.../apache/airavata/api/airavata_apiConstants.java | 2 +-
.../java/org/apache/airavata/base/api/BaseAPI.java | 36 +-
.../org/apache/airavata/model/ComponentState.java | 4 +-
.../org/apache/airavata/model/ComponentStatus.java | 4 +-
.../java/org/apache/airavata/model/EdgeModel.java | 4 +-
.../java/org/apache/airavata/model/NodeModel.java | 4 +-
.../java/org/apache/airavata/model/PortModel.java | 4 +-
.../org/apache/airavata/model/WorkflowModel.java | 4 +-
.../org/apache/airavata/model/WorkflowState.java | 4 +-
.../org/apache/airavata/model/WorkflowStatus.java | 4 +-
.../accountprovisioning/SSHAccountProvisioner.java | 4 +-
.../SSHAccountProvisionerConfigParam.java | 4 +-
.../SSHAccountProvisionerConfigParamType.java | 4 +-
.../ApplicationDeploymentDescription.java | 4 +-
.../appdeployment/ApplicationModule.java | 4 +-
.../appcatalog/appdeployment/CommandObject.java | 4 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 4 +-
.../application_deployment_modelConstants.java | 60 -
.../ApplicationInterfaceDescription.java | 4 +-
.../application_interface_modelConstants.java | 60 -
.../appcatalog/computeresource/BatchQueue.java | 4 +-
.../computeresource/CloudJobSubmission.java | 4 +-
.../ComputeResourceDescription.java | 4 +-
.../model/appcatalog/computeresource/DMType.java | 4 +-
.../appcatalog/computeresource/FileSystems.java | 4 +-
.../computeresource/GlobusJobSubmission.java | 4 +-
.../computeresource/JobManagerCommand.java | 4 +-
.../computeresource/JobSubmissionInterface.java | 4 +-
.../computeresource/JobSubmissionProtocol.java | 4 +-
.../computeresource/LOCALSubmission.java | 4 +-
.../appcatalog/computeresource/MonitorMode.java | 4 +-
.../appcatalog/computeresource/ProviderName.java | 4 +-
.../computeresource/ResourceJobManager.java | 4 +-
.../computeresource/ResourceJobManagerType.java | 4 +-
.../computeresource/SSHJobSubmission.java | 4 +-
.../computeresource/UnicoreJobSubmission.java | 4 +-
.../compute_resource_modelConstants.java | 60 -
.../appcatalog/gatewaygroups/GatewayGroups.java | 4 +-
.../gatewayprofile/ComputeResourcePreference.java | 4 +-
.../gatewayprofile/DataStoragePreference.java | 730 ----
.../gatewayprofile/GatewayResourceProfile.java | 4 +-
.../gatewayprofile/StoragePreference.java | 4 +-
.../BatchQueueResourcePolicy.java | 4 +-
.../ComputeResourcePolicy.java | 4 +-
.../ComputeResourceReservation.java | 4 +-
.../GroupAccountSSHProvisionerConfig.java | 4 +-
.../GroupComputeResourcePreference.java | 4 +-
.../groupresourceprofile/GroupResourceProfile.java | 4 +-
.../airavata/model/appcatalog/parser/IOType.java | 4 +-
.../airavata/model/appcatalog/parser/Parser.java | 4 +-
.../model/appcatalog/parser/ParserConnector.java | 4 +-
.../appcatalog/parser/ParserConnectorInput.java | 4 +-
.../appcatalog/parser/ParserDagInputMapping.java | 789 ----
.../model/appcatalog/parser/ParserInput.java | 4 +-
.../model/appcatalog/parser/ParserOutput.java | 4 +-
.../model/appcatalog/parser/ParsingTemplate.java | 4 +-
.../appcatalog/parser/ParsingTemplateInput.java | 4 +-
.../StorageResourceDescription.java | 4 +-
.../UserComputeResourcePreference.java | 4 +-
.../userresourceprofile/UserResourceProfile.java | 4 +-
.../userresourceprofile/UserStoragePreference.java | 4 +-
.../airavata/model/application/io/DataType.java | 4 +-
.../model/application/io/InputDataObjectType.java | 4 +-
.../model/application/io/OutputDataObjectType.java | 4 +-
.../apache/airavata/model/commons/ErrorModel.java | 4 +-
.../airavata/model/commons/ValidationResults.java | 4 +-
.../airavata/model/commons/ValidatorResult.java | 4 +-
.../model/commons/airavata_commonsConstants.java | 2 +-
.../credential/store/CertificateCredential.java | 4 +-
.../model/credential/store/CommunityUser.java | 4 +-
.../credential/store/CredentialOwnerType.java | 62 -
.../model/credential/store/CredentialSummary.java | 4 +-
.../model/credential/store/PasswordCredential.java | 4 +-
.../model/credential/store/SSHCredential.java | 4 +-
.../credential/store/SSHCredentialSummary.java | 929 -----
.../model/credential/store/SummaryType.java | 4 +-
....java => credential_store_modelsConstants.java} | 4 +-
.../airavata/model/data/movement/DMType.java | 4 +-
.../model/data/movement/DataMovementInterface.java | 4 +-
.../model/data/movement/DataMovementProtocol.java | 4 +-
.../model/data/movement/GridFTPDataMovement.java | 4 +-
.../model/data/movement/LOCALDataMovement.java | 4 +-
.../model/data/movement/SCPDataMovement.java | 4 +-
.../model/data/movement/SecurityProtocol.java | 4 +-
.../model/data/movement/UnicoreDataMovement.java | 4 +-
.../model/data/replica/DataProductModel.java | 4 +-
.../model/data/replica/DataProductType.java | 4 +-
.../data/replica/DataReplicaLocationModel.java | 4 +-
.../data/replica/ReplicaLocationCategory.java | 4 +-
.../model/data/replica/ReplicaPersistentType.java | 4 +-
.../apache/airavata/model/dbevent/CrudType.java | 4 +-
.../airavata/model/dbevent/DBEventMessage.java | 4 +-
.../model/dbevent/DBEventMessageContext.java | 4 +-
.../airavata/model/dbevent/DBEventPublisher.java | 4 +-
.../model/dbevent/DBEventPublisherContext.java | 4 +-
.../airavata/model/dbevent/DBEventSubscriber.java | 4 +-
.../apache/airavata/model/dbevent/DBEventType.java | 4 +-
.../apache/airavata/model/dbevent/EntityType.java | 4 +-
.../model/error/AiravataClientException.java | 4 +-
.../airavata/model/error/AiravataErrorType.java | 4 +-
.../model/error/AiravataSystemException.java | 4 +-
.../model/error/AuthenticationException.java | 4 +-
.../model/error/AuthorizationException.java | 4 +-
.../model/error/DuplicateEntryException.java | 4 +-
.../model/error/ExperimentNotFoundException.java | 4 +-
.../model/error/InvalidRequestException.java | 4 +-
.../model/error/LaunchValidationException.java | 4 +-
.../model/error/ProjectNotFoundException.java | 4 +-
.../airavata/model/error/TimedOutException.java | 4 +-
.../airavata/model/error/ValidationResults.java | 4 +-
.../airavata/model/error/ValidatorResult.java | 4 +-
.../airavata/model/experiment/ExperimentModel.java | 4 +-
.../model/experiment/ExperimentSearchFields.java | 4 +-
.../model/experiment/ExperimentStatistics.java | 4 +-
.../model/experiment/ExperimentSummaryModel.java | 4 +-
.../airavata/model/experiment/ExperimentType.java | 4 +-
.../model/experiment/ProjectSearchFields.java | 4 +-
.../experiment/UserConfigurationDataModel.java | 4 +-
.../apache/airavata/model/group/GroupModel.java | 4 +-
.../model/group/ResourcePermissionType.java | 4 +-
.../apache/airavata/model/group/ResourceType.java | 4 +-
.../org/apache/airavata/model/job/JobModel.java | 4 +-
.../event/ExperimentIntermediateOutputsEvent.java | 4 +-
.../event/ExperimentStatusChangeEvent.java | 4 +-
.../messaging/event/ExperimentSubmitEvent.java | 4 +-
.../model/messaging/event/JobIdentifier.java | 4 +-
.../messaging/event/JobStatusChangeEvent.java | 4 +-
.../event/JobStatusChangeRequestEvent.java | 4 +-
.../airavata/model/messaging/event/Message.java | 4 +-
.../model/messaging/event/MessageLevel.java | 4 +-
.../model/messaging/event/MessageType.java | 4 +-
.../model/messaging/event/ProcessIdentifier.java | 4 +-
.../messaging/event/ProcessStatusChangeEvent.java | 4 +-
.../event/ProcessStatusChangeRequestEvent.java | 4 +-
.../model/messaging/event/ProcessSubmitEvent.java | 4 +-
.../messaging/event/ProcessTerminateEvent.java | 4 +-
.../model/messaging/event/TaskIdentifier.java | 4 +-
.../messaging/event/TaskOutputChangeEvent.java | 4 +-
.../messaging/event/TaskStatusChangeEvent.java | 4 +-
.../event/TaskStatusChangeRequestEvent.java | 4 +-
.../model/messaging/event/TaskSubmitEvent.java | 711 ----
.../model/messaging/event/TaskTerminateEvent.java | 711 ----
.../messaging/event/messaging_eventsConstants.java | 60 -
.../parallelism/ApplicationParallelismType.java | 4 +-
.../airavata/model/process/ProcessModel.java | 4 +-
.../airavata/model/process/ProcessWorkflow.java | 4 +-
.../ComputationalResourceSchedulingModel.java | 4 +-
.../apache/airavata/model/security/AuthzToken.java | 4 +-
.../airavata/model/status/ExperimentState.java | 4 +-
.../airavata/model/status/ExperimentStatus.java | 4 +-
.../org/apache/airavata/model/status/JobState.java | 4 +-
.../apache/airavata/model/status/JobStatus.java | 4 +-
.../apache/airavata/model/status/ProcessState.java | 4 +-
.../airavata/model/status/ProcessStatus.java | 4 +-
.../airavata/model/status/QueueStatusModel.java | 4 +-
.../apache/airavata/model/status/TaskState.java | 4 +-
.../apache/airavata/model/status/TaskStatus.java | 4 +-
.../apache/airavata/model/task/DataStageType.java | 4 +-
.../airavata/model/task/DataStagingTaskModel.java | 4 +-
.../model/task/EnvironmentSetupTaskModel.java | 4 +-
.../model/task/JobSubmissionTaskModel.java | 4 +-
.../airavata/model/task/MonitorTaskModel.java | 4 +-
.../org/apache/airavata/model/task/TaskModel.java | 4 +-
.../org/apache/airavata/model/task/TaskTypes.java | 4 +-
.../org/apache/airavata/model/tenant/Tenant.java | 4 +-
.../model/tenant/TenantApprovalStatus.java | 4 +-
.../apache/airavata/model/tenant/TenantConfig.java | 4 +-
.../airavata/model/tenant/TenantPreferences.java | 4 +-
.../airavata/model/user/CustomDashboard.java | 4 +-
.../airavata/model/user/NSFDemographics.java | 4 +-
.../org/apache/airavata/model/user/Status.java | 4 +-
.../apache/airavata/model/user/USCitizenship.java | 4 +-
.../apache/airavata/model/user/UserProfile.java | 4 +-
.../org/apache/airavata/model/user/disability.java | 4 +-
.../org/apache/airavata/model/user/ethnicity.java | 4 +-
.../java/org/apache/airavata/model/user/race.java | 4 +-
.../model/user/user_profile_modelConstants.java | 2 +-
.../airavata/model/workflow/AiravataWorkflow.java | 4 +-
.../airavata/model/workflow/ApplicationState.java | 4 +-
.../airavata/model/workflow/ApplicationStatus.java | 4 +-
.../airavata/model/workflow/ComponentType.java | 4 +-
.../apache/airavata/model/workflow/DataBlock.java | 4 +-
.../airavata/model/workflow/HandlerState.java | 4 +-
.../airavata/model/workflow/HandlerStatus.java | 4 +-
.../airavata/model/workflow/HandlerType.java | 4 +-
.../airavata/model/workflow/NotificationEmail.java | 380 --
.../model/workflow/WorkflowApplication.java | 4 +-
.../model/workflow/WorkflowConnection.java | 4 +-
.../airavata/model/workflow/WorkflowHandler.java | 4 +-
.../airavata/model/workflow/WorkflowState.java | 4 +-
.../airavata/model/workflow/WorkflowStatus.java | 4 +-
.../model/workflow_data_modelConstants.java | 60 -
.../apache/airavata/model/workspace/Gateway.java | 4 +-
.../model/workspace/GatewayApprovalStatus.java | 4 +-
.../workspace/GatewayUsageReportingCommand.java | 4 +-
.../org/apache/airavata/model/workspace/Group.java | 4 +-
.../airavata/model/workspace/Notification.java | 4 +-
.../model/workspace/NotificationPriority.java | 4 +-
.../apache/airavata/model/workspace/Project.java | 4 +-
.../org/apache/airavata/model/workspace/User.java | 4 +-
.../groupmanager/cpi/GroupManagerService.java | 276 +-
.../exception/GroupManagerServiceException.java | 4 +-
.../cpi/group_manager_cpiConstants.java | 2 +-
.../iam/admin/services/cpi/IamAdminServices.java | 316 +-
.../cpi/exception/IamAdminServicesException.java | 4 +-
.../cpi/iam_admin_services_cpiConstants.java | 2 +-
.../profile/tenant/cpi/TenantProfileService.java | 156 +-
.../exception/TenantProfileServiceException.java | 4 +-
.../tenant/cpi/profile_tenant_cpiConstants.java | 2 +-
.../profile/user/cpi/UserProfileService.java | 157 +-
.../cpi/exception/UserProfileServiceException.java | 4 +-
.../user/cpi/profile_user_cpiConstants.java | 2 +-
.../airavata/helix/impl/task/AiravataTask.java | 2 +-
.../org/apache/airavata/common/utils/JPAUtils.java | 2 +-
.../store/credential/CredentialOwnerType.java | 23 +-
.../store/cpi/CredentialStoreService.java | 276 +-
.../store/cpi/credential_store_cpiConstants.java | 2 +-
.../store/exception/CredentialStoreException.java | 4 +-
.../airavata/monitor/email/EmailBasedMonitor.java | 4 +-
.../core/impl/RabbitMQStatusSubscriber.java | 2 +-
.../messaging/core/impl/StatusConsumer.java | 24 +-
.../orchestrator/cpi/OrchestratorService.java | 116 +-
.../cpi/orchestrator_cpiConstants.java | 2 +-
.../ApplicationDeploymentRepository.java | 4 +-
.../appcatalog/ApplicationInterfaceRepository.java | 6 +-
.../appcatalog/ComputeResourceRepository.java | 4 +-
.../ApplicationDeploymentRepositoryTest.java | 6 +-
.../airavata/registry/api/RegistryService.java | 4216 +++++++++++++++-----
.../api/exception/RegistryServiceException.java | 4 +-
.../registry/api/registry_apiConstants.java | 2 +-
.../airavata/sharing/registry/models/Domain.java | 4 +-
.../registry/models/DuplicateEntryException.java | 4 +-
.../airavata/sharing/registry/models/Entity.java | 4 +-
.../sharing/registry/models/EntitySearchField.java | 4 +-
.../sharing/registry/models/EntityType.java | 4 +-
.../sharing/registry/models/GroupAdmin.java | 4 +-
.../sharing/registry/models/GroupCardinality.java | 4 +-
.../sharing/registry/models/GroupChildType.java | 4 +-
.../sharing/registry/models/GroupMembership.java | 4 +-
.../sharing/registry/models/GroupType.java | 4 +-
.../sharing/registry/models/PermissionType.java | 4 +-
.../sharing/registry/models/SearchCondition.java | 4 +-
.../sharing/registry/models/SearchCriteria.java | 4 +-
.../airavata/sharing/registry/models/Sharing.java | 4 +-
.../registry/models/SharingRegistryException.java | 4 +-
.../sharing/registry/models/SharingType.java | 4 +-
.../airavata/sharing/registry/models/User.java | 4 +-
.../sharing/registry/models/UserGroup.java | 4 +-
.../registry/models/sharing_modelsConstants.java | 2 +-
.../service/cpi/SharingRegistryService.java | 1156 ++++--
.../registry/service/cpi/sharing_cpiConstants.java | 2 +-
.../airavata-apis/airavata_api.thrift | 6 +-
.../component-cpis/credential-store-cpi.thrift | 24 +-
.../data-models/airavata_data_models.thrift | 19 +-
...odels.thrift => credential_store_models.thrift} | 0
.../experiment_catalog_models.thrift | 23 +
.../experiment_model.thrift | 4 +-
.../user_tenant_group_models.thrift | 24 +
.../workflow-models/workflow_data_model.thrift | 3 +-
.../workflow_model.thrift} | 0
.../generate-thrift-stubs.sh | 41 +-
.../iam-admin-services-cpi.thrift | 2 +-
263 files changed, 8440 insertions(+), 7832 deletions(-)
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 7b972f1294..54ad5ded87 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -16,14 +16,14 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.18.1)
+ * Autogenerated by Thrift Compiler (0.21.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.airavata.api;
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.18.1)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)")
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
public class Airavata {
@@ -18558,14 +18558,14 @@ public class Airavata {
public static class Processor<I extends Iface> extends org.apache.airavata.base.api.BaseAPI.Processor<I> implements org.apache.thrift.TProcessor {
private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
public Processor(I iface) {
- super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+ super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>>()));
}
- protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+ protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
super(iface, getProcessMap(processMap));
}
- private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+ private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>> processMap) {
processMap.put("isUserExists", new isUserExists());
processMap.put("addGateway", new addGateway());
processMap.put("getAllUsersInGateway", new getAllUsersInGateway());
@@ -18762,7 +18762,7 @@ public class Airavata {
return processMap;
}
- public static class isUserExists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isUserExists_args> {
+ public static class isUserExists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isUserExists_args, isUserExists_result> {
public isUserExists() {
super("isUserExists");
}
@@ -18773,7 +18773,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -18782,9 +18782,14 @@ public class Airavata {
return false;
}
+ @Override
+ public isUserExists_result getEmptyResultInstance() {
+ return new isUserExists_result();
+ }
+
@Override
public isUserExists_result getResult(I iface, isUserExists_args args) throws org.apache.thrift.TException {
- isUserExists_result result = new isUserExists_result();
+ isUserExists_result result = getEmptyResultInstance();
try {
result.success = iface.isUserExists(args.authzToken, args.gatewayId, args.userName);
result.setSuccessIsSet(true);
@@ -18801,7 +18806,7 @@ public class Airavata {
}
}
- public static class addGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGateway_args> {
+ public static class addGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGateway_args, addGateway_result> {
public addGateway() {
super("addGateway");
}
@@ -18812,7 +18817,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -18821,9 +18826,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addGateway_result getEmptyResultInstance() {
+ return new addGateway_result();
+ }
+
@Override
public addGateway_result getResult(I iface, addGateway_args args) throws org.apache.thrift.TException {
- addGateway_result result = new addGateway_result();
+ addGateway_result result = getEmptyResultInstance();
try {
result.success = iface.addGateway(args.authzToken, args.gateway);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -18839,7 +18849,7 @@ public class Airavata {
}
}
- public static class getAllUsersInGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUsersInGateway_args> {
+ public static class getAllUsersInGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUsersInGateway_args, getAllUsersInGateway_result> {
public getAllUsersInGateway() {
super("getAllUsersInGateway");
}
@@ -18850,7 +18860,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -18859,9 +18869,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllUsersInGateway_result getEmptyResultInstance() {
+ return new getAllUsersInGateway_result();
+ }
+
@Override
public getAllUsersInGateway_result getResult(I iface, getAllUsersInGateway_args args) throws org.apache.thrift.TException {
- getAllUsersInGateway_result result = new getAllUsersInGateway_result();
+ getAllUsersInGateway_result result = getEmptyResultInstance();
try {
result.success = iface.getAllUsersInGateway(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -18877,7 +18892,7 @@ public class Airavata {
}
}
- public static class updateGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGateway_args> {
+ public static class updateGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGateway_args, updateGateway_result> {
public updateGateway() {
super("updateGateway");
}
@@ -18888,7 +18903,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -18897,9 +18912,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateGateway_result getEmptyResultInstance() {
+ return new updateGateway_result();
+ }
+
@Override
public updateGateway_result getResult(I iface, updateGateway_args args) throws org.apache.thrift.TException {
- updateGateway_result result = new updateGateway_result();
+ updateGateway_result result = getEmptyResultInstance();
try {
result.success = iface.updateGateway(args.authzToken, args.gatewayId, args.updatedGateway);
result.setSuccessIsSet(true);
@@ -18916,7 +18936,7 @@ public class Airavata {
}
}
- public static class getGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGateway_args> {
+ public static class getGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGateway_args, getGateway_result> {
public getGateway() {
super("getGateway");
}
@@ -18927,7 +18947,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -18936,9 +18956,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGateway_result getEmptyResultInstance() {
+ return new getGateway_result();
+ }
+
@Override
public getGateway_result getResult(I iface, getGateway_args args) throws org.apache.thrift.TException {
- getGateway_result result = new getGateway_result();
+ getGateway_result result = getEmptyResultInstance();
try {
result.success = iface.getGateway(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -18954,7 +18979,7 @@ public class Airavata {
}
}
- public static class deleteGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGateway_args> {
+ public static class deleteGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGateway_args, deleteGateway_result> {
public deleteGateway() {
super("deleteGateway");
}
@@ -18965,7 +18990,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -18974,9 +18999,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteGateway_result getEmptyResultInstance() {
+ return new deleteGateway_result();
+ }
+
@Override
public deleteGateway_result getResult(I iface, deleteGateway_args args) throws org.apache.thrift.TException {
- deleteGateway_result result = new deleteGateway_result();
+ deleteGateway_result result = getEmptyResultInstance();
try {
result.success = iface.deleteGateway(args.authzToken, args.gatewayId);
result.setSuccessIsSet(true);
@@ -18993,7 +19023,7 @@ public class Airavata {
}
}
- public static class getAllGateways<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGateways_args> {
+ public static class getAllGateways<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGateways_args, getAllGateways_result> {
public getAllGateways() {
super("getAllGateways");
}
@@ -19004,7 +19034,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19013,9 +19043,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllGateways_result getEmptyResultInstance() {
+ return new getAllGateways_result();
+ }
+
@Override
public getAllGateways_result getResult(I iface, getAllGateways_args args) throws org.apache.thrift.TException {
- getAllGateways_result result = new getAllGateways_result();
+ getAllGateways_result result = getEmptyResultInstance();
try {
result.success = iface.getAllGateways(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19031,7 +19066,7 @@ public class Airavata {
}
}
- public static class isGatewayExist<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isGatewayExist_args> {
+ public static class isGatewayExist<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isGatewayExist_args, isGatewayExist_result> {
public isGatewayExist() {
super("isGatewayExist");
}
@@ -19042,7 +19077,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19051,9 +19086,14 @@ public class Airavata {
return false;
}
+ @Override
+ public isGatewayExist_result getEmptyResultInstance() {
+ return new isGatewayExist_result();
+ }
+
@Override
public isGatewayExist_result getResult(I iface, isGatewayExist_args args) throws org.apache.thrift.TException {
- isGatewayExist_result result = new isGatewayExist_result();
+ isGatewayExist_result result = getEmptyResultInstance();
try {
result.success = iface.isGatewayExist(args.authzToken, args.gatewayId);
result.setSuccessIsSet(true);
@@ -19070,7 +19110,7 @@ public class Airavata {
}
}
- public static class createNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createNotification_args> {
+ public static class createNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createNotification_args, createNotification_result> {
public createNotification() {
super("createNotification");
}
@@ -19081,7 +19121,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19090,9 +19130,14 @@ public class Airavata {
return false;
}
+ @Override
+ public createNotification_result getEmptyResultInstance() {
+ return new createNotification_result();
+ }
+
@Override
public createNotification_result getResult(I iface, createNotification_args args) throws org.apache.thrift.TException {
- createNotification_result result = new createNotification_result();
+ createNotification_result result = getEmptyResultInstance();
try {
result.success = iface.createNotification(args.authzToken, args.notification);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19108,7 +19153,7 @@ public class Airavata {
}
}
- public static class updateNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateNotification_args> {
+ public static class updateNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateNotification_args, updateNotification_result> {
public updateNotification() {
super("updateNotification");
}
@@ -19119,7 +19164,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19128,9 +19173,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateNotification_result getEmptyResultInstance() {
+ return new updateNotification_result();
+ }
+
@Override
public updateNotification_result getResult(I iface, updateNotification_args args) throws org.apache.thrift.TException {
- updateNotification_result result = new updateNotification_result();
+ updateNotification_result result = getEmptyResultInstance();
try {
result.success = iface.updateNotification(args.authzToken, args.notification);
result.setSuccessIsSet(true);
@@ -19147,7 +19197,7 @@ public class Airavata {
}
}
- public static class deleteNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteNotification_args> {
+ public static class deleteNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteNotification_args, deleteNotification_result> {
public deleteNotification() {
super("deleteNotification");
}
@@ -19158,7 +19208,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19167,9 +19217,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteNotification_result getEmptyResultInstance() {
+ return new deleteNotification_result();
+ }
+
@Override
public deleteNotification_result getResult(I iface, deleteNotification_args args) throws org.apache.thrift.TException {
- deleteNotification_result result = new deleteNotification_result();
+ deleteNotification_result result = getEmptyResultInstance();
try {
result.success = iface.deleteNotification(args.authzToken, args.gatewayId, args.notificationId);
result.setSuccessIsSet(true);
@@ -19186,7 +19241,7 @@ public class Airavata {
}
}
- public static class getNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNotification_args> {
+ public static class getNotification<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNotification_args, getNotification_result> {
public getNotification() {
super("getNotification");
}
@@ -19197,7 +19252,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19206,9 +19261,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getNotification_result getEmptyResultInstance() {
+ return new getNotification_result();
+ }
+
@Override
public getNotification_result getResult(I iface, getNotification_args args) throws org.apache.thrift.TException {
- getNotification_result result = new getNotification_result();
+ getNotification_result result = getEmptyResultInstance();
try {
result.success = iface.getNotification(args.authzToken, args.gatewayId, args.notificationId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19224,7 +19284,7 @@ public class Airavata {
}
}
- public static class getAllNotifications<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllNotifications_args> {
+ public static class getAllNotifications<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllNotifications_args, getAllNotifications_result> {
public getAllNotifications() {
super("getAllNotifications");
}
@@ -19235,7 +19295,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19244,9 +19304,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllNotifications_result getEmptyResultInstance() {
+ return new getAllNotifications_result();
+ }
+
@Override
public getAllNotifications_result getResult(I iface, getAllNotifications_args args) throws org.apache.thrift.TException {
- getAllNotifications_result result = new getAllNotifications_result();
+ getAllNotifications_result result = getEmptyResultInstance();
try {
result.success = iface.getAllNotifications(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19262,7 +19327,7 @@ public class Airavata {
}
}
- public static class generateAndRegisterSSHKeys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, generateAndRegisterSSHKeys_args> {
+ public static class generateAndRegisterSSHKeys<I extends Iface> extends org.apache.thrift.ProcessFunction<I, generateAndRegisterSSHKeys_args, generateAndRegisterSSHKeys_result> {
public generateAndRegisterSSHKeys() {
super("generateAndRegisterSSHKeys");
}
@@ -19273,7 +19338,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19282,9 +19347,14 @@ public class Airavata {
return false;
}
+ @Override
+ public generateAndRegisterSSHKeys_result getEmptyResultInstance() {
+ return new generateAndRegisterSSHKeys_result();
+ }
+
@Override
public generateAndRegisterSSHKeys_result getResult(I iface, generateAndRegisterSSHKeys_args args) throws org.apache.thrift.TException {
- generateAndRegisterSSHKeys_result result = new generateAndRegisterSSHKeys_result();
+ generateAndRegisterSSHKeys_result result = getEmptyResultInstance();
try {
result.success = iface.generateAndRegisterSSHKeys(args.authzToken, args.description);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19298,7 +19368,7 @@ public class Airavata {
}
}
- public static class registerPwdCredential<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerPwdCredential_args> {
+ public static class registerPwdCredential<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerPwdCredential_args, registerPwdCredential_result> {
public registerPwdCredential() {
super("registerPwdCredential");
}
@@ -19309,7 +19379,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19318,9 +19388,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerPwdCredential_result getEmptyResultInstance() {
+ return new registerPwdCredential_result();
+ }
+
@Override
public registerPwdCredential_result getResult(I iface, registerPwdCredential_args args) throws org.apache.thrift.TException {
- registerPwdCredential_result result = new registerPwdCredential_result();
+ registerPwdCredential_result result = getEmptyResultInstance();
try {
result.success = iface.registerPwdCredential(args.authzToken, args.loginUserName, args.password, args.description);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19334,7 +19409,7 @@ public class Airavata {
}
}
- public static class getCredentialSummary<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCredentialSummary_args> {
+ public static class getCredentialSummary<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCredentialSummary_args, getCredentialSummary_result> {
public getCredentialSummary() {
super("getCredentialSummary");
}
@@ -19345,7 +19420,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19354,9 +19429,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getCredentialSummary_result getEmptyResultInstance() {
+ return new getCredentialSummary_result();
+ }
+
@Override
public getCredentialSummary_result getResult(I iface, getCredentialSummary_args args) throws org.apache.thrift.TException {
- getCredentialSummary_result result = new getCredentialSummary_result();
+ getCredentialSummary_result result = getEmptyResultInstance();
try {
result.success = iface.getCredentialSummary(args.authzToken, args.tokenId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19372,7 +19452,7 @@ public class Airavata {
}
}
- public static class getAllCredentialSummaries<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllCredentialSummaries_args> {
+ public static class getAllCredentialSummaries<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllCredentialSummaries_args, getAllCredentialSummaries_result> {
public getAllCredentialSummaries() {
super("getAllCredentialSummaries");
}
@@ -19383,7 +19463,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19392,9 +19472,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllCredentialSummaries_result getEmptyResultInstance() {
+ return new getAllCredentialSummaries_result();
+ }
+
@Override
public getAllCredentialSummaries_result getResult(I iface, getAllCredentialSummaries_args args) throws org.apache.thrift.TException {
- getAllCredentialSummaries_result result = new getAllCredentialSummaries_result();
+ getAllCredentialSummaries_result result = getEmptyResultInstance();
try {
result.success = iface.getAllCredentialSummaries(args.authzToken, args.type);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19408,7 +19493,7 @@ public class Airavata {
}
}
- public static class deleteSSHPubKey<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteSSHPubKey_args> {
+ public static class deleteSSHPubKey<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteSSHPubKey_args, deleteSSHPubKey_result> {
public deleteSSHPubKey() {
super("deleteSSHPubKey");
}
@@ -19419,7 +19504,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19428,9 +19513,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteSSHPubKey_result getEmptyResultInstance() {
+ return new deleteSSHPubKey_result();
+ }
+
@Override
public deleteSSHPubKey_result getResult(I iface, deleteSSHPubKey_args args) throws org.apache.thrift.TException {
- deleteSSHPubKey_result result = new deleteSSHPubKey_result();
+ deleteSSHPubKey_result result = getEmptyResultInstance();
try {
result.success = iface.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken);
result.setSuccessIsSet(true);
@@ -19447,7 +19537,7 @@ public class Airavata {
}
}
- public static class deletePWDCredential<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deletePWDCredential_args> {
+ public static class deletePWDCredential<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deletePWDCredential_args, deletePWDCredential_result> {
public deletePWDCredential() {
super("deletePWDCredential");
}
@@ -19458,7 +19548,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19467,9 +19557,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deletePWDCredential_result getEmptyResultInstance() {
+ return new deletePWDCredential_result();
+ }
+
@Override
public deletePWDCredential_result getResult(I iface, deletePWDCredential_args args) throws org.apache.thrift.TException {
- deletePWDCredential_result result = new deletePWDCredential_result();
+ deletePWDCredential_result result = getEmptyResultInstance();
try {
result.success = iface.deletePWDCredential(args.authzToken, args.airavataCredStoreToken);
result.setSuccessIsSet(true);
@@ -19486,7 +19581,7 @@ public class Airavata {
}
}
- public static class createProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createProject_args> {
+ public static class createProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createProject_args, createProject_result> {
public createProject() {
super("createProject");
}
@@ -19497,7 +19592,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19506,9 +19601,14 @@ public class Airavata {
return false;
}
+ @Override
+ public createProject_result getEmptyResultInstance() {
+ return new createProject_result();
+ }
+
@Override
public createProject_result getResult(I iface, createProject_args args) throws org.apache.thrift.TException {
- createProject_result result = new createProject_result();
+ createProject_result result = getEmptyResultInstance();
try {
result.success = iface.createProject(args.authzToken, args.gatewayId, args.project);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19524,7 +19624,7 @@ public class Airavata {
}
}
- public static class updateProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateProject_args> {
+ public static class updateProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateProject_args, updateProject_result> {
public updateProject() {
super("updateProject");
}
@@ -19535,7 +19635,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19544,9 +19644,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateProject_result getEmptyResultInstance() {
+ return new updateProject_result();
+ }
+
@Override
public updateProject_result getResult(I iface, updateProject_args args) throws org.apache.thrift.TException {
- updateProject_result result = new updateProject_result();
+ updateProject_result result = getEmptyResultInstance();
try {
iface.updateProject(args.authzToken, args.projectId, args.updatedProject);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19564,7 +19669,7 @@ public class Airavata {
}
}
- public static class getProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getProject_args> {
+ public static class getProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getProject_args, getProject_result> {
public getProject() {
super("getProject");
}
@@ -19575,7 +19680,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19584,9 +19689,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getProject_result getEmptyResultInstance() {
+ return new getProject_result();
+ }
+
@Override
public getProject_result getResult(I iface, getProject_args args) throws org.apache.thrift.TException {
- getProject_result result = new getProject_result();
+ getProject_result result = getEmptyResultInstance();
try {
result.success = iface.getProject(args.authzToken, args.projectId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19604,7 +19714,7 @@ public class Airavata {
}
}
- public static class deleteProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteProject_args> {
+ public static class deleteProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteProject_args, deleteProject_result> {
public deleteProject() {
super("deleteProject");
}
@@ -19615,7 +19725,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19624,9 +19734,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteProject_result getEmptyResultInstance() {
+ return new deleteProject_result();
+ }
+
@Override
public deleteProject_result getResult(I iface, deleteProject_args args) throws org.apache.thrift.TException {
- deleteProject_result result = new deleteProject_result();
+ deleteProject_result result = getEmptyResultInstance();
try {
result.success = iface.deleteProject(args.authzToken, args.projectId);
result.setSuccessIsSet(true);
@@ -19645,7 +19760,7 @@ public class Airavata {
}
}
- public static class getUserProjects<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserProjects_args> {
+ public static class getUserProjects<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserProjects_args, getUserProjects_result> {
public getUserProjects() {
super("getUserProjects");
}
@@ -19656,7 +19771,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19665,9 +19780,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUserProjects_result getEmptyResultInstance() {
+ return new getUserProjects_result();
+ }
+
@Override
public getUserProjects_result getResult(I iface, getUserProjects_args args) throws org.apache.thrift.TException {
- getUserProjects_result result = new getUserProjects_result();
+ getUserProjects_result result = getEmptyResultInstance();
try {
result.success = iface.getUserProjects(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19683,7 +19803,7 @@ public class Airavata {
}
}
- public static class searchProjects<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchProjects_args> {
+ public static class searchProjects<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchProjects_args, searchProjects_result> {
public searchProjects() {
super("searchProjects");
}
@@ -19694,7 +19814,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19703,9 +19823,14 @@ public class Airavata {
return false;
}
+ @Override
+ public searchProjects_result getEmptyResultInstance() {
+ return new searchProjects_result();
+ }
+
@Override
public searchProjects_result getResult(I iface, searchProjects_args args) throws org.apache.thrift.TException {
- searchProjects_result result = new searchProjects_result();
+ searchProjects_result result = getEmptyResultInstance();
try {
result.success = iface.searchProjects(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19721,7 +19846,7 @@ public class Airavata {
}
}
- public static class searchExperiments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperiments_args> {
+ public static class searchExperiments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperiments_args, searchExperiments_result> {
public searchExperiments() {
super("searchExperiments");
}
@@ -19732,7 +19857,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19741,9 +19866,14 @@ public class Airavata {
return false;
}
+ @Override
+ public searchExperiments_result getEmptyResultInstance() {
+ return new searchExperiments_result();
+ }
+
@Override
public searchExperiments_result getResult(I iface, searchExperiments_args args) throws org.apache.thrift.TException {
- searchExperiments_result result = new searchExperiments_result();
+ searchExperiments_result result = getEmptyResultInstance();
try {
result.success = iface.searchExperiments(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19759,7 +19889,7 @@ public class Airavata {
}
}
- public static class getExperimentStatistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentStatistics_args> {
+ public static class getExperimentStatistics<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentStatistics_args, getExperimentStatistics_result> {
public getExperimentStatistics() {
super("getExperimentStatistics");
}
@@ -19770,7 +19900,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19779,9 +19909,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getExperimentStatistics_result getEmptyResultInstance() {
+ return new getExperimentStatistics_result();
+ }
+
@Override
public getExperimentStatistics_result getResult(I iface, getExperimentStatistics_args args) throws org.apache.thrift.TException {
- getExperimentStatistics_result result = new getExperimentStatistics_result();
+ getExperimentStatistics_result result = getEmptyResultInstance();
try {
result.success = iface.getExperimentStatistics(args.authzToken, args.gatewayId, args.fromTime, args.toTime, args.userName, args.applicationName, args.resourceHostName, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19797,7 +19932,7 @@ public class Airavata {
}
}
- public static class getExperimentsInProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentsInProject_args> {
+ public static class getExperimentsInProject<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentsInProject_args, getExperimentsInProject_result> {
public getExperimentsInProject() {
super("getExperimentsInProject");
}
@@ -19808,7 +19943,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19817,9 +19952,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getExperimentsInProject_result getEmptyResultInstance() {
+ return new getExperimentsInProject_result();
+ }
+
@Override
public getExperimentsInProject_result getResult(I iface, getExperimentsInProject_args args) throws org.apache.thrift.TException {
- getExperimentsInProject_result result = new getExperimentsInProject_result();
+ getExperimentsInProject_result result = getEmptyResultInstance();
try {
result.success = iface.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19837,7 +19977,7 @@ public class Airavata {
}
}
- public static class getUserExperiments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserExperiments_args> {
+ public static class getUserExperiments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserExperiments_args, getUserExperiments_result> {
public getUserExperiments() {
super("getUserExperiments");
}
@@ -19848,7 +19988,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19857,9 +19997,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUserExperiments_result getEmptyResultInstance() {
+ return new getUserExperiments_result();
+ }
+
@Override
public getUserExperiments_result getResult(I iface, getUserExperiments_args args) throws org.apache.thrift.TException {
- getUserExperiments_result result = new getUserExperiments_result();
+ getUserExperiments_result result = getEmptyResultInstance();
try {
result.success = iface.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19875,7 +20020,7 @@ public class Airavata {
}
}
- public static class createExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createExperiment_args> {
+ public static class createExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createExperiment_args, createExperiment_result> {
public createExperiment() {
super("createExperiment");
}
@@ -19886,7 +20031,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19895,9 +20040,14 @@ public class Airavata {
return false;
}
+ @Override
+ public createExperiment_result getEmptyResultInstance() {
+ return new createExperiment_result();
+ }
+
@Override
public createExperiment_result getResult(I iface, createExperiment_args args) throws org.apache.thrift.TException {
- createExperiment_result result = new createExperiment_result();
+ createExperiment_result result = getEmptyResultInstance();
try {
result.success = iface.createExperiment(args.authzToken, args.gatewayId, args.experiment);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19913,7 +20063,7 @@ public class Airavata {
}
}
- public static class deleteExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteExperiment_args> {
+ public static class deleteExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteExperiment_args, deleteExperiment_result> {
public deleteExperiment() {
super("deleteExperiment");
}
@@ -19924,7 +20074,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19933,9 +20083,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteExperiment_result getEmptyResultInstance() {
+ return new deleteExperiment_result();
+ }
+
@Override
public deleteExperiment_result getResult(I iface, deleteExperiment_args args) throws org.apache.thrift.TException {
- deleteExperiment_result result = new deleteExperiment_result();
+ deleteExperiment_result result = getEmptyResultInstance();
try {
result.success = iface.deleteExperiment(args.authzToken, args.experimentId);
result.setSuccessIsSet(true);
@@ -19952,7 +20107,7 @@ public class Airavata {
}
}
- public static class getExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperiment_args> {
+ public static class getExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperiment_args, getExperiment_result> {
public getExperiment() {
super("getExperiment");
}
@@ -19963,7 +20118,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -19972,9 +20127,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getExperiment_result getEmptyResultInstance() {
+ return new getExperiment_result();
+ }
+
@Override
public getExperiment_result getResult(I iface, getExperiment_args args) throws org.apache.thrift.TException {
- getExperiment_result result = new getExperiment_result();
+ getExperiment_result result = getEmptyResultInstance();
try {
result.success = iface.getExperiment(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -19992,7 +20152,7 @@ public class Airavata {
}
}
- public static class getExperimentByAdmin<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentByAdmin_args> {
+ public static class getExperimentByAdmin<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentByAdmin_args, getExperimentByAdmin_result> {
public getExperimentByAdmin() {
super("getExperimentByAdmin");
}
@@ -20003,7 +20163,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20012,9 +20172,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getExperimentByAdmin_result getEmptyResultInstance() {
+ return new getExperimentByAdmin_result();
+ }
+
@Override
public getExperimentByAdmin_result getResult(I iface, getExperimentByAdmin_args args) throws org.apache.thrift.TException {
- getExperimentByAdmin_result result = new getExperimentByAdmin_result();
+ getExperimentByAdmin_result result = getEmptyResultInstance();
try {
result.success = iface.getExperimentByAdmin(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20032,7 +20197,7 @@ public class Airavata {
}
}
- public static class getDetailedExperimentTree<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDetailedExperimentTree_args> {
+ public static class getDetailedExperimentTree<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDetailedExperimentTree_args, getDetailedExperimentTree_result> {
public getDetailedExperimentTree() {
super("getDetailedExperimentTree");
}
@@ -20043,7 +20208,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20052,9 +20217,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getDetailedExperimentTree_result getEmptyResultInstance() {
+ return new getDetailedExperimentTree_result();
+ }
+
@Override
public getDetailedExperimentTree_result getResult(I iface, getDetailedExperimentTree_args args) throws org.apache.thrift.TException {
- getDetailedExperimentTree_result result = new getDetailedExperimentTree_result();
+ getDetailedExperimentTree_result result = getEmptyResultInstance();
try {
result.success = iface.getDetailedExperimentTree(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20072,7 +20242,7 @@ public class Airavata {
}
}
- public static class updateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateExperiment_args> {
+ public static class updateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateExperiment_args, updateExperiment_result> {
public updateExperiment() {
super("updateExperiment");
}
@@ -20083,7 +20253,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20092,9 +20262,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateExperiment_result getEmptyResultInstance() {
+ return new updateExperiment_result();
+ }
+
@Override
public updateExperiment_result getResult(I iface, updateExperiment_args args) throws org.apache.thrift.TException {
- updateExperiment_result result = new updateExperiment_result();
+ updateExperiment_result result = getEmptyResultInstance();
try {
iface.updateExperiment(args.authzToken, args.airavataExperimentId, args.experiment);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20112,7 +20287,7 @@ public class Airavata {
}
}
- public static class updateExperimentConfiguration<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateExperimentConfiguration_args> {
+ public static class updateExperimentConfiguration<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateExperimentConfiguration_args, updateExperimentConfiguration_result> {
public updateExperimentConfiguration() {
super("updateExperimentConfiguration");
}
@@ -20123,7 +20298,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20132,9 +20307,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateExperimentConfiguration_result getEmptyResultInstance() {
+ return new updateExperimentConfiguration_result();
+ }
+
@Override
public updateExperimentConfiguration_result getResult(I iface, updateExperimentConfiguration_args args) throws org.apache.thrift.TException {
- updateExperimentConfiguration_result result = new updateExperimentConfiguration_result();
+ updateExperimentConfiguration_result result = getEmptyResultInstance();
try {
iface.updateExperimentConfiguration(args.authzToken, args.airavataExperimentId, args.userConfiguration);
} catch (org.apache.airavata.model.error.AuthorizationException ae) {
@@ -20144,7 +20324,7 @@ public class Airavata {
}
}
- public static class updateResourceScheduleing<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateResourceScheduleing_args> {
+ public static class updateResourceScheduleing<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateResourceScheduleing_args, updateResourceScheduleing_result> {
public updateResourceScheduleing() {
super("updateResourceScheduleing");
}
@@ -20155,7 +20335,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20164,9 +20344,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateResourceScheduleing_result getEmptyResultInstance() {
+ return new updateResourceScheduleing_result();
+ }
+
@Override
public updateResourceScheduleing_result getResult(I iface, updateResourceScheduleing_args args) throws org.apache.thrift.TException {
- updateResourceScheduleing_result result = new updateResourceScheduleing_result();
+ updateResourceScheduleing_result result = getEmptyResultInstance();
try {
iface.updateResourceScheduleing(args.authzToken, args.airavataExperimentId, args.resourceScheduling);
} catch (org.apache.airavata.model.error.AuthorizationException ae) {
@@ -20176,7 +20361,7 @@ public class Airavata {
}
}
- public static class validateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, validateExperiment_args> {
+ public static class validateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, validateExperiment_args, validateExperiment_result> {
public validateExperiment() {
super("validateExperiment");
}
@@ -20187,7 +20372,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20196,9 +20381,14 @@ public class Airavata {
return false;
}
+ @Override
+ public validateExperiment_result getEmptyResultInstance() {
+ return new validateExperiment_result();
+ }
+
@Override
public validateExperiment_result getResult(I iface, validateExperiment_args args) throws org.apache.thrift.TException {
- validateExperiment_result result = new validateExperiment_result();
+ validateExperiment_result result = getEmptyResultInstance();
try {
result.success = iface.validateExperiment(args.authzToken, args.airavataExperimentId);
result.setSuccessIsSet(true);
@@ -20217,7 +20407,7 @@ public class Airavata {
}
}
- public static class launchExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, launchExperiment_args> {
+ public static class launchExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, launchExperiment_args, launchExperiment_result> {
public launchExperiment() {
super("launchExperiment");
}
@@ -20228,7 +20418,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20237,9 +20427,14 @@ public class Airavata {
return false;
}
+ @Override
+ public launchExperiment_result getEmptyResultInstance() {
+ return new launchExperiment_result();
+ }
+
@Override
public launchExperiment_result getResult(I iface, launchExperiment_args args) throws org.apache.thrift.TException {
- launchExperiment_result result = new launchExperiment_result();
+ launchExperiment_result result = getEmptyResultInstance();
try {
iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20257,7 +20452,7 @@ public class Airavata {
}
}
- public static class getExperimentStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentStatus_args> {
+ public static class getExperimentStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentStatus_args, getExperimentStatus_result> {
public getExperimentStatus() {
super("getExperimentStatus");
}
@@ -20268,7 +20463,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20277,9 +20472,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getExperimentStatus_result getEmptyResultInstance() {
+ return new getExperimentStatus_result();
+ }
+
@Override
public getExperimentStatus_result getResult(I iface, getExperimentStatus_args args) throws org.apache.thrift.TException {
- getExperimentStatus_result result = new getExperimentStatus_result();
+ getExperimentStatus_result result = getEmptyResultInstance();
try {
result.success = iface.getExperimentStatus(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20297,7 +20497,7 @@ public class Airavata {
}
}
- public static class getExperimentOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentOutputs_args> {
+ public static class getExperimentOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getExperimentOutputs_args, getExperimentOutputs_result> {
public getExperimentOutputs() {
super("getExperimentOutputs");
}
@@ -20308,7 +20508,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20317,9 +20517,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getExperimentOutputs_result getEmptyResultInstance() {
+ return new getExperimentOutputs_result();
+ }
+
@Override
public getExperimentOutputs_result getResult(I iface, getExperimentOutputs_args args) throws org.apache.thrift.TException {
- getExperimentOutputs_result result = new getExperimentOutputs_result();
+ getExperimentOutputs_result result = getEmptyResultInstance();
try {
result.success = iface.getExperimentOutputs(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20337,7 +20542,7 @@ public class Airavata {
}
}
- public static class getIntermediateOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getIntermediateOutputs_args> {
+ public static class getIntermediateOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getIntermediateOutputs_args, getIntermediateOutputs_result> {
public getIntermediateOutputs() {
super("getIntermediateOutputs");
}
@@ -20348,7 +20553,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20357,9 +20562,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getIntermediateOutputs_result getEmptyResultInstance() {
+ return new getIntermediateOutputs_result();
+ }
+
@Override
public getIntermediateOutputs_result getResult(I iface, getIntermediateOutputs_args args) throws org.apache.thrift.TException {
- getIntermediateOutputs_result result = new getIntermediateOutputs_result();
+ getIntermediateOutputs_result result = getEmptyResultInstance();
try {
result.success = iface.getIntermediateOutputs(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20377,7 +20587,7 @@ public class Airavata {
}
}
- public static class fetchIntermediateOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetchIntermediateOutputs_args> {
+ public static class fetchIntermediateOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetchIntermediateOutputs_args, fetchIntermediateOutputs_result> {
public fetchIntermediateOutputs() {
super("fetchIntermediateOutputs");
}
@@ -20388,7 +20598,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20397,9 +20607,14 @@ public class Airavata {
return false;
}
+ @Override
+ public fetchIntermediateOutputs_result getEmptyResultInstance() {
+ return new fetchIntermediateOutputs_result();
+ }
+
@Override
public fetchIntermediateOutputs_result getResult(I iface, fetchIntermediateOutputs_args args) throws org.apache.thrift.TException {
- fetchIntermediateOutputs_result result = new fetchIntermediateOutputs_result();
+ fetchIntermediateOutputs_result result = getEmptyResultInstance();
try {
iface.fetchIntermediateOutputs(args.authzToken, args.airavataExperimentId, args.outputNames);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20417,7 +20632,7 @@ public class Airavata {
}
}
- public static class getIntermediateOutputProcessStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getIntermediateOutputProcessStatus_args> {
+ public static class getIntermediateOutputProcessStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getIntermediateOutputProcessStatus_args, getIntermediateOutputProcessStatus_result> {
public getIntermediateOutputProcessStatus() {
super("getIntermediateOutputProcessStatus");
}
@@ -20428,7 +20643,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20437,9 +20652,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getIntermediateOutputProcessStatus_result getEmptyResultInstance() {
+ return new getIntermediateOutputProcessStatus_result();
+ }
+
@Override
public getIntermediateOutputProcessStatus_result getResult(I iface, getIntermediateOutputProcessStatus_args args) throws org.apache.thrift.TException {
- getIntermediateOutputProcessStatus_result result = new getIntermediateOutputProcessStatus_result();
+ getIntermediateOutputProcessStatus_result result = getEmptyResultInstance();
try {
result.success = iface.getIntermediateOutputProcessStatus(args.authzToken, args.airavataExperimentId, args.outputNames);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20457,7 +20677,7 @@ public class Airavata {
}
}
- public static class getJobStatuses<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getJobStatuses_args> {
+ public static class getJobStatuses<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getJobStatuses_args, getJobStatuses_result> {
public getJobStatuses() {
super("getJobStatuses");
}
@@ -20468,7 +20688,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20477,9 +20697,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getJobStatuses_result getEmptyResultInstance() {
+ return new getJobStatuses_result();
+ }
+
@Override
public getJobStatuses_result getResult(I iface, getJobStatuses_args args) throws org.apache.thrift.TException {
- getJobStatuses_result result = new getJobStatuses_result();
+ getJobStatuses_result result = getEmptyResultInstance();
try {
result.success = iface.getJobStatuses(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20497,7 +20722,7 @@ public class Airavata {
}
}
- public static class getJobDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getJobDetails_args> {
+ public static class getJobDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getJobDetails_args, getJobDetails_result> {
public getJobDetails() {
super("getJobDetails");
}
@@ -20508,7 +20733,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20517,9 +20742,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getJobDetails_result getEmptyResultInstance() {
+ return new getJobDetails_result();
+ }
+
@Override
public getJobDetails_result getResult(I iface, getJobDetails_args args) throws org.apache.thrift.TException {
- getJobDetails_result result = new getJobDetails_result();
+ getJobDetails_result result = getEmptyResultInstance();
try {
result.success = iface.getJobDetails(args.authzToken, args.airavataExperimentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20537,7 +20767,7 @@ public class Airavata {
}
}
- public static class cloneExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cloneExperiment_args> {
+ public static class cloneExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cloneExperiment_args, cloneExperiment_result> {
public cloneExperiment() {
super("cloneExperiment");
}
@@ -20548,7 +20778,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20557,9 +20787,14 @@ public class Airavata {
return false;
}
+ @Override
+ public cloneExperiment_result getEmptyResultInstance() {
+ return new cloneExperiment_result();
+ }
+
@Override
public cloneExperiment_result getResult(I iface, cloneExperiment_args args) throws org.apache.thrift.TException {
- cloneExperiment_result result = new cloneExperiment_result();
+ cloneExperiment_result result = getEmptyResultInstance();
try {
result.success = iface.cloneExperiment(args.authzToken, args.existingExperimentID, args.newExperimentName, args.newExperimentProjectId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20579,7 +20814,7 @@ public class Airavata {
}
}
- public static class cloneExperimentByAdmin<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cloneExperimentByAdmin_args> {
+ public static class cloneExperimentByAdmin<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cloneExperimentByAdmin_args, cloneExperimentByAdmin_result> {
public cloneExperimentByAdmin() {
super("cloneExperimentByAdmin");
}
@@ -20590,7 +20825,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20599,9 +20834,14 @@ public class Airavata {
return false;
}
+ @Override
+ public cloneExperimentByAdmin_result getEmptyResultInstance() {
+ return new cloneExperimentByAdmin_result();
+ }
+
@Override
public cloneExperimentByAdmin_result getResult(I iface, cloneExperimentByAdmin_args args) throws org.apache.thrift.TException {
- cloneExperimentByAdmin_result result = new cloneExperimentByAdmin_result();
+ cloneExperimentByAdmin_result result = getEmptyResultInstance();
try {
result.success = iface.cloneExperimentByAdmin(args.authzToken, args.existingExperimentID, args.newExperimentName, args.newExperimentProjectId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20621,7 +20861,7 @@ public class Airavata {
}
}
- public static class terminateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, terminateExperiment_args> {
+ public static class terminateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, terminateExperiment_args, terminateExperiment_result> {
public terminateExperiment() {
super("terminateExperiment");
}
@@ -20632,7 +20872,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20641,9 +20881,14 @@ public class Airavata {
return false;
}
+ @Override
+ public terminateExperiment_result getEmptyResultInstance() {
+ return new terminateExperiment_result();
+ }
+
@Override
public terminateExperiment_result getResult(I iface, terminateExperiment_args args) throws org.apache.thrift.TException {
- terminateExperiment_result result = new terminateExperiment_result();
+ terminateExperiment_result result = getEmptyResultInstance();
try {
iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20661,7 +20906,7 @@ public class Airavata {
}
}
- public static class registerApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerApplicationModule_args> {
+ public static class registerApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerApplicationModule_args, registerApplicationModule_result> {
public registerApplicationModule() {
super("registerApplicationModule");
}
@@ -20672,7 +20917,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20681,9 +20926,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerApplicationModule_result getEmptyResultInstance() {
+ return new registerApplicationModule_result();
+ }
+
@Override
public registerApplicationModule_result getResult(I iface, registerApplicationModule_args args) throws org.apache.thrift.TException {
- registerApplicationModule_result result = new registerApplicationModule_result();
+ registerApplicationModule_result result = getEmptyResultInstance();
try {
result.success = iface.registerApplicationModule(args.authzToken, args.gatewayId, args.applicationModule);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20699,7 +20949,7 @@ public class Airavata {
}
}
- public static class getApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationModule_args> {
+ public static class getApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationModule_args, getApplicationModule_result> {
public getApplicationModule() {
super("getApplicationModule");
}
@@ -20710,7 +20960,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20719,9 +20969,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getApplicationModule_result getEmptyResultInstance() {
+ return new getApplicationModule_result();
+ }
+
@Override
public getApplicationModule_result getResult(I iface, getApplicationModule_args args) throws org.apache.thrift.TException {
- getApplicationModule_result result = new getApplicationModule_result();
+ getApplicationModule_result result = getEmptyResultInstance();
try {
result.success = iface.getApplicationModule(args.authzToken, args.appModuleId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20737,7 +20992,7 @@ public class Airavata {
}
}
- public static class updateApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateApplicationModule_args> {
+ public static class updateApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateApplicationModule_args, updateApplicationModule_result> {
public updateApplicationModule() {
super("updateApplicationModule");
}
@@ -20748,7 +21003,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20757,9 +21012,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateApplicationModule_result getEmptyResultInstance() {
+ return new updateApplicationModule_result();
+ }
+
@Override
public updateApplicationModule_result getResult(I iface, updateApplicationModule_args args) throws org.apache.thrift.TException {
- updateApplicationModule_result result = new updateApplicationModule_result();
+ updateApplicationModule_result result = getEmptyResultInstance();
try {
result.success = iface.updateApplicationModule(args.authzToken, args.appModuleId, args.applicationModule);
result.setSuccessIsSet(true);
@@ -20776,7 +21036,7 @@ public class Airavata {
}
}
- public static class getAllAppModules<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAppModules_args> {
+ public static class getAllAppModules<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAppModules_args, getAllAppModules_result> {
public getAllAppModules() {
super("getAllAppModules");
}
@@ -20787,7 +21047,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20796,9 +21056,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllAppModules_result getEmptyResultInstance() {
+ return new getAllAppModules_result();
+ }
+
@Override
public getAllAppModules_result getResult(I iface, getAllAppModules_args args) throws org.apache.thrift.TException {
- getAllAppModules_result result = new getAllAppModules_result();
+ getAllAppModules_result result = getEmptyResultInstance();
try {
result.success = iface.getAllAppModules(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20814,7 +21079,7 @@ public class Airavata {
}
}
- public static class getAccessibleAppModules<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAccessibleAppModules_args> {
+ public static class getAccessibleAppModules<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAccessibleAppModules_args, getAccessibleAppModules_result> {
public getAccessibleAppModules() {
super("getAccessibleAppModules");
}
@@ -20825,7 +21090,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20834,9 +21099,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAccessibleAppModules_result getEmptyResultInstance() {
+ return new getAccessibleAppModules_result();
+ }
+
@Override
public getAccessibleAppModules_result getResult(I iface, getAccessibleAppModules_args args) throws org.apache.thrift.TException {
- getAccessibleAppModules_result result = new getAccessibleAppModules_result();
+ getAccessibleAppModules_result result = getEmptyResultInstance();
try {
result.success = iface.getAccessibleAppModules(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20852,7 +21122,7 @@ public class Airavata {
}
}
- public static class deleteApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteApplicationModule_args> {
+ public static class deleteApplicationModule<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteApplicationModule_args, deleteApplicationModule_result> {
public deleteApplicationModule() {
super("deleteApplicationModule");
}
@@ -20863,7 +21133,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20872,9 +21142,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteApplicationModule_result getEmptyResultInstance() {
+ return new deleteApplicationModule_result();
+ }
+
@Override
public deleteApplicationModule_result getResult(I iface, deleteApplicationModule_args args) throws org.apache.thrift.TException {
- deleteApplicationModule_result result = new deleteApplicationModule_result();
+ deleteApplicationModule_result result = getEmptyResultInstance();
try {
result.success = iface.deleteApplicationModule(args.authzToken, args.appModuleId);
result.setSuccessIsSet(true);
@@ -20891,7 +21166,7 @@ public class Airavata {
}
}
- public static class registerApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerApplicationDeployment_args> {
+ public static class registerApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerApplicationDeployment_args, registerApplicationDeployment_result> {
public registerApplicationDeployment() {
super("registerApplicationDeployment");
}
@@ -20902,7 +21177,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20911,9 +21186,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerApplicationDeployment_result getEmptyResultInstance() {
+ return new registerApplicationDeployment_result();
+ }
+
@Override
public registerApplicationDeployment_result getResult(I iface, registerApplicationDeployment_args args) throws org.apache.thrift.TException {
- registerApplicationDeployment_result result = new registerApplicationDeployment_result();
+ registerApplicationDeployment_result result = getEmptyResultInstance();
try {
result.success = iface.registerApplicationDeployment(args.authzToken, args.gatewayId, args.applicationDeployment);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20929,7 +21209,7 @@ public class Airavata {
}
}
- public static class getApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationDeployment_args> {
+ public static class getApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationDeployment_args, getApplicationDeployment_result> {
public getApplicationDeployment() {
super("getApplicationDeployment");
}
@@ -20940,7 +21220,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20949,9 +21229,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getApplicationDeployment_result getEmptyResultInstance() {
+ return new getApplicationDeployment_result();
+ }
+
@Override
public getApplicationDeployment_result getResult(I iface, getApplicationDeployment_args args) throws org.apache.thrift.TException {
- getApplicationDeployment_result result = new getApplicationDeployment_result();
+ getApplicationDeployment_result result = getEmptyResultInstance();
try {
result.success = iface.getApplicationDeployment(args.authzToken, args.appDeploymentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -20967,7 +21252,7 @@ public class Airavata {
}
}
- public static class updateApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateApplicationDeployment_args> {
+ public static class updateApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateApplicationDeployment_args, updateApplicationDeployment_result> {
public updateApplicationDeployment() {
super("updateApplicationDeployment");
}
@@ -20978,7 +21263,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -20987,9 +21272,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateApplicationDeployment_result getEmptyResultInstance() {
+ return new updateApplicationDeployment_result();
+ }
+
@Override
public updateApplicationDeployment_result getResult(I iface, updateApplicationDeployment_args args) throws org.apache.thrift.TException {
- updateApplicationDeployment_result result = new updateApplicationDeployment_result();
+ updateApplicationDeployment_result result = getEmptyResultInstance();
try {
result.success = iface.updateApplicationDeployment(args.authzToken, args.appDeploymentId, args.applicationDeployment);
result.setSuccessIsSet(true);
@@ -21006,7 +21296,7 @@ public class Airavata {
}
}
- public static class deleteApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteApplicationDeployment_args> {
+ public static class deleteApplicationDeployment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteApplicationDeployment_args, deleteApplicationDeployment_result> {
public deleteApplicationDeployment() {
super("deleteApplicationDeployment");
}
@@ -21017,7 +21307,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21026,9 +21316,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteApplicationDeployment_result getEmptyResultInstance() {
+ return new deleteApplicationDeployment_result();
+ }
+
@Override
public deleteApplicationDeployment_result getResult(I iface, deleteApplicationDeployment_args args) throws org.apache.thrift.TException {
- deleteApplicationDeployment_result result = new deleteApplicationDeployment_result();
+ deleteApplicationDeployment_result result = getEmptyResultInstance();
try {
result.success = iface.deleteApplicationDeployment(args.authzToken, args.appDeploymentId);
result.setSuccessIsSet(true);
@@ -21045,7 +21340,7 @@ public class Airavata {
}
}
- public static class getAllApplicationDeployments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllApplicationDeployments_args> {
+ public static class getAllApplicationDeployments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllApplicationDeployments_args, getAllApplicationDeployments_result> {
public getAllApplicationDeployments() {
super("getAllApplicationDeployments");
}
@@ -21056,7 +21351,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21065,9 +21360,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllApplicationDeployments_result getEmptyResultInstance() {
+ return new getAllApplicationDeployments_result();
+ }
+
@Override
public getAllApplicationDeployments_result getResult(I iface, getAllApplicationDeployments_args args) throws org.apache.thrift.TException {
- getAllApplicationDeployments_result result = new getAllApplicationDeployments_result();
+ getAllApplicationDeployments_result result = getEmptyResultInstance();
try {
result.success = iface.getAllApplicationDeployments(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21083,7 +21383,7 @@ public class Airavata {
}
}
- public static class getAccessibleApplicationDeployments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAccessibleApplicationDeployments_args> {
+ public static class getAccessibleApplicationDeployments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAccessibleApplicationDeployments_args, getAccessibleApplicationDeployments_result> {
public getAccessibleApplicationDeployments() {
super("getAccessibleApplicationDeployments");
}
@@ -21094,7 +21394,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21103,9 +21403,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAccessibleApplicationDeployments_result getEmptyResultInstance() {
+ return new getAccessibleApplicationDeployments_result();
+ }
+
@Override
public getAccessibleApplicationDeployments_result getResult(I iface, getAccessibleApplicationDeployments_args args) throws org.apache.thrift.TException {
- getAccessibleApplicationDeployments_result result = new getAccessibleApplicationDeployments_result();
+ getAccessibleApplicationDeployments_result result = getEmptyResultInstance();
try {
result.success = iface.getAccessibleApplicationDeployments(args.authzToken, args.gatewayId, args.permissionType);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21121,7 +21426,7 @@ public class Airavata {
}
}
- public static class getAppModuleDeployedResources<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAppModuleDeployedResources_args> {
+ public static class getAppModuleDeployedResources<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAppModuleDeployedResources_args, getAppModuleDeployedResources_result> {
public getAppModuleDeployedResources() {
super("getAppModuleDeployedResources");
}
@@ -21132,7 +21437,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21141,9 +21446,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAppModuleDeployedResources_result getEmptyResultInstance() {
+ return new getAppModuleDeployedResources_result();
+ }
+
@Override
public getAppModuleDeployedResources_result getResult(I iface, getAppModuleDeployedResources_args args) throws org.apache.thrift.TException {
- getAppModuleDeployedResources_result result = new getAppModuleDeployedResources_result();
+ getAppModuleDeployedResources_result result = getEmptyResultInstance();
try {
result.success = iface.getAppModuleDeployedResources(args.authzToken, args.appModuleId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21159,7 +21469,7 @@ public class Airavata {
}
}
- public static class getApplicationDeploymentsForAppModuleAndGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args> {
+ public static class getApplicationDeploymentsForAppModuleAndGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result> {
public getApplicationDeploymentsForAppModuleAndGroupResourceProfile() {
super("getApplicationDeploymentsForAppModuleAndGroupResourceProfile");
}
@@ -21170,7 +21480,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21179,9 +21489,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result getEmptyResultInstance() {
+ return new getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result();
+ }
+
@Override
public getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result getResult(I iface, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args args) throws org.apache.thrift.TException {
- getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result result = new getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result();
+ getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.getApplicationDeploymentsForAppModuleAndGroupResourceProfile(args.authzToken, args.appModuleId, args.groupResourceProfileId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21197,7 +21512,7 @@ public class Airavata {
}
}
- public static class registerApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerApplicationInterface_args> {
+ public static class registerApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerApplicationInterface_args, registerApplicationInterface_result> {
public registerApplicationInterface() {
super("registerApplicationInterface");
}
@@ -21208,7 +21523,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21217,9 +21532,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerApplicationInterface_result getEmptyResultInstance() {
+ return new registerApplicationInterface_result();
+ }
+
@Override
public registerApplicationInterface_result getResult(I iface, registerApplicationInterface_args args) throws org.apache.thrift.TException {
- registerApplicationInterface_result result = new registerApplicationInterface_result();
+ registerApplicationInterface_result result = getEmptyResultInstance();
try {
result.success = iface.registerApplicationInterface(args.authzToken, args.gatewayId, args.applicationInterface);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21235,7 +21555,7 @@ public class Airavata {
}
}
- public static class cloneApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cloneApplicationInterface_args> {
+ public static class cloneApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, cloneApplicationInterface_args, cloneApplicationInterface_result> {
public cloneApplicationInterface() {
super("cloneApplicationInterface");
}
@@ -21246,7 +21566,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21255,9 +21575,14 @@ public class Airavata {
return false;
}
+ @Override
+ public cloneApplicationInterface_result getEmptyResultInstance() {
+ return new cloneApplicationInterface_result();
+ }
+
@Override
public cloneApplicationInterface_result getResult(I iface, cloneApplicationInterface_args args) throws org.apache.thrift.TException {
- cloneApplicationInterface_result result = new cloneApplicationInterface_result();
+ cloneApplicationInterface_result result = getEmptyResultInstance();
try {
result.success = iface.cloneApplicationInterface(args.authzToken, args.existingAppInterfaceID, args.newApplicationName, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21273,7 +21598,7 @@ public class Airavata {
}
}
- public static class getApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationInterface_args> {
+ public static class getApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationInterface_args, getApplicationInterface_result> {
public getApplicationInterface() {
super("getApplicationInterface");
}
@@ -21284,7 +21609,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21293,9 +21618,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getApplicationInterface_result getEmptyResultInstance() {
+ return new getApplicationInterface_result();
+ }
+
@Override
public getApplicationInterface_result getResult(I iface, getApplicationInterface_args args) throws org.apache.thrift.TException {
- getApplicationInterface_result result = new getApplicationInterface_result();
+ getApplicationInterface_result result = getEmptyResultInstance();
try {
result.success = iface.getApplicationInterface(args.authzToken, args.appInterfaceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21311,7 +21641,7 @@ public class Airavata {
}
}
- public static class updateApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateApplicationInterface_args> {
+ public static class updateApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateApplicationInterface_args, updateApplicationInterface_result> {
public updateApplicationInterface() {
super("updateApplicationInterface");
}
@@ -21322,7 +21652,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21331,9 +21661,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateApplicationInterface_result getEmptyResultInstance() {
+ return new updateApplicationInterface_result();
+ }
+
@Override
public updateApplicationInterface_result getResult(I iface, updateApplicationInterface_args args) throws org.apache.thrift.TException {
- updateApplicationInterface_result result = new updateApplicationInterface_result();
+ updateApplicationInterface_result result = getEmptyResultInstance();
try {
result.success = iface.updateApplicationInterface(args.authzToken, args.appInterfaceId, args.applicationInterface);
result.setSuccessIsSet(true);
@@ -21350,7 +21685,7 @@ public class Airavata {
}
}
- public static class deleteApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteApplicationInterface_args> {
+ public static class deleteApplicationInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteApplicationInterface_args, deleteApplicationInterface_result> {
public deleteApplicationInterface() {
super("deleteApplicationInterface");
}
@@ -21361,7 +21696,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21370,9 +21705,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteApplicationInterface_result getEmptyResultInstance() {
+ return new deleteApplicationInterface_result();
+ }
+
@Override
public deleteApplicationInterface_result getResult(I iface, deleteApplicationInterface_args args) throws org.apache.thrift.TException {
- deleteApplicationInterface_result result = new deleteApplicationInterface_result();
+ deleteApplicationInterface_result result = getEmptyResultInstance();
try {
result.success = iface.deleteApplicationInterface(args.authzToken, args.appInterfaceId);
result.setSuccessIsSet(true);
@@ -21389,7 +21729,7 @@ public class Airavata {
}
}
- public static class getAllApplicationInterfaceNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllApplicationInterfaceNames_args> {
+ public static class getAllApplicationInterfaceNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllApplicationInterfaceNames_args, getAllApplicationInterfaceNames_result> {
public getAllApplicationInterfaceNames() {
super("getAllApplicationInterfaceNames");
}
@@ -21400,7 +21740,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21409,9 +21749,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllApplicationInterfaceNames_result getEmptyResultInstance() {
+ return new getAllApplicationInterfaceNames_result();
+ }
+
@Override
public getAllApplicationInterfaceNames_result getResult(I iface, getAllApplicationInterfaceNames_args args) throws org.apache.thrift.TException {
- getAllApplicationInterfaceNames_result result = new getAllApplicationInterfaceNames_result();
+ getAllApplicationInterfaceNames_result result = getEmptyResultInstance();
try {
result.success = iface.getAllApplicationInterfaceNames(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21427,7 +21772,7 @@ public class Airavata {
}
}
- public static class getAllApplicationInterfaces<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllApplicationInterfaces_args> {
+ public static class getAllApplicationInterfaces<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllApplicationInterfaces_args, getAllApplicationInterfaces_result> {
public getAllApplicationInterfaces() {
super("getAllApplicationInterfaces");
}
@@ -21438,7 +21783,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21447,9 +21792,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllApplicationInterfaces_result getEmptyResultInstance() {
+ return new getAllApplicationInterfaces_result();
+ }
+
@Override
public getAllApplicationInterfaces_result getResult(I iface, getAllApplicationInterfaces_args args) throws org.apache.thrift.TException {
- getAllApplicationInterfaces_result result = new getAllApplicationInterfaces_result();
+ getAllApplicationInterfaces_result result = getEmptyResultInstance();
try {
result.success = iface.getAllApplicationInterfaces(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21465,7 +21815,7 @@ public class Airavata {
}
}
- public static class getApplicationInputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationInputs_args> {
+ public static class getApplicationInputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationInputs_args, getApplicationInputs_result> {
public getApplicationInputs() {
super("getApplicationInputs");
}
@@ -21476,7 +21826,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21485,9 +21835,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getApplicationInputs_result getEmptyResultInstance() {
+ return new getApplicationInputs_result();
+ }
+
@Override
public getApplicationInputs_result getResult(I iface, getApplicationInputs_args args) throws org.apache.thrift.TException {
- getApplicationInputs_result result = new getApplicationInputs_result();
+ getApplicationInputs_result result = getEmptyResultInstance();
try {
result.success = iface.getApplicationInputs(args.authzToken, args.appInterfaceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21503,7 +21858,7 @@ public class Airavata {
}
}
- public static class getApplicationOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationOutputs_args> {
+ public static class getApplicationOutputs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getApplicationOutputs_args, getApplicationOutputs_result> {
public getApplicationOutputs() {
super("getApplicationOutputs");
}
@@ -21514,7 +21869,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21523,9 +21878,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getApplicationOutputs_result getEmptyResultInstance() {
+ return new getApplicationOutputs_result();
+ }
+
@Override
public getApplicationOutputs_result getResult(I iface, getApplicationOutputs_args args) throws org.apache.thrift.TException {
- getApplicationOutputs_result result = new getApplicationOutputs_result();
+ getApplicationOutputs_result result = getEmptyResultInstance();
try {
result.success = iface.getApplicationOutputs(args.authzToken, args.appInterfaceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21541,7 +21901,7 @@ public class Airavata {
}
}
- public static class getAvailableAppInterfaceComputeResources<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAvailableAppInterfaceComputeResources_args> {
+ public static class getAvailableAppInterfaceComputeResources<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAvailableAppInterfaceComputeResources_args, getAvailableAppInterfaceComputeResources_result> {
public getAvailableAppInterfaceComputeResources() {
super("getAvailableAppInterfaceComputeResources");
}
@@ -21552,7 +21912,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21561,9 +21921,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAvailableAppInterfaceComputeResources_result getEmptyResultInstance() {
+ return new getAvailableAppInterfaceComputeResources_result();
+ }
+
@Override
public getAvailableAppInterfaceComputeResources_result getResult(I iface, getAvailableAppInterfaceComputeResources_args args) throws org.apache.thrift.TException {
- getAvailableAppInterfaceComputeResources_result result = new getAvailableAppInterfaceComputeResources_result();
+ getAvailableAppInterfaceComputeResources_result result = getEmptyResultInstance();
try {
result.success = iface.getAvailableAppInterfaceComputeResources(args.authzToken, args.appInterfaceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21579,7 +21944,7 @@ public class Airavata {
}
}
- public static class registerComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerComputeResource_args> {
+ public static class registerComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerComputeResource_args, registerComputeResource_result> {
public registerComputeResource() {
super("registerComputeResource");
}
@@ -21590,7 +21955,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21599,9 +21964,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerComputeResource_result getEmptyResultInstance() {
+ return new registerComputeResource_result();
+ }
+
@Override
public registerComputeResource_result getResult(I iface, registerComputeResource_args args) throws org.apache.thrift.TException {
- registerComputeResource_result result = new registerComputeResource_result();
+ registerComputeResource_result result = getEmptyResultInstance();
try {
result.success = iface.registerComputeResource(args.authzToken, args.computeResourceDescription);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21617,7 +21987,7 @@ public class Airavata {
}
}
- public static class getComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getComputeResource_args> {
+ public static class getComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getComputeResource_args, getComputeResource_result> {
public getComputeResource() {
super("getComputeResource");
}
@@ -21628,7 +21998,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21637,9 +22007,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getComputeResource_result getEmptyResultInstance() {
+ return new getComputeResource_result();
+ }
+
@Override
public getComputeResource_result getResult(I iface, getComputeResource_args args) throws org.apache.thrift.TException {
- getComputeResource_result result = new getComputeResource_result();
+ getComputeResource_result result = getEmptyResultInstance();
try {
result.success = iface.getComputeResource(args.authzToken, args.computeResourceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21655,7 +22030,7 @@ public class Airavata {
}
}
- public static class getAllComputeResourceNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllComputeResourceNames_args> {
+ public static class getAllComputeResourceNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllComputeResourceNames_args, getAllComputeResourceNames_result> {
public getAllComputeResourceNames() {
super("getAllComputeResourceNames");
}
@@ -21666,7 +22041,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21675,9 +22050,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllComputeResourceNames_result getEmptyResultInstance() {
+ return new getAllComputeResourceNames_result();
+ }
+
@Override
public getAllComputeResourceNames_result getResult(I iface, getAllComputeResourceNames_args args) throws org.apache.thrift.TException {
- getAllComputeResourceNames_result result = new getAllComputeResourceNames_result();
+ getAllComputeResourceNames_result result = getEmptyResultInstance();
try {
result.success = iface.getAllComputeResourceNames(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21693,7 +22073,7 @@ public class Airavata {
}
}
- public static class updateComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateComputeResource_args> {
+ public static class updateComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateComputeResource_args, updateComputeResource_result> {
public updateComputeResource() {
super("updateComputeResource");
}
@@ -21704,7 +22084,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21713,9 +22093,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateComputeResource_result getEmptyResultInstance() {
+ return new updateComputeResource_result();
+ }
+
@Override
public updateComputeResource_result getResult(I iface, updateComputeResource_args args) throws org.apache.thrift.TException {
- updateComputeResource_result result = new updateComputeResource_result();
+ updateComputeResource_result result = getEmptyResultInstance();
try {
result.success = iface.updateComputeResource(args.authzToken, args.computeResourceId, args.computeResourceDescription);
result.setSuccessIsSet(true);
@@ -21732,7 +22117,7 @@ public class Airavata {
}
}
- public static class deleteComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteComputeResource_args> {
+ public static class deleteComputeResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteComputeResource_args, deleteComputeResource_result> {
public deleteComputeResource() {
super("deleteComputeResource");
}
@@ -21743,7 +22128,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21752,9 +22137,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteComputeResource_result getEmptyResultInstance() {
+ return new deleteComputeResource_result();
+ }
+
@Override
public deleteComputeResource_result getResult(I iface, deleteComputeResource_args args) throws org.apache.thrift.TException {
- deleteComputeResource_result result = new deleteComputeResource_result();
+ deleteComputeResource_result result = getEmptyResultInstance();
try {
result.success = iface.deleteComputeResource(args.authzToken, args.computeResourceId);
result.setSuccessIsSet(true);
@@ -21771,7 +22161,7 @@ public class Airavata {
}
}
- public static class registerStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerStorageResource_args> {
+ public static class registerStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerStorageResource_args, registerStorageResource_result> {
public registerStorageResource() {
super("registerStorageResource");
}
@@ -21782,7 +22172,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21791,9 +22181,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerStorageResource_result getEmptyResultInstance() {
+ return new registerStorageResource_result();
+ }
+
@Override
public registerStorageResource_result getResult(I iface, registerStorageResource_args args) throws org.apache.thrift.TException {
- registerStorageResource_result result = new registerStorageResource_result();
+ registerStorageResource_result result = getEmptyResultInstance();
try {
result.success = iface.registerStorageResource(args.authzToken, args.storageResourceDescription);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21809,7 +22204,7 @@ public class Airavata {
}
}
- public static class getStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStorageResource_args> {
+ public static class getStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStorageResource_args, getStorageResource_result> {
public getStorageResource() {
super("getStorageResource");
}
@@ -21820,7 +22215,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21829,9 +22224,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getStorageResource_result getEmptyResultInstance() {
+ return new getStorageResource_result();
+ }
+
@Override
public getStorageResource_result getResult(I iface, getStorageResource_args args) throws org.apache.thrift.TException {
- getStorageResource_result result = new getStorageResource_result();
+ getStorageResource_result result = getEmptyResultInstance();
try {
result.success = iface.getStorageResource(args.authzToken, args.storageResourceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21847,7 +22247,7 @@ public class Airavata {
}
}
- public static class getAllStorageResourceNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllStorageResourceNames_args> {
+ public static class getAllStorageResourceNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllStorageResourceNames_args, getAllStorageResourceNames_result> {
public getAllStorageResourceNames() {
super("getAllStorageResourceNames");
}
@@ -21858,7 +22258,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21867,9 +22267,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllStorageResourceNames_result getEmptyResultInstance() {
+ return new getAllStorageResourceNames_result();
+ }
+
@Override
public getAllStorageResourceNames_result getResult(I iface, getAllStorageResourceNames_args args) throws org.apache.thrift.TException {
- getAllStorageResourceNames_result result = new getAllStorageResourceNames_result();
+ getAllStorageResourceNames_result result = getEmptyResultInstance();
try {
result.success = iface.getAllStorageResourceNames(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -21885,7 +22290,7 @@ public class Airavata {
}
}
- public static class updateStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateStorageResource_args> {
+ public static class updateStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateStorageResource_args, updateStorageResource_result> {
public updateStorageResource() {
super("updateStorageResource");
}
@@ -21896,7 +22301,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21905,9 +22310,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateStorageResource_result getEmptyResultInstance() {
+ return new updateStorageResource_result();
+ }
+
@Override
public updateStorageResource_result getResult(I iface, updateStorageResource_args args) throws org.apache.thrift.TException {
- updateStorageResource_result result = new updateStorageResource_result();
+ updateStorageResource_result result = getEmptyResultInstance();
try {
result.success = iface.updateStorageResource(args.authzToken, args.storageResourceId, args.storageResourceDescription);
result.setSuccessIsSet(true);
@@ -21924,7 +22334,7 @@ public class Airavata {
}
}
- public static class deleteStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteStorageResource_args> {
+ public static class deleteStorageResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteStorageResource_args, deleteStorageResource_result> {
public deleteStorageResource() {
super("deleteStorageResource");
}
@@ -21935,7 +22345,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21944,9 +22354,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteStorageResource_result getEmptyResultInstance() {
+ return new deleteStorageResource_result();
+ }
+
@Override
public deleteStorageResource_result getResult(I iface, deleteStorageResource_args args) throws org.apache.thrift.TException {
- deleteStorageResource_result result = new deleteStorageResource_result();
+ deleteStorageResource_result result = getEmptyResultInstance();
try {
result.success = iface.deleteStorageResource(args.authzToken, args.storageResourceId);
result.setSuccessIsSet(true);
@@ -21963,7 +22378,7 @@ public class Airavata {
}
}
- public static class addLocalSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addLocalSubmissionDetails_args> {
+ public static class addLocalSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addLocalSubmissionDetails_args, addLocalSubmissionDetails_result> {
public addLocalSubmissionDetails() {
super("addLocalSubmissionDetails");
}
@@ -21974,7 +22389,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -21983,9 +22398,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addLocalSubmissionDetails_result getEmptyResultInstance() {
+ return new addLocalSubmissionDetails_result();
+ }
+
@Override
public addLocalSubmissionDetails_result getResult(I iface, addLocalSubmissionDetails_args args) throws org.apache.thrift.TException {
- addLocalSubmissionDetails_result result = new addLocalSubmissionDetails_result();
+ addLocalSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addLocalSubmissionDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.localSubmission);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22001,7 +22421,7 @@ public class Airavata {
}
}
- public static class updateLocalSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateLocalSubmissionDetails_args> {
+ public static class updateLocalSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateLocalSubmissionDetails_args, updateLocalSubmissionDetails_result> {
public updateLocalSubmissionDetails() {
super("updateLocalSubmissionDetails");
}
@@ -22012,7 +22432,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22021,9 +22441,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateLocalSubmissionDetails_result getEmptyResultInstance() {
+ return new updateLocalSubmissionDetails_result();
+ }
+
@Override
public updateLocalSubmissionDetails_result getResult(I iface, updateLocalSubmissionDetails_args args) throws org.apache.thrift.TException {
- updateLocalSubmissionDetails_result result = new updateLocalSubmissionDetails_result();
+ updateLocalSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateLocalSubmissionDetails(args.authzToken, args.jobSubmissionInterfaceId, args.localSubmission);
result.setSuccessIsSet(true);
@@ -22040,7 +22465,7 @@ public class Airavata {
}
}
- public static class getLocalJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLocalJobSubmission_args> {
+ public static class getLocalJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLocalJobSubmission_args, getLocalJobSubmission_result> {
public getLocalJobSubmission() {
super("getLocalJobSubmission");
}
@@ -22051,7 +22476,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22060,9 +22485,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getLocalJobSubmission_result getEmptyResultInstance() {
+ return new getLocalJobSubmission_result();
+ }
+
@Override
public getLocalJobSubmission_result getResult(I iface, getLocalJobSubmission_args args) throws org.apache.thrift.TException {
- getLocalJobSubmission_result result = new getLocalJobSubmission_result();
+ getLocalJobSubmission_result result = getEmptyResultInstance();
try {
result.success = iface.getLocalJobSubmission(args.authzToken, args.jobSubmissionId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22078,7 +22508,7 @@ public class Airavata {
}
}
- public static class addSSHJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSSHJobSubmissionDetails_args> {
+ public static class addSSHJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSSHJobSubmissionDetails_args, addSSHJobSubmissionDetails_result> {
public addSSHJobSubmissionDetails() {
super("addSSHJobSubmissionDetails");
}
@@ -22089,7 +22519,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22098,9 +22528,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addSSHJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addSSHJobSubmissionDetails_result();
+ }
+
@Override
public addSSHJobSubmissionDetails_result getResult(I iface, addSSHJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- addSSHJobSubmissionDetails_result result = new addSSHJobSubmissionDetails_result();
+ addSSHJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addSSHJobSubmissionDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.sshJobSubmission);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22116,7 +22551,7 @@ public class Airavata {
}
}
- public static class addSSHForkJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSSHForkJobSubmissionDetails_args> {
+ public static class addSSHForkJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSSHForkJobSubmissionDetails_args, addSSHForkJobSubmissionDetails_result> {
public addSSHForkJobSubmissionDetails() {
super("addSSHForkJobSubmissionDetails");
}
@@ -22127,7 +22562,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22136,9 +22571,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addSSHForkJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addSSHForkJobSubmissionDetails_result();
+ }
+
@Override
public addSSHForkJobSubmissionDetails_result getResult(I iface, addSSHForkJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- addSSHForkJobSubmissionDetails_result result = new addSSHForkJobSubmissionDetails_result();
+ addSSHForkJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addSSHForkJobSubmissionDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.sshJobSubmission);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22154,7 +22594,7 @@ public class Airavata {
}
}
- public static class getSSHJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHJobSubmission_args> {
+ public static class getSSHJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHJobSubmission_args, getSSHJobSubmission_result> {
public getSSHJobSubmission() {
super("getSSHJobSubmission");
}
@@ -22165,7 +22605,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22174,9 +22614,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getSSHJobSubmission_result getEmptyResultInstance() {
+ return new getSSHJobSubmission_result();
+ }
+
@Override
public getSSHJobSubmission_result getResult(I iface, getSSHJobSubmission_args args) throws org.apache.thrift.TException {
- getSSHJobSubmission_result result = new getSSHJobSubmission_result();
+ getSSHJobSubmission_result result = getEmptyResultInstance();
try {
result.success = iface.getSSHJobSubmission(args.authzToken, args.jobSubmissionId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22192,7 +22637,7 @@ public class Airavata {
}
}
- public static class addUNICOREJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUNICOREJobSubmissionDetails_args> {
+ public static class addUNICOREJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUNICOREJobSubmissionDetails_args, addUNICOREJobSubmissionDetails_result> {
public addUNICOREJobSubmissionDetails() {
super("addUNICOREJobSubmissionDetails");
}
@@ -22203,7 +22648,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22212,9 +22657,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addUNICOREJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addUNICOREJobSubmissionDetails_result();
+ }
+
@Override
public addUNICOREJobSubmissionDetails_result getResult(I iface, addUNICOREJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- addUNICOREJobSubmissionDetails_result result = new addUNICOREJobSubmissionDetails_result();
+ addUNICOREJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addUNICOREJobSubmissionDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.unicoreJobSubmission);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22230,7 +22680,7 @@ public class Airavata {
}
}
- public static class getUnicoreJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUnicoreJobSubmission_args> {
+ public static class getUnicoreJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUnicoreJobSubmission_args, getUnicoreJobSubmission_result> {
public getUnicoreJobSubmission() {
super("getUnicoreJobSubmission");
}
@@ -22241,7 +22691,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22250,9 +22700,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUnicoreJobSubmission_result getEmptyResultInstance() {
+ return new getUnicoreJobSubmission_result();
+ }
+
@Override
public getUnicoreJobSubmission_result getResult(I iface, getUnicoreJobSubmission_args args) throws org.apache.thrift.TException {
- getUnicoreJobSubmission_result result = new getUnicoreJobSubmission_result();
+ getUnicoreJobSubmission_result result = getEmptyResultInstance();
try {
result.success = iface.getUnicoreJobSubmission(args.authzToken, args.jobSubmissionId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22268,7 +22723,7 @@ public class Airavata {
}
}
- public static class addCloudJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addCloudJobSubmissionDetails_args> {
+ public static class addCloudJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addCloudJobSubmissionDetails_args, addCloudJobSubmissionDetails_result> {
public addCloudJobSubmissionDetails() {
super("addCloudJobSubmissionDetails");
}
@@ -22279,7 +22734,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22288,9 +22743,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addCloudJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addCloudJobSubmissionDetails_result();
+ }
+
@Override
public addCloudJobSubmissionDetails_result getResult(I iface, addCloudJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- addCloudJobSubmissionDetails_result result = new addCloudJobSubmissionDetails_result();
+ addCloudJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addCloudJobSubmissionDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.cloudSubmission);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22306,7 +22766,7 @@ public class Airavata {
}
}
- public static class getCloudJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCloudJobSubmission_args> {
+ public static class getCloudJobSubmission<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getCloudJobSubmission_args, getCloudJobSubmission_result> {
public getCloudJobSubmission() {
super("getCloudJobSubmission");
}
@@ -22317,7 +22777,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22326,9 +22786,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getCloudJobSubmission_result getEmptyResultInstance() {
+ return new getCloudJobSubmission_result();
+ }
+
@Override
public getCloudJobSubmission_result getResult(I iface, getCloudJobSubmission_args args) throws org.apache.thrift.TException {
- getCloudJobSubmission_result result = new getCloudJobSubmission_result();
+ getCloudJobSubmission_result result = getEmptyResultInstance();
try {
result.success = iface.getCloudJobSubmission(args.authzToken, args.jobSubmissionId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22344,7 +22809,7 @@ public class Airavata {
}
}
- public static class updateSSHJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateSSHJobSubmissionDetails_args> {
+ public static class updateSSHJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateSSHJobSubmissionDetails_args, updateSSHJobSubmissionDetails_result> {
public updateSSHJobSubmissionDetails() {
super("updateSSHJobSubmissionDetails");
}
@@ -22355,7 +22820,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22364,9 +22829,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateSSHJobSubmissionDetails_result getEmptyResultInstance() {
+ return new updateSSHJobSubmissionDetails_result();
+ }
+
@Override
public updateSSHJobSubmissionDetails_result getResult(I iface, updateSSHJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- updateSSHJobSubmissionDetails_result result = new updateSSHJobSubmissionDetails_result();
+ updateSSHJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateSSHJobSubmissionDetails(args.authzToken, args.jobSubmissionInterfaceId, args.sshJobSubmission);
result.setSuccessIsSet(true);
@@ -22383,7 +22853,7 @@ public class Airavata {
}
}
- public static class updateCloudJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateCloudJobSubmissionDetails_args> {
+ public static class updateCloudJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateCloudJobSubmissionDetails_args, updateCloudJobSubmissionDetails_result> {
public updateCloudJobSubmissionDetails() {
super("updateCloudJobSubmissionDetails");
}
@@ -22394,7 +22864,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22403,9 +22873,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateCloudJobSubmissionDetails_result getEmptyResultInstance() {
+ return new updateCloudJobSubmissionDetails_result();
+ }
+
@Override
public updateCloudJobSubmissionDetails_result getResult(I iface, updateCloudJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- updateCloudJobSubmissionDetails_result result = new updateCloudJobSubmissionDetails_result();
+ updateCloudJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateCloudJobSubmissionDetails(args.authzToken, args.jobSubmissionInterfaceId, args.sshJobSubmission);
result.setSuccessIsSet(true);
@@ -22422,7 +22897,7 @@ public class Airavata {
}
}
- public static class updateUnicoreJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUnicoreJobSubmissionDetails_args> {
+ public static class updateUnicoreJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUnicoreJobSubmissionDetails_args, updateUnicoreJobSubmissionDetails_result> {
public updateUnicoreJobSubmissionDetails() {
super("updateUnicoreJobSubmissionDetails");
}
@@ -22433,7 +22908,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22442,9 +22917,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateUnicoreJobSubmissionDetails_result getEmptyResultInstance() {
+ return new updateUnicoreJobSubmissionDetails_result();
+ }
+
@Override
public updateUnicoreJobSubmissionDetails_result getResult(I iface, updateUnicoreJobSubmissionDetails_args args) throws org.apache.thrift.TException {
- updateUnicoreJobSubmissionDetails_result result = new updateUnicoreJobSubmissionDetails_result();
+ updateUnicoreJobSubmissionDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateUnicoreJobSubmissionDetails(args.authzToken, args.jobSubmissionInterfaceId, args.unicoreJobSubmission);
result.setSuccessIsSet(true);
@@ -22461,7 +22941,7 @@ public class Airavata {
}
}
- public static class addLocalDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addLocalDataMovementDetails_args> {
+ public static class addLocalDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addLocalDataMovementDetails_args, addLocalDataMovementDetails_result> {
public addLocalDataMovementDetails() {
super("addLocalDataMovementDetails");
}
@@ -22472,7 +22952,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22481,9 +22961,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addLocalDataMovementDetails_result getEmptyResultInstance() {
+ return new addLocalDataMovementDetails_result();
+ }
+
@Override
public addLocalDataMovementDetails_result getResult(I iface, addLocalDataMovementDetails_args args) throws org.apache.thrift.TException {
- addLocalDataMovementDetails_result result = new addLocalDataMovementDetails_result();
+ addLocalDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addLocalDataMovementDetails(args.authzToken, args.productUri, args.dataMoveType, args.priorityOrder, args.localDataMovement);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22499,7 +22984,7 @@ public class Airavata {
}
}
- public static class updateLocalDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateLocalDataMovementDetails_args> {
+ public static class updateLocalDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateLocalDataMovementDetails_args, updateLocalDataMovementDetails_result> {
public updateLocalDataMovementDetails() {
super("updateLocalDataMovementDetails");
}
@@ -22510,7 +22995,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22519,9 +23004,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateLocalDataMovementDetails_result getEmptyResultInstance() {
+ return new updateLocalDataMovementDetails_result();
+ }
+
@Override
public updateLocalDataMovementDetails_result getResult(I iface, updateLocalDataMovementDetails_args args) throws org.apache.thrift.TException {
- updateLocalDataMovementDetails_result result = new updateLocalDataMovementDetails_result();
+ updateLocalDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateLocalDataMovementDetails(args.authzToken, args.dataMovementInterfaceId, args.localDataMovement);
result.setSuccessIsSet(true);
@@ -22538,7 +23028,7 @@ public class Airavata {
}
}
- public static class getLocalDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLocalDataMovement_args> {
+ public static class getLocalDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLocalDataMovement_args, getLocalDataMovement_result> {
public getLocalDataMovement() {
super("getLocalDataMovement");
}
@@ -22549,7 +23039,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22558,9 +23048,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getLocalDataMovement_result getEmptyResultInstance() {
+ return new getLocalDataMovement_result();
+ }
+
@Override
public getLocalDataMovement_result getResult(I iface, getLocalDataMovement_args args) throws org.apache.thrift.TException {
- getLocalDataMovement_result result = new getLocalDataMovement_result();
+ getLocalDataMovement_result result = getEmptyResultInstance();
try {
result.success = iface.getLocalDataMovement(args.authzToken, args.dataMovementId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22576,7 +23071,7 @@ public class Airavata {
}
}
- public static class addSCPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSCPDataMovementDetails_args> {
+ public static class addSCPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSCPDataMovementDetails_args, addSCPDataMovementDetails_result> {
public addSCPDataMovementDetails() {
super("addSCPDataMovementDetails");
}
@@ -22587,7 +23082,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22596,9 +23091,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addSCPDataMovementDetails_result getEmptyResultInstance() {
+ return new addSCPDataMovementDetails_result();
+ }
+
@Override
public addSCPDataMovementDetails_result getResult(I iface, addSCPDataMovementDetails_args args) throws org.apache.thrift.TException {
- addSCPDataMovementDetails_result result = new addSCPDataMovementDetails_result();
+ addSCPDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addSCPDataMovementDetails(args.authzToken, args.productUri, args.dataMoveType, args.priorityOrder, args.scpDataMovement);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22614,7 +23114,7 @@ public class Airavata {
}
}
- public static class updateSCPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateSCPDataMovementDetails_args> {
+ public static class updateSCPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateSCPDataMovementDetails_args, updateSCPDataMovementDetails_result> {
public updateSCPDataMovementDetails() {
super("updateSCPDataMovementDetails");
}
@@ -22625,7 +23125,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22634,9 +23134,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateSCPDataMovementDetails_result getEmptyResultInstance() {
+ return new updateSCPDataMovementDetails_result();
+ }
+
@Override
public updateSCPDataMovementDetails_result getResult(I iface, updateSCPDataMovementDetails_args args) throws org.apache.thrift.TException {
- updateSCPDataMovementDetails_result result = new updateSCPDataMovementDetails_result();
+ updateSCPDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateSCPDataMovementDetails(args.authzToken, args.dataMovementInterfaceId, args.scpDataMovement);
result.setSuccessIsSet(true);
@@ -22653,7 +23158,7 @@ public class Airavata {
}
}
- public static class getSCPDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSCPDataMovement_args> {
+ public static class getSCPDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSCPDataMovement_args, getSCPDataMovement_result> {
public getSCPDataMovement() {
super("getSCPDataMovement");
}
@@ -22664,7 +23169,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22673,9 +23178,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getSCPDataMovement_result getEmptyResultInstance() {
+ return new getSCPDataMovement_result();
+ }
+
@Override
public getSCPDataMovement_result getResult(I iface, getSCPDataMovement_args args) throws org.apache.thrift.TException {
- getSCPDataMovement_result result = new getSCPDataMovement_result();
+ getSCPDataMovement_result result = getEmptyResultInstance();
try {
result.success = iface.getSCPDataMovement(args.authzToken, args.dataMovementId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22691,7 +23201,7 @@ public class Airavata {
}
}
- public static class addUnicoreDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUnicoreDataMovementDetails_args> {
+ public static class addUnicoreDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUnicoreDataMovementDetails_args, addUnicoreDataMovementDetails_result> {
public addUnicoreDataMovementDetails() {
super("addUnicoreDataMovementDetails");
}
@@ -22702,7 +23212,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22711,9 +23221,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addUnicoreDataMovementDetails_result getEmptyResultInstance() {
+ return new addUnicoreDataMovementDetails_result();
+ }
+
@Override
public addUnicoreDataMovementDetails_result getResult(I iface, addUnicoreDataMovementDetails_args args) throws org.apache.thrift.TException {
- addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result();
+ addUnicoreDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addUnicoreDataMovementDetails(args.authzToken, args.productUri, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22729,7 +23244,7 @@ public class Airavata {
}
}
- public static class updateUnicoreDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUnicoreDataMovementDetails_args> {
+ public static class updateUnicoreDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUnicoreDataMovementDetails_args, updateUnicoreDataMovementDetails_result> {
public updateUnicoreDataMovementDetails() {
super("updateUnicoreDataMovementDetails");
}
@@ -22740,7 +23255,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22749,9 +23264,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateUnicoreDataMovementDetails_result getEmptyResultInstance() {
+ return new updateUnicoreDataMovementDetails_result();
+ }
+
@Override
public updateUnicoreDataMovementDetails_result getResult(I iface, updateUnicoreDataMovementDetails_args args) throws org.apache.thrift.TException {
- updateUnicoreDataMovementDetails_result result = new updateUnicoreDataMovementDetails_result();
+ updateUnicoreDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateUnicoreDataMovementDetails(args.authzToken, args.dataMovementInterfaceId, args.unicoreDataMovement);
result.setSuccessIsSet(true);
@@ -22768,7 +23288,7 @@ public class Airavata {
}
}
- public static class getUnicoreDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUnicoreDataMovement_args> {
+ public static class getUnicoreDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUnicoreDataMovement_args, getUnicoreDataMovement_result> {
public getUnicoreDataMovement() {
super("getUnicoreDataMovement");
}
@@ -22779,7 +23299,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22788,9 +23308,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUnicoreDataMovement_result getEmptyResultInstance() {
+ return new getUnicoreDataMovement_result();
+ }
+
@Override
public getUnicoreDataMovement_result getResult(I iface, getUnicoreDataMovement_args args) throws org.apache.thrift.TException {
- getUnicoreDataMovement_result result = new getUnicoreDataMovement_result();
+ getUnicoreDataMovement_result result = getEmptyResultInstance();
try {
result.success = iface.getUnicoreDataMovement(args.authzToken, args.dataMovementId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22806,7 +23331,7 @@ public class Airavata {
}
}
- public static class addGridFTPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGridFTPDataMovementDetails_args> {
+ public static class addGridFTPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGridFTPDataMovementDetails_args, addGridFTPDataMovementDetails_result> {
public addGridFTPDataMovementDetails() {
super("addGridFTPDataMovementDetails");
}
@@ -22817,7 +23342,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22826,9 +23351,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addGridFTPDataMovementDetails_result getEmptyResultInstance() {
+ return new addGridFTPDataMovementDetails_result();
+ }
+
@Override
public addGridFTPDataMovementDetails_result getResult(I iface, addGridFTPDataMovementDetails_args args) throws org.apache.thrift.TException {
- addGridFTPDataMovementDetails_result result = new addGridFTPDataMovementDetails_result();
+ addGridFTPDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.addGridFTPDataMovementDetails(args.authzToken, args.productUri, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22844,7 +23374,7 @@ public class Airavata {
}
}
- public static class updateGridFTPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGridFTPDataMovementDetails_args> {
+ public static class updateGridFTPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGridFTPDataMovementDetails_args, updateGridFTPDataMovementDetails_result> {
public updateGridFTPDataMovementDetails() {
super("updateGridFTPDataMovementDetails");
}
@@ -22855,7 +23385,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22864,9 +23394,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateGridFTPDataMovementDetails_result getEmptyResultInstance() {
+ return new updateGridFTPDataMovementDetails_result();
+ }
+
@Override
public updateGridFTPDataMovementDetails_result getResult(I iface, updateGridFTPDataMovementDetails_args args) throws org.apache.thrift.TException {
- updateGridFTPDataMovementDetails_result result = new updateGridFTPDataMovementDetails_result();
+ updateGridFTPDataMovementDetails_result result = getEmptyResultInstance();
try {
result.success = iface.updateGridFTPDataMovementDetails(args.authzToken, args.dataMovementInterfaceId, args.gridFTPDataMovement);
result.setSuccessIsSet(true);
@@ -22883,7 +23418,7 @@ public class Airavata {
}
}
- public static class getGridFTPDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGridFTPDataMovement_args> {
+ public static class getGridFTPDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGridFTPDataMovement_args, getGridFTPDataMovement_result> {
public getGridFTPDataMovement() {
super("getGridFTPDataMovement");
}
@@ -22894,7 +23429,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22903,9 +23438,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGridFTPDataMovement_result getEmptyResultInstance() {
+ return new getGridFTPDataMovement_result();
+ }
+
@Override
public getGridFTPDataMovement_result getResult(I iface, getGridFTPDataMovement_args args) throws org.apache.thrift.TException {
- getGridFTPDataMovement_result result = new getGridFTPDataMovement_result();
+ getGridFTPDataMovement_result result = getEmptyResultInstance();
try {
result.success = iface.getGridFTPDataMovement(args.authzToken, args.dataMovementId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -22921,7 +23461,7 @@ public class Airavata {
}
}
- public static class changeJobSubmissionPriority<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeJobSubmissionPriority_args> {
+ public static class changeJobSubmissionPriority<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeJobSubmissionPriority_args, changeJobSubmissionPriority_result> {
public changeJobSubmissionPriority() {
super("changeJobSubmissionPriority");
}
@@ -22932,7 +23472,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22941,9 +23481,14 @@ public class Airavata {
return false;
}
+ @Override
+ public changeJobSubmissionPriority_result getEmptyResultInstance() {
+ return new changeJobSubmissionPriority_result();
+ }
+
@Override
public changeJobSubmissionPriority_result getResult(I iface, changeJobSubmissionPriority_args args) throws org.apache.thrift.TException {
- changeJobSubmissionPriority_result result = new changeJobSubmissionPriority_result();
+ changeJobSubmissionPriority_result result = getEmptyResultInstance();
try {
result.success = iface.changeJobSubmissionPriority(args.authzToken, args.jobSubmissionInterfaceId, args.newPriorityOrder);
result.setSuccessIsSet(true);
@@ -22960,7 +23505,7 @@ public class Airavata {
}
}
- public static class changeDataMovementPriority<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeDataMovementPriority_args> {
+ public static class changeDataMovementPriority<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeDataMovementPriority_args, changeDataMovementPriority_result> {
public changeDataMovementPriority() {
super("changeDataMovementPriority");
}
@@ -22971,7 +23516,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -22980,9 +23525,14 @@ public class Airavata {
return false;
}
+ @Override
+ public changeDataMovementPriority_result getEmptyResultInstance() {
+ return new changeDataMovementPriority_result();
+ }
+
@Override
public changeDataMovementPriority_result getResult(I iface, changeDataMovementPriority_args args) throws org.apache.thrift.TException {
- changeDataMovementPriority_result result = new changeDataMovementPriority_result();
+ changeDataMovementPriority_result result = getEmptyResultInstance();
try {
result.success = iface.changeDataMovementPriority(args.authzToken, args.dataMovementInterfaceId, args.newPriorityOrder);
result.setSuccessIsSet(true);
@@ -22999,7 +23549,7 @@ public class Airavata {
}
}
- public static class changeJobSubmissionPriorities<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeJobSubmissionPriorities_args> {
+ public static class changeJobSubmissionPriorities<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeJobSubmissionPriorities_args, changeJobSubmissionPriorities_result> {
public changeJobSubmissionPriorities() {
super("changeJobSubmissionPriorities");
}
@@ -23010,7 +23560,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23019,9 +23569,14 @@ public class Airavata {
return false;
}
+ @Override
+ public changeJobSubmissionPriorities_result getEmptyResultInstance() {
+ return new changeJobSubmissionPriorities_result();
+ }
+
@Override
public changeJobSubmissionPriorities_result getResult(I iface, changeJobSubmissionPriorities_args args) throws org.apache.thrift.TException {
- changeJobSubmissionPriorities_result result = new changeJobSubmissionPriorities_result();
+ changeJobSubmissionPriorities_result result = getEmptyResultInstance();
try {
result.success = iface.changeJobSubmissionPriorities(args.authzToken, args.jobSubmissionPriorityMap);
result.setSuccessIsSet(true);
@@ -23038,7 +23593,7 @@ public class Airavata {
}
}
- public static class changeDataMovementPriorities<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeDataMovementPriorities_args> {
+ public static class changeDataMovementPriorities<I extends Iface> extends org.apache.thrift.ProcessFunction<I, changeDataMovementPriorities_args, changeDataMovementPriorities_result> {
public changeDataMovementPriorities() {
super("changeDataMovementPriorities");
}
@@ -23049,7 +23604,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23058,9 +23613,14 @@ public class Airavata {
return false;
}
+ @Override
+ public changeDataMovementPriorities_result getEmptyResultInstance() {
+ return new changeDataMovementPriorities_result();
+ }
+
@Override
public changeDataMovementPriorities_result getResult(I iface, changeDataMovementPriorities_args args) throws org.apache.thrift.TException {
- changeDataMovementPriorities_result result = new changeDataMovementPriorities_result();
+ changeDataMovementPriorities_result result = getEmptyResultInstance();
try {
result.success = iface.changeDataMovementPriorities(args.authzToken, args.dataMovementPriorityMap);
result.setSuccessIsSet(true);
@@ -23077,7 +23637,7 @@ public class Airavata {
}
}
- public static class deleteJobSubmissionInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteJobSubmissionInterface_args> {
+ public static class deleteJobSubmissionInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteJobSubmissionInterface_args, deleteJobSubmissionInterface_result> {
public deleteJobSubmissionInterface() {
super("deleteJobSubmissionInterface");
}
@@ -23088,7 +23648,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23097,9 +23657,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteJobSubmissionInterface_result getEmptyResultInstance() {
+ return new deleteJobSubmissionInterface_result();
+ }
+
@Override
public deleteJobSubmissionInterface_result getResult(I iface, deleteJobSubmissionInterface_args args) throws org.apache.thrift.TException {
- deleteJobSubmissionInterface_result result = new deleteJobSubmissionInterface_result();
+ deleteJobSubmissionInterface_result result = getEmptyResultInstance();
try {
result.success = iface.deleteJobSubmissionInterface(args.authzToken, args.computeResourceId, args.jobSubmissionInterfaceId);
result.setSuccessIsSet(true);
@@ -23116,7 +23681,7 @@ public class Airavata {
}
}
- public static class deleteDataMovementInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteDataMovementInterface_args> {
+ public static class deleteDataMovementInterface<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteDataMovementInterface_args, deleteDataMovementInterface_result> {
public deleteDataMovementInterface() {
super("deleteDataMovementInterface");
}
@@ -23127,7 +23692,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23136,9 +23701,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteDataMovementInterface_result getEmptyResultInstance() {
+ return new deleteDataMovementInterface_result();
+ }
+
@Override
public deleteDataMovementInterface_result getResult(I iface, deleteDataMovementInterface_args args) throws org.apache.thrift.TException {
- deleteDataMovementInterface_result result = new deleteDataMovementInterface_result();
+ deleteDataMovementInterface_result result = getEmptyResultInstance();
try {
result.success = iface.deleteDataMovementInterface(args.authzToken, args.productUri, args.dataMovementInterfaceId, args.dataMoveType);
result.setSuccessIsSet(true);
@@ -23155,7 +23725,7 @@ public class Airavata {
}
}
- public static class registerResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerResourceJobManager_args> {
+ public static class registerResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerResourceJobManager_args, registerResourceJobManager_result> {
public registerResourceJobManager() {
super("registerResourceJobManager");
}
@@ -23166,7 +23736,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23175,9 +23745,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerResourceJobManager_result getEmptyResultInstance() {
+ return new registerResourceJobManager_result();
+ }
+
@Override
public registerResourceJobManager_result getResult(I iface, registerResourceJobManager_args args) throws org.apache.thrift.TException {
- registerResourceJobManager_result result = new registerResourceJobManager_result();
+ registerResourceJobManager_result result = getEmptyResultInstance();
try {
result.success = iface.registerResourceJobManager(args.authzToken, args.resourceJobManager);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23193,7 +23768,7 @@ public class Airavata {
}
}
- public static class updateResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateResourceJobManager_args> {
+ public static class updateResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateResourceJobManager_args, updateResourceJobManager_result> {
public updateResourceJobManager() {
super("updateResourceJobManager");
}
@@ -23204,7 +23779,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23213,9 +23788,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateResourceJobManager_result getEmptyResultInstance() {
+ return new updateResourceJobManager_result();
+ }
+
@Override
public updateResourceJobManager_result getResult(I iface, updateResourceJobManager_args args) throws org.apache.thrift.TException {
- updateResourceJobManager_result result = new updateResourceJobManager_result();
+ updateResourceJobManager_result result = getEmptyResultInstance();
try {
result.success = iface.updateResourceJobManager(args.authzToken, args.resourceJobManagerId, args.updatedResourceJobManager);
result.setSuccessIsSet(true);
@@ -23232,7 +23812,7 @@ public class Airavata {
}
}
- public static class getResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getResourceJobManager_args> {
+ public static class getResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getResourceJobManager_args, getResourceJobManager_result> {
public getResourceJobManager() {
super("getResourceJobManager");
}
@@ -23243,7 +23823,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23252,9 +23832,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getResourceJobManager_result getEmptyResultInstance() {
+ return new getResourceJobManager_result();
+ }
+
@Override
public getResourceJobManager_result getResult(I iface, getResourceJobManager_args args) throws org.apache.thrift.TException {
- getResourceJobManager_result result = new getResourceJobManager_result();
+ getResourceJobManager_result result = getEmptyResultInstance();
try {
result.success = iface.getResourceJobManager(args.authzToken, args.resourceJobManagerId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23270,7 +23855,7 @@ public class Airavata {
}
}
- public static class deleteResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteResourceJobManager_args> {
+ public static class deleteResourceJobManager<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteResourceJobManager_args, deleteResourceJobManager_result> {
public deleteResourceJobManager() {
super("deleteResourceJobManager");
}
@@ -23281,7 +23866,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23290,9 +23875,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteResourceJobManager_result getEmptyResultInstance() {
+ return new deleteResourceJobManager_result();
+ }
+
@Override
public deleteResourceJobManager_result getResult(I iface, deleteResourceJobManager_args args) throws org.apache.thrift.TException {
- deleteResourceJobManager_result result = new deleteResourceJobManager_result();
+ deleteResourceJobManager_result result = getEmptyResultInstance();
try {
result.success = iface.deleteResourceJobManager(args.authzToken, args.resourceJobManagerId);
result.setSuccessIsSet(true);
@@ -23309,7 +23899,7 @@ public class Airavata {
}
}
- public static class deleteBatchQueue<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteBatchQueue_args> {
+ public static class deleteBatchQueue<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteBatchQueue_args, deleteBatchQueue_result> {
public deleteBatchQueue() {
super("deleteBatchQueue");
}
@@ -23320,7 +23910,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23329,9 +23919,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteBatchQueue_result getEmptyResultInstance() {
+ return new deleteBatchQueue_result();
+ }
+
@Override
public deleteBatchQueue_result getResult(I iface, deleteBatchQueue_args args) throws org.apache.thrift.TException {
- deleteBatchQueue_result result = new deleteBatchQueue_result();
+ deleteBatchQueue_result result = getEmptyResultInstance();
try {
result.success = iface.deleteBatchQueue(args.authzToken, args.computeResourceId, args.queueName);
result.setSuccessIsSet(true);
@@ -23348,7 +23943,7 @@ public class Airavata {
}
}
- public static class registerGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerGatewayResourceProfile_args> {
+ public static class registerGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerGatewayResourceProfile_args, registerGatewayResourceProfile_result> {
public registerGatewayResourceProfile() {
super("registerGatewayResourceProfile");
}
@@ -23359,7 +23954,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23368,9 +23963,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerGatewayResourceProfile_result getEmptyResultInstance() {
+ return new registerGatewayResourceProfile_result();
+ }
+
@Override
public registerGatewayResourceProfile_result getResult(I iface, registerGatewayResourceProfile_args args) throws org.apache.thrift.TException {
- registerGatewayResourceProfile_result result = new registerGatewayResourceProfile_result();
+ registerGatewayResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.registerGatewayResourceProfile(args.authzToken, args.gatewayResourceProfile);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23386,7 +23986,7 @@ public class Airavata {
}
}
- public static class getGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayResourceProfile_args> {
+ public static class getGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayResourceProfile_args, getGatewayResourceProfile_result> {
public getGatewayResourceProfile() {
super("getGatewayResourceProfile");
}
@@ -23397,7 +23997,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23406,9 +24006,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGatewayResourceProfile_result getEmptyResultInstance() {
+ return new getGatewayResourceProfile_result();
+ }
+
@Override
public getGatewayResourceProfile_result getResult(I iface, getGatewayResourceProfile_args args) throws org.apache.thrift.TException {
- getGatewayResourceProfile_result result = new getGatewayResourceProfile_result();
+ getGatewayResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.getGatewayResourceProfile(args.authzToken, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23424,7 +24029,7 @@ public class Airavata {
}
}
- public static class updateGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayResourceProfile_args> {
+ public static class updateGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayResourceProfile_args, updateGatewayResourceProfile_result> {
public updateGatewayResourceProfile() {
super("updateGatewayResourceProfile");
}
@@ -23435,7 +24040,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23444,9 +24049,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateGatewayResourceProfile_result getEmptyResultInstance() {
+ return new updateGatewayResourceProfile_result();
+ }
+
@Override
public updateGatewayResourceProfile_result getResult(I iface, updateGatewayResourceProfile_args args) throws org.apache.thrift.TException {
- updateGatewayResourceProfile_result result = new updateGatewayResourceProfile_result();
+ updateGatewayResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.updateGatewayResourceProfile(args.authzToken, args.gatewayID, args.gatewayResourceProfile);
result.setSuccessIsSet(true);
@@ -23463,7 +24073,7 @@ public class Airavata {
}
}
- public static class deleteGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayResourceProfile_args> {
+ public static class deleteGatewayResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayResourceProfile_args, deleteGatewayResourceProfile_result> {
public deleteGatewayResourceProfile() {
super("deleteGatewayResourceProfile");
}
@@ -23474,7 +24084,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23483,9 +24093,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteGatewayResourceProfile_result getEmptyResultInstance() {
+ return new deleteGatewayResourceProfile_result();
+ }
+
@Override
public deleteGatewayResourceProfile_result getResult(I iface, deleteGatewayResourceProfile_args args) throws org.apache.thrift.TException {
- deleteGatewayResourceProfile_result result = new deleteGatewayResourceProfile_result();
+ deleteGatewayResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.deleteGatewayResourceProfile(args.authzToken, args.gatewayID);
result.setSuccessIsSet(true);
@@ -23502,7 +24117,7 @@ public class Airavata {
}
}
- public static class addGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayComputeResourcePreference_args> {
+ public static class addGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayComputeResourcePreference_args, addGatewayComputeResourcePreference_result> {
public addGatewayComputeResourcePreference() {
super("addGatewayComputeResourcePreference");
}
@@ -23513,7 +24128,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23522,9 +24137,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addGatewayComputeResourcePreference_result getEmptyResultInstance() {
+ return new addGatewayComputeResourcePreference_result();
+ }
+
@Override
public addGatewayComputeResourcePreference_result getResult(I iface, addGatewayComputeResourcePreference_args args) throws org.apache.thrift.TException {
- addGatewayComputeResourcePreference_result result = new addGatewayComputeResourcePreference_result();
+ addGatewayComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.addGatewayComputeResourcePreference(args.authzToken, args.gatewayID, args.computeResourceId, args.computeResourcePreference);
result.setSuccessIsSet(true);
@@ -23541,7 +24161,7 @@ public class Airavata {
}
}
- public static class addGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayStoragePreference_args> {
+ public static class addGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayStoragePreference_args, addGatewayStoragePreference_result> {
public addGatewayStoragePreference() {
super("addGatewayStoragePreference");
}
@@ -23552,7 +24172,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23561,9 +24181,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addGatewayStoragePreference_result getEmptyResultInstance() {
+ return new addGatewayStoragePreference_result();
+ }
+
@Override
public addGatewayStoragePreference_result getResult(I iface, addGatewayStoragePreference_args args) throws org.apache.thrift.TException {
- addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
+ addGatewayStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageResourceId, args.storagePreference);
result.setSuccessIsSet(true);
@@ -23580,7 +24205,7 @@ public class Airavata {
}
}
- public static class getGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayComputeResourcePreference_args> {
+ public static class getGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayComputeResourcePreference_args, getGatewayComputeResourcePreference_result> {
public getGatewayComputeResourcePreference() {
super("getGatewayComputeResourcePreference");
}
@@ -23591,7 +24216,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23600,9 +24225,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGatewayComputeResourcePreference_result getEmptyResultInstance() {
+ return new getGatewayComputeResourcePreference_result();
+ }
+
@Override
public getGatewayComputeResourcePreference_result getResult(I iface, getGatewayComputeResourcePreference_args args) throws org.apache.thrift.TException {
- getGatewayComputeResourcePreference_result result = new getGatewayComputeResourcePreference_result();
+ getGatewayComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.getGatewayComputeResourcePreference(args.authzToken, args.gatewayID, args.computeResourceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23618,7 +24248,7 @@ public class Airavata {
}
}
- public static class getGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayStoragePreference_args> {
+ public static class getGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayStoragePreference_args, getGatewayStoragePreference_result> {
public getGatewayStoragePreference() {
super("getGatewayStoragePreference");
}
@@ -23629,7 +24259,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23638,9 +24268,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGatewayStoragePreference_result getEmptyResultInstance() {
+ return new getGatewayStoragePreference_result();
+ }
+
@Override
public getGatewayStoragePreference_result getResult(I iface, getGatewayStoragePreference_args args) throws org.apache.thrift.TException {
- getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
+ getGatewayStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageResourceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23656,7 +24291,7 @@ public class Airavata {
}
}
- public static class getAllGatewayComputeResourcePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayComputeResourcePreferences_args> {
+ public static class getAllGatewayComputeResourcePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayComputeResourcePreferences_args, getAllGatewayComputeResourcePreferences_result> {
public getAllGatewayComputeResourcePreferences() {
super("getAllGatewayComputeResourcePreferences");
}
@@ -23667,7 +24302,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23676,9 +24311,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllGatewayComputeResourcePreferences_result getEmptyResultInstance() {
+ return new getAllGatewayComputeResourcePreferences_result();
+ }
+
@Override
public getAllGatewayComputeResourcePreferences_result getResult(I iface, getAllGatewayComputeResourcePreferences_args args) throws org.apache.thrift.TException {
- getAllGatewayComputeResourcePreferences_result result = new getAllGatewayComputeResourcePreferences_result();
+ getAllGatewayComputeResourcePreferences_result result = getEmptyResultInstance();
try {
result.success = iface.getAllGatewayComputeResourcePreferences(args.authzToken, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23694,7 +24334,7 @@ public class Airavata {
}
}
- public static class getAllGatewayStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayStoragePreferences_args> {
+ public static class getAllGatewayStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayStoragePreferences_args, getAllGatewayStoragePreferences_result> {
public getAllGatewayStoragePreferences() {
super("getAllGatewayStoragePreferences");
}
@@ -23705,7 +24345,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23714,9 +24354,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllGatewayStoragePreferences_result getEmptyResultInstance() {
+ return new getAllGatewayStoragePreferences_result();
+ }
+
@Override
public getAllGatewayStoragePreferences_result getResult(I iface, getAllGatewayStoragePreferences_args args) throws org.apache.thrift.TException {
- getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
+ getAllGatewayStoragePreferences_result result = getEmptyResultInstance();
try {
result.success = iface.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23732,7 +24377,7 @@ public class Airavata {
}
}
- public static class getAllGatewayResourceProfiles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayResourceProfiles_args> {
+ public static class getAllGatewayResourceProfiles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayResourceProfiles_args, getAllGatewayResourceProfiles_result> {
public getAllGatewayResourceProfiles() {
super("getAllGatewayResourceProfiles");
}
@@ -23743,7 +24388,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23752,9 +24397,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllGatewayResourceProfiles_result getEmptyResultInstance() {
+ return new getAllGatewayResourceProfiles_result();
+ }
+
@Override
public getAllGatewayResourceProfiles_result getResult(I iface, getAllGatewayResourceProfiles_args args) throws org.apache.thrift.TException {
- getAllGatewayResourceProfiles_result result = new getAllGatewayResourceProfiles_result();
+ getAllGatewayResourceProfiles_result result = getEmptyResultInstance();
try {
result.success = iface.getAllGatewayResourceProfiles(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23770,7 +24420,7 @@ public class Airavata {
}
}
- public static class updateGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayComputeResourcePreference_args> {
+ public static class updateGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayComputeResourcePreference_args, updateGatewayComputeResourcePreference_result> {
public updateGatewayComputeResourcePreference() {
super("updateGatewayComputeResourcePreference");
}
@@ -23781,7 +24431,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23790,9 +24440,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateGatewayComputeResourcePreference_result getEmptyResultInstance() {
+ return new updateGatewayComputeResourcePreference_result();
+ }
+
@Override
public updateGatewayComputeResourcePreference_result getResult(I iface, updateGatewayComputeResourcePreference_args args) throws org.apache.thrift.TException {
- updateGatewayComputeResourcePreference_result result = new updateGatewayComputeResourcePreference_result();
+ updateGatewayComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.updateGatewayComputeResourcePreference(args.authzToken, args.gatewayID, args.computeResourceId, args.computeResourcePreference);
result.setSuccessIsSet(true);
@@ -23809,7 +24464,7 @@ public class Airavata {
}
}
- public static class updateGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayStoragePreference_args> {
+ public static class updateGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayStoragePreference_args, updateGatewayStoragePreference_result> {
public updateGatewayStoragePreference() {
super("updateGatewayStoragePreference");
}
@@ -23820,7 +24475,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23829,9 +24484,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateGatewayStoragePreference_result getEmptyResultInstance() {
+ return new updateGatewayStoragePreference_result();
+ }
+
@Override
public updateGatewayStoragePreference_result getResult(I iface, updateGatewayStoragePreference_args args) throws org.apache.thrift.TException {
- updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
+ updateGatewayStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference);
result.setSuccessIsSet(true);
@@ -23848,7 +24508,7 @@ public class Airavata {
}
}
- public static class deleteGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayComputeResourcePreference_args> {
+ public static class deleteGatewayComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayComputeResourcePreference_args, deleteGatewayComputeResourcePreference_result> {
public deleteGatewayComputeResourcePreference() {
super("deleteGatewayComputeResourcePreference");
}
@@ -23859,7 +24519,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23868,9 +24528,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteGatewayComputeResourcePreference_result getEmptyResultInstance() {
+ return new deleteGatewayComputeResourcePreference_result();
+ }
+
@Override
public deleteGatewayComputeResourcePreference_result getResult(I iface, deleteGatewayComputeResourcePreference_args args) throws org.apache.thrift.TException {
- deleteGatewayComputeResourcePreference_result result = new deleteGatewayComputeResourcePreference_result();
+ deleteGatewayComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.deleteGatewayComputeResourcePreference(args.authzToken, args.gatewayID, args.computeResourceId);
result.setSuccessIsSet(true);
@@ -23887,7 +24552,7 @@ public class Airavata {
}
}
- public static class deleteGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayStoragePreference_args> {
+ public static class deleteGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayStoragePreference_args, deleteGatewayStoragePreference_result> {
public deleteGatewayStoragePreference() {
super("deleteGatewayStoragePreference");
}
@@ -23898,7 +24563,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23907,9 +24572,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteGatewayStoragePreference_result getEmptyResultInstance() {
+ return new deleteGatewayStoragePreference_result();
+ }
+
@Override
public deleteGatewayStoragePreference_result getResult(I iface, deleteGatewayStoragePreference_args args) throws org.apache.thrift.TException {
- deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
+ deleteGatewayStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId);
result.setSuccessIsSet(true);
@@ -23926,7 +24596,7 @@ public class Airavata {
}
}
- public static class getSSHAccountProvisioners<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHAccountProvisioners_args> {
+ public static class getSSHAccountProvisioners<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHAccountProvisioners_args, getSSHAccountProvisioners_result> {
public getSSHAccountProvisioners() {
super("getSSHAccountProvisioners");
}
@@ -23937,7 +24607,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23946,9 +24616,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getSSHAccountProvisioners_result getEmptyResultInstance() {
+ return new getSSHAccountProvisioners_result();
+ }
+
@Override
public getSSHAccountProvisioners_result getResult(I iface, getSSHAccountProvisioners_args args) throws org.apache.thrift.TException {
- getSSHAccountProvisioners_result result = new getSSHAccountProvisioners_result();
+ getSSHAccountProvisioners_result result = getEmptyResultInstance();
try {
result.success = iface.getSSHAccountProvisioners(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -23964,7 +24639,7 @@ public class Airavata {
}
}
- public static class doesUserHaveSSHAccount<I extends Iface> extends org.apache.thrift.ProcessFunction<I, doesUserHaveSSHAccount_args> {
+ public static class doesUserHaveSSHAccount<I extends Iface> extends org.apache.thrift.ProcessFunction<I, doesUserHaveSSHAccount_args, doesUserHaveSSHAccount_result> {
public doesUserHaveSSHAccount() {
super("doesUserHaveSSHAccount");
}
@@ -23975,7 +24650,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -23984,9 +24659,14 @@ public class Airavata {
return false;
}
+ @Override
+ public doesUserHaveSSHAccount_result getEmptyResultInstance() {
+ return new doesUserHaveSSHAccount_result();
+ }
+
@Override
public doesUserHaveSSHAccount_result getResult(I iface, doesUserHaveSSHAccount_args args) throws org.apache.thrift.TException {
- doesUserHaveSSHAccount_result result = new doesUserHaveSSHAccount_result();
+ doesUserHaveSSHAccount_result result = getEmptyResultInstance();
try {
result.success = iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, args.userId);
result.setSuccessIsSet(true);
@@ -24003,7 +24683,7 @@ public class Airavata {
}
}
- public static class isSSHSetupCompleteForUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isSSHSetupCompleteForUserComputeResourcePreference_args> {
+ public static class isSSHSetupCompleteForUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isSSHSetupCompleteForUserComputeResourcePreference_args, isSSHSetupCompleteForUserComputeResourcePreference_result> {
public isSSHSetupCompleteForUserComputeResourcePreference() {
super("isSSHSetupCompleteForUserComputeResourcePreference");
}
@@ -24014,7 +24694,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24023,9 +24703,14 @@ public class Airavata {
return false;
}
+ @Override
+ public isSSHSetupCompleteForUserComputeResourcePreference_result getEmptyResultInstance() {
+ return new isSSHSetupCompleteForUserComputeResourcePreference_result();
+ }
+
@Override
public isSSHSetupCompleteForUserComputeResourcePreference_result getResult(I iface, isSSHSetupCompleteForUserComputeResourcePreference_args args) throws org.apache.thrift.TException {
- isSSHSetupCompleteForUserComputeResourcePreference_result result = new isSSHSetupCompleteForUserComputeResourcePreference_result();
+ isSSHSetupCompleteForUserComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.isSSHSetupCompleteForUserComputeResourcePreference(args.authzToken, args.computeResourceId, args.airavataCredStoreToken);
result.setSuccessIsSet(true);
@@ -24042,7 +24727,7 @@ public class Airavata {
}
}
- public static class setupUserComputeResourcePreferencesForSSH<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setupUserComputeResourcePreferencesForSSH_args> {
+ public static class setupUserComputeResourcePreferencesForSSH<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setupUserComputeResourcePreferencesForSSH_args, setupUserComputeResourcePreferencesForSSH_result> {
public setupUserComputeResourcePreferencesForSSH() {
super("setupUserComputeResourcePreferencesForSSH");
}
@@ -24053,7 +24738,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24062,9 +24747,14 @@ public class Airavata {
return false;
}
+ @Override
+ public setupUserComputeResourcePreferencesForSSH_result getEmptyResultInstance() {
+ return new setupUserComputeResourcePreferencesForSSH_result();
+ }
+
@Override
public setupUserComputeResourcePreferencesForSSH_result getResult(I iface, setupUserComputeResourcePreferencesForSSH_args args) throws org.apache.thrift.TException {
- setupUserComputeResourcePreferencesForSSH_result result = new setupUserComputeResourcePreferencesForSSH_result();
+ setupUserComputeResourcePreferencesForSSH_result result = getEmptyResultInstance();
try {
result.success = iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, args.computeResourceId, args.userId, args.airavataCredStoreToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24080,7 +24770,7 @@ public class Airavata {
}
}
- public static class registerUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerUserResourceProfile_args> {
+ public static class registerUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerUserResourceProfile_args, registerUserResourceProfile_result> {
public registerUserResourceProfile() {
super("registerUserResourceProfile");
}
@@ -24091,7 +24781,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24100,9 +24790,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerUserResourceProfile_result getEmptyResultInstance() {
+ return new registerUserResourceProfile_result();
+ }
+
@Override
public registerUserResourceProfile_result getResult(I iface, registerUserResourceProfile_args args) throws org.apache.thrift.TException {
- registerUserResourceProfile_result result = new registerUserResourceProfile_result();
+ registerUserResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.registerUserResourceProfile(args.authzToken, args.userResourceProfile);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24118,7 +24813,7 @@ public class Airavata {
}
}
- public static class isUserResourceProfileExists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isUserResourceProfileExists_args> {
+ public static class isUserResourceProfileExists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isUserResourceProfileExists_args, isUserResourceProfileExists_result> {
public isUserResourceProfileExists() {
super("isUserResourceProfileExists");
}
@@ -24129,7 +24824,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24138,9 +24833,14 @@ public class Airavata {
return false;
}
+ @Override
+ public isUserResourceProfileExists_result getEmptyResultInstance() {
+ return new isUserResourceProfileExists_result();
+ }
+
@Override
public isUserResourceProfileExists_result getResult(I iface, isUserResourceProfileExists_args args) throws org.apache.thrift.TException {
- isUserResourceProfileExists_result result = new isUserResourceProfileExists_result();
+ isUserResourceProfileExists_result result = getEmptyResultInstance();
try {
result.success = iface.isUserResourceProfileExists(args.authzToken, args.userId, args.gatewayID);
result.setSuccessIsSet(true);
@@ -24157,7 +24857,7 @@ public class Airavata {
}
}
- public static class getUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserResourceProfile_args> {
+ public static class getUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserResourceProfile_args, getUserResourceProfile_result> {
public getUserResourceProfile() {
super("getUserResourceProfile");
}
@@ -24168,7 +24868,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24177,9 +24877,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUserResourceProfile_result getEmptyResultInstance() {
+ return new getUserResourceProfile_result();
+ }
+
@Override
public getUserResourceProfile_result getResult(I iface, getUserResourceProfile_args args) throws org.apache.thrift.TException {
- getUserResourceProfile_result result = new getUserResourceProfile_result();
+ getUserResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.getUserResourceProfile(args.authzToken, args.userId, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24195,7 +24900,7 @@ public class Airavata {
}
}
- public static class updateUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUserResourceProfile_args> {
+ public static class updateUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUserResourceProfile_args, updateUserResourceProfile_result> {
public updateUserResourceProfile() {
super("updateUserResourceProfile");
}
@@ -24206,7 +24911,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24215,9 +24920,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateUserResourceProfile_result getEmptyResultInstance() {
+ return new updateUserResourceProfile_result();
+ }
+
@Override
public updateUserResourceProfile_result getResult(I iface, updateUserResourceProfile_args args) throws org.apache.thrift.TException {
- updateUserResourceProfile_result result = new updateUserResourceProfile_result();
+ updateUserResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.updateUserResourceProfile(args.authzToken, args.userId, args.gatewayID, args.userResourceProfile);
result.setSuccessIsSet(true);
@@ -24234,7 +24944,7 @@ public class Airavata {
}
}
- public static class deleteUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteUserResourceProfile_args> {
+ public static class deleteUserResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteUserResourceProfile_args, deleteUserResourceProfile_result> {
public deleteUserResourceProfile() {
super("deleteUserResourceProfile");
}
@@ -24245,7 +24955,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24254,9 +24964,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteUserResourceProfile_result getEmptyResultInstance() {
+ return new deleteUserResourceProfile_result();
+ }
+
@Override
public deleteUserResourceProfile_result getResult(I iface, deleteUserResourceProfile_args args) throws org.apache.thrift.TException {
- deleteUserResourceProfile_result result = new deleteUserResourceProfile_result();
+ deleteUserResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.deleteUserResourceProfile(args.authzToken, args.userId, args.gatewayID);
result.setSuccessIsSet(true);
@@ -24273,7 +24988,7 @@ public class Airavata {
}
}
- public static class addUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUserComputeResourcePreference_args> {
+ public static class addUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUserComputeResourcePreference_args, addUserComputeResourcePreference_result> {
public addUserComputeResourcePreference() {
super("addUserComputeResourcePreference");
}
@@ -24284,7 +24999,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24293,9 +25008,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addUserComputeResourcePreference_result getEmptyResultInstance() {
+ return new addUserComputeResourcePreference_result();
+ }
+
@Override
public addUserComputeResourcePreference_result getResult(I iface, addUserComputeResourcePreference_args args) throws org.apache.thrift.TException {
- addUserComputeResourcePreference_result result = new addUserComputeResourcePreference_result();
+ addUserComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.addUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId, args.userComputeResourcePreference);
result.setSuccessIsSet(true);
@@ -24312,7 +25032,7 @@ public class Airavata {
}
}
- public static class addUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUserStoragePreference_args> {
+ public static class addUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUserStoragePreference_args, addUserStoragePreference_result> {
public addUserStoragePreference() {
super("addUserStoragePreference");
}
@@ -24323,7 +25043,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24332,9 +25052,14 @@ public class Airavata {
return false;
}
+ @Override
+ public addUserStoragePreference_result getEmptyResultInstance() {
+ return new addUserStoragePreference_result();
+ }
+
@Override
public addUserStoragePreference_result getResult(I iface, addUserStoragePreference_args args) throws org.apache.thrift.TException {
- addUserStoragePreference_result result = new addUserStoragePreference_result();
+ addUserStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.addUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId, args.userStoragePreference);
result.setSuccessIsSet(true);
@@ -24351,7 +25076,7 @@ public class Airavata {
}
}
- public static class getUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserComputeResourcePreference_args> {
+ public static class getUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserComputeResourcePreference_args, getUserComputeResourcePreference_result> {
public getUserComputeResourcePreference() {
super("getUserComputeResourcePreference");
}
@@ -24362,7 +25087,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24371,9 +25096,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUserComputeResourcePreference_result getEmptyResultInstance() {
+ return new getUserComputeResourcePreference_result();
+ }
+
@Override
public getUserComputeResourcePreference_result getResult(I iface, getUserComputeResourcePreference_args args) throws org.apache.thrift.TException {
- getUserComputeResourcePreference_result result = new getUserComputeResourcePreference_result();
+ getUserComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.getUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24389,7 +25119,7 @@ public class Airavata {
}
}
- public static class getUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserStoragePreference_args> {
+ public static class getUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserStoragePreference_args, getUserStoragePreference_result> {
public getUserStoragePreference() {
super("getUserStoragePreference");
}
@@ -24400,7 +25130,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24409,9 +25139,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getUserStoragePreference_result getEmptyResultInstance() {
+ return new getUserStoragePreference_result();
+ }
+
@Override
public getUserStoragePreference_result getResult(I iface, getUserStoragePreference_args args) throws org.apache.thrift.TException {
- getUserStoragePreference_result result = new getUserStoragePreference_result();
+ getUserStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.getUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24427,7 +25162,7 @@ public class Airavata {
}
}
- public static class getAllUserComputeResourcePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUserComputeResourcePreferences_args> {
+ public static class getAllUserComputeResourcePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUserComputeResourcePreferences_args, getAllUserComputeResourcePreferences_result> {
public getAllUserComputeResourcePreferences() {
super("getAllUserComputeResourcePreferences");
}
@@ -24438,7 +25173,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24447,9 +25182,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllUserComputeResourcePreferences_result getEmptyResultInstance() {
+ return new getAllUserComputeResourcePreferences_result();
+ }
+
@Override
public getAllUserComputeResourcePreferences_result getResult(I iface, getAllUserComputeResourcePreferences_args args) throws org.apache.thrift.TException {
- getAllUserComputeResourcePreferences_result result = new getAllUserComputeResourcePreferences_result();
+ getAllUserComputeResourcePreferences_result result = getEmptyResultInstance();
try {
result.success = iface.getAllUserComputeResourcePreferences(args.authzToken, args.userId, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24465,7 +25205,7 @@ public class Airavata {
}
}
- public static class getAllUserStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUserStoragePreferences_args> {
+ public static class getAllUserStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUserStoragePreferences_args, getAllUserStoragePreferences_result> {
public getAllUserStoragePreferences() {
super("getAllUserStoragePreferences");
}
@@ -24476,7 +25216,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24485,9 +25225,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllUserStoragePreferences_result getEmptyResultInstance() {
+ return new getAllUserStoragePreferences_result();
+ }
+
@Override
public getAllUserStoragePreferences_result getResult(I iface, getAllUserStoragePreferences_args args) throws org.apache.thrift.TException {
- getAllUserStoragePreferences_result result = new getAllUserStoragePreferences_result();
+ getAllUserStoragePreferences_result result = getEmptyResultInstance();
try {
result.success = iface.getAllUserStoragePreferences(args.authzToken, args.userId, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24503,7 +25248,7 @@ public class Airavata {
}
}
- public static class getAllUserResourceProfiles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUserResourceProfiles_args> {
+ public static class getAllUserResourceProfiles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUserResourceProfiles_args, getAllUserResourceProfiles_result> {
public getAllUserResourceProfiles() {
super("getAllUserResourceProfiles");
}
@@ -24514,7 +25259,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24523,9 +25268,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllUserResourceProfiles_result getEmptyResultInstance() {
+ return new getAllUserResourceProfiles_result();
+ }
+
@Override
public getAllUserResourceProfiles_result getResult(I iface, getAllUserResourceProfiles_args args) throws org.apache.thrift.TException {
- getAllUserResourceProfiles_result result = new getAllUserResourceProfiles_result();
+ getAllUserResourceProfiles_result result = getEmptyResultInstance();
try {
result.success = iface.getAllUserResourceProfiles(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24541,7 +25291,7 @@ public class Airavata {
}
}
- public static class updateUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUserComputeResourcePreference_args> {
+ public static class updateUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUserComputeResourcePreference_args, updateUserComputeResourcePreference_result> {
public updateUserComputeResourcePreference() {
super("updateUserComputeResourcePreference");
}
@@ -24552,7 +25302,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24561,9 +25311,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateUserComputeResourcePreference_result getEmptyResultInstance() {
+ return new updateUserComputeResourcePreference_result();
+ }
+
@Override
public updateUserComputeResourcePreference_result getResult(I iface, updateUserComputeResourcePreference_args args) throws org.apache.thrift.TException {
- updateUserComputeResourcePreference_result result = new updateUserComputeResourcePreference_result();
+ updateUserComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.updateUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId, args.userComputeResourcePreference);
result.setSuccessIsSet(true);
@@ -24580,7 +25335,7 @@ public class Airavata {
}
}
- public static class updateUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUserStoragePreference_args> {
+ public static class updateUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUserStoragePreference_args, updateUserStoragePreference_result> {
public updateUserStoragePreference() {
super("updateUserStoragePreference");
}
@@ -24591,7 +25346,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24600,9 +25355,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateUserStoragePreference_result getEmptyResultInstance() {
+ return new updateUserStoragePreference_result();
+ }
+
@Override
public updateUserStoragePreference_result getResult(I iface, updateUserStoragePreference_args args) throws org.apache.thrift.TException {
- updateUserStoragePreference_result result = new updateUserStoragePreference_result();
+ updateUserStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.updateUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageId, args.userStoragePreference);
result.setSuccessIsSet(true);
@@ -24619,7 +25379,7 @@ public class Airavata {
}
}
- public static class deleteUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteUserComputeResourcePreference_args> {
+ public static class deleteUserComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteUserComputeResourcePreference_args, deleteUserComputeResourcePreference_result> {
public deleteUserComputeResourcePreference() {
super("deleteUserComputeResourcePreference");
}
@@ -24630,7 +25390,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24639,9 +25399,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteUserComputeResourcePreference_result getEmptyResultInstance() {
+ return new deleteUserComputeResourcePreference_result();
+ }
+
@Override
public deleteUserComputeResourcePreference_result getResult(I iface, deleteUserComputeResourcePreference_args args) throws org.apache.thrift.TException {
- deleteUserComputeResourcePreference_result result = new deleteUserComputeResourcePreference_result();
+ deleteUserComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.deleteUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId);
result.setSuccessIsSet(true);
@@ -24658,7 +25423,7 @@ public class Airavata {
}
}
- public static class deleteUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteUserStoragePreference_args> {
+ public static class deleteUserStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteUserStoragePreference_args, deleteUserStoragePreference_result> {
public deleteUserStoragePreference() {
super("deleteUserStoragePreference");
}
@@ -24669,7 +25434,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24678,9 +25443,14 @@ public class Airavata {
return false;
}
+ @Override
+ public deleteUserStoragePreference_result getEmptyResultInstance() {
+ return new deleteUserStoragePreference_result();
+ }
+
@Override
public deleteUserStoragePreference_result getResult(I iface, deleteUserStoragePreference_args args) throws org.apache.thrift.TException {
- deleteUserStoragePreference_result result = new deleteUserStoragePreference_result();
+ deleteUserStoragePreference_result result = getEmptyResultInstance();
try {
result.success = iface.deleteUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageId);
result.setSuccessIsSet(true);
@@ -24697,7 +25467,7 @@ public class Airavata {
}
}
- public static class getLatestQueueStatuses<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLatestQueueStatuses_args> {
+ public static class getLatestQueueStatuses<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLatestQueueStatuses_args, getLatestQueueStatuses_result> {
public getLatestQueueStatuses() {
super("getLatestQueueStatuses");
}
@@ -24708,7 +25478,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24717,9 +25487,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getLatestQueueStatuses_result getEmptyResultInstance() {
+ return new getLatestQueueStatuses_result();
+ }
+
@Override
public getLatestQueueStatuses_result getResult(I iface, getLatestQueueStatuses_args args) throws org.apache.thrift.TException {
- getLatestQueueStatuses_result result = new getLatestQueueStatuses_result();
+ getLatestQueueStatuses_result result = getEmptyResultInstance();
try {
result.success = iface.getLatestQueueStatuses(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24735,7 +25510,7 @@ public class Airavata {
}
}
- public static class registerDataProduct<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerDataProduct_args> {
+ public static class registerDataProduct<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerDataProduct_args, registerDataProduct_result> {
public registerDataProduct() {
super("registerDataProduct");
}
@@ -24746,7 +25521,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24755,9 +25530,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerDataProduct_result getEmptyResultInstance() {
+ return new registerDataProduct_result();
+ }
+
@Override
public registerDataProduct_result getResult(I iface, registerDataProduct_args args) throws org.apache.thrift.TException {
- registerDataProduct_result result = new registerDataProduct_result();
+ registerDataProduct_result result = getEmptyResultInstance();
try {
result.success = iface.registerDataProduct(args.authzToken, args.dataProductModel);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24773,7 +25553,7 @@ public class Airavata {
}
}
- public static class getDataProduct<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDataProduct_args> {
+ public static class getDataProduct<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDataProduct_args, getDataProduct_result> {
public getDataProduct() {
super("getDataProduct");
}
@@ -24784,7 +25564,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24793,9 +25573,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getDataProduct_result getEmptyResultInstance() {
+ return new getDataProduct_result();
+ }
+
@Override
public getDataProduct_result getResult(I iface, getDataProduct_args args) throws org.apache.thrift.TException {
- getDataProduct_result result = new getDataProduct_result();
+ getDataProduct_result result = getEmptyResultInstance();
try {
result.success = iface.getDataProduct(args.authzToken, args.dataProductUri);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24811,7 +25596,7 @@ public class Airavata {
}
}
- public static class registerReplicaLocation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerReplicaLocation_args> {
+ public static class registerReplicaLocation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerReplicaLocation_args, registerReplicaLocation_result> {
public registerReplicaLocation() {
super("registerReplicaLocation");
}
@@ -24822,7 +25607,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24831,9 +25616,14 @@ public class Airavata {
return false;
}
+ @Override
+ public registerReplicaLocation_result getEmptyResultInstance() {
+ return new registerReplicaLocation_result();
+ }
+
@Override
public registerReplicaLocation_result getResult(I iface, registerReplicaLocation_args args) throws org.apache.thrift.TException {
- registerReplicaLocation_result result = new registerReplicaLocation_result();
+ registerReplicaLocation_result result = getEmptyResultInstance();
try {
result.success = iface.registerReplicaLocation(args.authzToken, args.replicaLocationModel);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24849,7 +25639,7 @@ public class Airavata {
}
}
- public static class getParentDataProduct<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParentDataProduct_args> {
+ public static class getParentDataProduct<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParentDataProduct_args, getParentDataProduct_result> {
public getParentDataProduct() {
super("getParentDataProduct");
}
@@ -24860,7 +25650,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24869,9 +25659,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getParentDataProduct_result getEmptyResultInstance() {
+ return new getParentDataProduct_result();
+ }
+
@Override
public getParentDataProduct_result getResult(I iface, getParentDataProduct_args args) throws org.apache.thrift.TException {
- getParentDataProduct_result result = new getParentDataProduct_result();
+ getParentDataProduct_result result = getEmptyResultInstance();
try {
result.success = iface.getParentDataProduct(args.authzToken, args.productUri);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24887,7 +25682,7 @@ public class Airavata {
}
}
- public static class getChildDataProducts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getChildDataProducts_args> {
+ public static class getChildDataProducts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getChildDataProducts_args, getChildDataProducts_result> {
public getChildDataProducts() {
super("getChildDataProducts");
}
@@ -24898,7 +25693,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24907,9 +25702,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getChildDataProducts_result getEmptyResultInstance() {
+ return new getChildDataProducts_result();
+ }
+
@Override
public getChildDataProducts_result getResult(I iface, getChildDataProducts_args args) throws org.apache.thrift.TException {
- getChildDataProducts_result result = new getChildDataProducts_result();
+ getChildDataProducts_result result = getEmptyResultInstance();
try {
result.success = iface.getChildDataProducts(args.authzToken, args.productUri);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -24925,7 +25725,7 @@ public class Airavata {
}
}
- public static class shareResourceWithUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shareResourceWithUsers_args> {
+ public static class shareResourceWithUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shareResourceWithUsers_args, shareResourceWithUsers_result> {
public shareResourceWithUsers() {
super("shareResourceWithUsers");
}
@@ -24936,7 +25736,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24945,9 +25745,14 @@ public class Airavata {
return false;
}
+ @Override
+ public shareResourceWithUsers_result getEmptyResultInstance() {
+ return new shareResourceWithUsers_result();
+ }
+
@Override
public shareResourceWithUsers_result getResult(I iface, shareResourceWithUsers_args args) throws org.apache.thrift.TException {
- shareResourceWithUsers_result result = new shareResourceWithUsers_result();
+ shareResourceWithUsers_result result = getEmptyResultInstance();
try {
result.success = iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.userPermissionList);
result.setSuccessIsSet(true);
@@ -24964,7 +25769,7 @@ public class Airavata {
}
}
- public static class shareResourceWithGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shareResourceWithGroups_args> {
+ public static class shareResourceWithGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shareResourceWithGroups_args, shareResourceWithGroups_result> {
public shareResourceWithGroups() {
super("shareResourceWithGroups");
}
@@ -24975,7 +25780,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -24984,9 +25789,14 @@ public class Airavata {
return false;
}
+ @Override
+ public shareResourceWithGroups_result getEmptyResultInstance() {
+ return new shareResourceWithGroups_result();
+ }
+
@Override
public shareResourceWithGroups_result getResult(I iface, shareResourceWithGroups_args args) throws org.apache.thrift.TException {
- shareResourceWithGroups_result result = new shareResourceWithGroups_result();
+ shareResourceWithGroups_result result = getEmptyResultInstance();
try {
result.success = iface.shareResourceWithGroups(args.authzToken, args.resourceId, args.groupPermissionList);
result.setSuccessIsSet(true);
@@ -25003,7 +25813,7 @@ public class Airavata {
}
}
- public static class revokeSharingOfResourceFromUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revokeSharingOfResourceFromUsers_args> {
+ public static class revokeSharingOfResourceFromUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revokeSharingOfResourceFromUsers_args, revokeSharingOfResourceFromUsers_result> {
public revokeSharingOfResourceFromUsers() {
super("revokeSharingOfResourceFromUsers");
}
@@ -25014,7 +25824,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25023,9 +25833,14 @@ public class Airavata {
return false;
}
+ @Override
+ public revokeSharingOfResourceFromUsers_result getEmptyResultInstance() {
+ return new revokeSharingOfResourceFromUsers_result();
+ }
+
@Override
public revokeSharingOfResourceFromUsers_result getResult(I iface, revokeSharingOfResourceFromUsers_args args) throws org.apache.thrift.TException {
- revokeSharingOfResourceFromUsers_result result = new revokeSharingOfResourceFromUsers_result();
+ revokeSharingOfResourceFromUsers_result result = getEmptyResultInstance();
try {
result.success = iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.userPermissionList);
result.setSuccessIsSet(true);
@@ -25042,7 +25857,7 @@ public class Airavata {
}
}
- public static class revokeSharingOfResourceFromGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revokeSharingOfResourceFromGroups_args> {
+ public static class revokeSharingOfResourceFromGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revokeSharingOfResourceFromGroups_args, revokeSharingOfResourceFromGroups_result> {
public revokeSharingOfResourceFromGroups() {
super("revokeSharingOfResourceFromGroups");
}
@@ -25053,7 +25868,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25062,9 +25877,14 @@ public class Airavata {
return false;
}
+ @Override
+ public revokeSharingOfResourceFromGroups_result getEmptyResultInstance() {
+ return new revokeSharingOfResourceFromGroups_result();
+ }
+
@Override
public revokeSharingOfResourceFromGroups_result getResult(I iface, revokeSharingOfResourceFromGroups_args args) throws org.apache.thrift.TException {
- revokeSharingOfResourceFromGroups_result result = new revokeSharingOfResourceFromGroups_result();
+ revokeSharingOfResourceFromGroups_result result = getEmptyResultInstance();
try {
result.success = iface.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.groupPermissionList);
result.setSuccessIsSet(true);
@@ -25081,7 +25901,7 @@ public class Airavata {
}
}
- public static class getAllAccessibleUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAccessibleUsers_args> {
+ public static class getAllAccessibleUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAccessibleUsers_args, getAllAccessibleUsers_result> {
public getAllAccessibleUsers() {
super("getAllAccessibleUsers");
}
@@ -25092,7 +25912,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25101,9 +25921,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllAccessibleUsers_result getEmptyResultInstance() {
+ return new getAllAccessibleUsers_result();
+ }
+
@Override
public getAllAccessibleUsers_result getResult(I iface, getAllAccessibleUsers_args args) throws org.apache.thrift.TException {
- getAllAccessibleUsers_result result = new getAllAccessibleUsers_result();
+ getAllAccessibleUsers_result result = getEmptyResultInstance();
try {
result.success = iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.permissionType);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25119,7 +25944,7 @@ public class Airavata {
}
}
- public static class getAllAccessibleGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAccessibleGroups_args> {
+ public static class getAllAccessibleGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAccessibleGroups_args, getAllAccessibleGroups_result> {
public getAllAccessibleGroups() {
super("getAllAccessibleGroups");
}
@@ -25130,7 +25955,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25139,9 +25964,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllAccessibleGroups_result getEmptyResultInstance() {
+ return new getAllAccessibleGroups_result();
+ }
+
@Override
public getAllAccessibleGroups_result getResult(I iface, getAllAccessibleGroups_args args) throws org.apache.thrift.TException {
- getAllAccessibleGroups_result result = new getAllAccessibleGroups_result();
+ getAllAccessibleGroups_result result = getEmptyResultInstance();
try {
result.success = iface.getAllAccessibleGroups(args.authzToken, args.resourceId, args.permissionType);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25157,7 +25987,7 @@ public class Airavata {
}
}
- public static class getAllDirectlyAccessibleUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllDirectlyAccessibleUsers_args> {
+ public static class getAllDirectlyAccessibleUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllDirectlyAccessibleUsers_args, getAllDirectlyAccessibleUsers_result> {
public getAllDirectlyAccessibleUsers() {
super("getAllDirectlyAccessibleUsers");
}
@@ -25168,7 +25998,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25177,9 +26007,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllDirectlyAccessibleUsers_result getEmptyResultInstance() {
+ return new getAllDirectlyAccessibleUsers_result();
+ }
+
@Override
public getAllDirectlyAccessibleUsers_result getResult(I iface, getAllDirectlyAccessibleUsers_args args) throws org.apache.thrift.TException {
- getAllDirectlyAccessibleUsers_result result = new getAllDirectlyAccessibleUsers_result();
+ getAllDirectlyAccessibleUsers_result result = getEmptyResultInstance();
try {
result.success = iface.getAllDirectlyAccessibleUsers(args.authzToken, args.resourceId, args.permissionType);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25195,7 +26030,7 @@ public class Airavata {
}
}
- public static class getAllDirectlyAccessibleGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllDirectlyAccessibleGroups_args> {
+ public static class getAllDirectlyAccessibleGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllDirectlyAccessibleGroups_args, getAllDirectlyAccessibleGroups_result> {
public getAllDirectlyAccessibleGroups() {
super("getAllDirectlyAccessibleGroups");
}
@@ -25206,7 +26041,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25215,9 +26050,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getAllDirectlyAccessibleGroups_result getEmptyResultInstance() {
+ return new getAllDirectlyAccessibleGroups_result();
+ }
+
@Override
public getAllDirectlyAccessibleGroups_result getResult(I iface, getAllDirectlyAccessibleGroups_args args) throws org.apache.thrift.TException {
- getAllDirectlyAccessibleGroups_result result = new getAllDirectlyAccessibleGroups_result();
+ getAllDirectlyAccessibleGroups_result result = getEmptyResultInstance();
try {
result.success = iface.getAllDirectlyAccessibleGroups(args.authzToken, args.resourceId, args.permissionType);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25233,7 +26073,7 @@ public class Airavata {
}
}
- public static class userHasAccess<I extends Iface> extends org.apache.thrift.ProcessFunction<I, userHasAccess_args> {
+ public static class userHasAccess<I extends Iface> extends org.apache.thrift.ProcessFunction<I, userHasAccess_args, userHasAccess_result> {
public userHasAccess() {
super("userHasAccess");
}
@@ -25244,7 +26084,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25253,9 +26093,14 @@ public class Airavata {
return false;
}
+ @Override
+ public userHasAccess_result getEmptyResultInstance() {
+ return new userHasAccess_result();
+ }
+
@Override
public userHasAccess_result getResult(I iface, userHasAccess_args args) throws org.apache.thrift.TException {
- userHasAccess_result result = new userHasAccess_result();
+ userHasAccess_result result = getEmptyResultInstance();
try {
result.success = iface.userHasAccess(args.authzToken, args.resourceId, args.permissionType);
result.setSuccessIsSet(true);
@@ -25272,7 +26117,7 @@ public class Airavata {
}
}
- public static class createGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createGroupResourceProfile_args> {
+ public static class createGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createGroupResourceProfile_args, createGroupResourceProfile_result> {
public createGroupResourceProfile() {
super("createGroupResourceProfile");
}
@@ -25283,7 +26128,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25292,9 +26137,14 @@ public class Airavata {
return false;
}
+ @Override
+ public createGroupResourceProfile_result getEmptyResultInstance() {
+ return new createGroupResourceProfile_result();
+ }
+
@Override
public createGroupResourceProfile_result getResult(I iface, createGroupResourceProfile_args args) throws org.apache.thrift.TException {
- createGroupResourceProfile_result result = new createGroupResourceProfile_result();
+ createGroupResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.createGroupResourceProfile(args.authzToken, args.groupResourceProfile);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25310,7 +26160,7 @@ public class Airavata {
}
}
- public static class updateGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGroupResourceProfile_args> {
+ public static class updateGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGroupResourceProfile_args, updateGroupResourceProfile_result> {
public updateGroupResourceProfile() {
super("updateGroupResourceProfile");
}
@@ -25321,7 +26171,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25330,9 +26180,14 @@ public class Airavata {
return false;
}
+ @Override
+ public updateGroupResourceProfile_result getEmptyResultInstance() {
+ return new updateGroupResourceProfile_result();
+ }
+
@Override
public updateGroupResourceProfile_result getResult(I iface, updateGroupResourceProfile_args args) throws org.apache.thrift.TException {
- updateGroupResourceProfile_result result = new updateGroupResourceProfile_result();
+ updateGroupResourceProfile_result result = getEmptyResultInstance();
try {
iface.updateGroupResourceProfile(args.authzToken, args.groupResourceProfile);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25348,7 +26203,7 @@ public class Airavata {
}
}
- public static class getGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupResourceProfile_args> {
+ public static class getGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupResourceProfile_args, getGroupResourceProfile_result> {
public getGroupResourceProfile() {
super("getGroupResourceProfile");
}
@@ -25359,7 +26214,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25368,9 +26223,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupResourceProfile_result getEmptyResultInstance() {
+ return new getGroupResourceProfile_result();
+ }
+
@Override
public getGroupResourceProfile_result getResult(I iface, getGroupResourceProfile_args args) throws org.apache.thrift.TException {
- getGroupResourceProfile_result result = new getGroupResourceProfile_result();
+ getGroupResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupResourceProfile(args.authzToken, args.groupResourceProfileId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25386,7 +26246,7 @@ public class Airavata {
}
}
- public static class removeGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupResourceProfile_args> {
+ public static class removeGroupResourceProfile<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupResourceProfile_args, removeGroupResourceProfile_result> {
public removeGroupResourceProfile() {
super("removeGroupResourceProfile");
}
@@ -25397,7 +26257,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25406,9 +26266,14 @@ public class Airavata {
return false;
}
+ @Override
+ public removeGroupResourceProfile_result getEmptyResultInstance() {
+ return new removeGroupResourceProfile_result();
+ }
+
@Override
public removeGroupResourceProfile_result getResult(I iface, removeGroupResourceProfile_args args) throws org.apache.thrift.TException {
- removeGroupResourceProfile_result result = new removeGroupResourceProfile_result();
+ removeGroupResourceProfile_result result = getEmptyResultInstance();
try {
result.success = iface.removeGroupResourceProfile(args.authzToken, args.groupResourceProfileId);
result.setSuccessIsSet(true);
@@ -25425,7 +26290,7 @@ public class Airavata {
}
}
- public static class getGroupResourceList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupResourceList_args> {
+ public static class getGroupResourceList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupResourceList_args, getGroupResourceList_result> {
public getGroupResourceList() {
super("getGroupResourceList");
}
@@ -25436,7 +26301,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25445,9 +26310,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupResourceList_result getEmptyResultInstance() {
+ return new getGroupResourceList_result();
+ }
+
@Override
public getGroupResourceList_result getResult(I iface, getGroupResourceList_args args) throws org.apache.thrift.TException {
- getGroupResourceList_result result = new getGroupResourceList_result();
+ getGroupResourceList_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupResourceList(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25463,7 +26333,7 @@ public class Airavata {
}
}
- public static class removeGroupComputePrefs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupComputePrefs_args> {
+ public static class removeGroupComputePrefs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupComputePrefs_args, removeGroupComputePrefs_result> {
public removeGroupComputePrefs() {
super("removeGroupComputePrefs");
}
@@ -25474,7 +26344,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25483,9 +26353,14 @@ public class Airavata {
return false;
}
+ @Override
+ public removeGroupComputePrefs_result getEmptyResultInstance() {
+ return new removeGroupComputePrefs_result();
+ }
+
@Override
public removeGroupComputePrefs_result getResult(I iface, removeGroupComputePrefs_args args) throws org.apache.thrift.TException {
- removeGroupComputePrefs_result result = new removeGroupComputePrefs_result();
+ removeGroupComputePrefs_result result = getEmptyResultInstance();
try {
result.success = iface.removeGroupComputePrefs(args.authzToken, args.computeResourceId, args.groupResourceProfileId);
result.setSuccessIsSet(true);
@@ -25502,7 +26377,7 @@ public class Airavata {
}
}
- public static class removeGroupComputeResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupComputeResourcePolicy_args> {
+ public static class removeGroupComputeResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupComputeResourcePolicy_args, removeGroupComputeResourcePolicy_result> {
public removeGroupComputeResourcePolicy() {
super("removeGroupComputeResourcePolicy");
}
@@ -25513,7 +26388,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25522,9 +26397,14 @@ public class Airavata {
return false;
}
+ @Override
+ public removeGroupComputeResourcePolicy_result getEmptyResultInstance() {
+ return new removeGroupComputeResourcePolicy_result();
+ }
+
@Override
public removeGroupComputeResourcePolicy_result getResult(I iface, removeGroupComputeResourcePolicy_args args) throws org.apache.thrift.TException {
- removeGroupComputeResourcePolicy_result result = new removeGroupComputeResourcePolicy_result();
+ removeGroupComputeResourcePolicy_result result = getEmptyResultInstance();
try {
result.success = iface.removeGroupComputeResourcePolicy(args.authzToken, args.resourcePolicyId);
result.setSuccessIsSet(true);
@@ -25541,7 +26421,7 @@ public class Airavata {
}
}
- public static class removeGroupBatchQueueResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupBatchQueueResourcePolicy_args> {
+ public static class removeGroupBatchQueueResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeGroupBatchQueueResourcePolicy_args, removeGroupBatchQueueResourcePolicy_result> {
public removeGroupBatchQueueResourcePolicy() {
super("removeGroupBatchQueueResourcePolicy");
}
@@ -25552,7 +26432,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25561,9 +26441,14 @@ public class Airavata {
return false;
}
+ @Override
+ public removeGroupBatchQueueResourcePolicy_result getEmptyResultInstance() {
+ return new removeGroupBatchQueueResourcePolicy_result();
+ }
+
@Override
public removeGroupBatchQueueResourcePolicy_result getResult(I iface, removeGroupBatchQueueResourcePolicy_args args) throws org.apache.thrift.TException {
- removeGroupBatchQueueResourcePolicy_result result = new removeGroupBatchQueueResourcePolicy_result();
+ removeGroupBatchQueueResourcePolicy_result result = getEmptyResultInstance();
try {
result.success = iface.removeGroupBatchQueueResourcePolicy(args.authzToken, args.resourcePolicyId);
result.setSuccessIsSet(true);
@@ -25580,7 +26465,7 @@ public class Airavata {
}
}
- public static class getGroupComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePreference_args> {
+ public static class getGroupComputeResourcePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePreference_args, getGroupComputeResourcePreference_result> {
public getGroupComputeResourcePreference() {
super("getGroupComputeResourcePreference");
}
@@ -25591,7 +26476,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25600,9 +26485,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupComputeResourcePreference_result getEmptyResultInstance() {
+ return new getGroupComputeResourcePreference_result();
+ }
+
@Override
public getGroupComputeResourcePreference_result getResult(I iface, getGroupComputeResourcePreference_args args) throws org.apache.thrift.TException {
- getGroupComputeResourcePreference_result result = new getGroupComputeResourcePreference_result();
+ getGroupComputeResourcePreference_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupComputeResourcePreference(args.authzToken, args.computeResourceId, args.groupResourceProfileId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25618,7 +26508,7 @@ public class Airavata {
}
}
- public static class getGroupComputeResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePolicy_args> {
+ public static class getGroupComputeResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePolicy_args, getGroupComputeResourcePolicy_result> {
public getGroupComputeResourcePolicy() {
super("getGroupComputeResourcePolicy");
}
@@ -25629,7 +26519,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25638,9 +26528,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupComputeResourcePolicy_result getEmptyResultInstance() {
+ return new getGroupComputeResourcePolicy_result();
+ }
+
@Override
public getGroupComputeResourcePolicy_result getResult(I iface, getGroupComputeResourcePolicy_args args) throws org.apache.thrift.TException {
- getGroupComputeResourcePolicy_result result = new getGroupComputeResourcePolicy_result();
+ getGroupComputeResourcePolicy_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupComputeResourcePolicy(args.authzToken, args.resourcePolicyId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25656,7 +26551,7 @@ public class Airavata {
}
}
- public static class getBatchQueueResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getBatchQueueResourcePolicy_args> {
+ public static class getBatchQueueResourcePolicy<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getBatchQueueResourcePolicy_args, getBatchQueueResourcePolicy_result> {
public getBatchQueueResourcePolicy() {
super("getBatchQueueResourcePolicy");
}
@@ -25667,7 +26562,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25676,9 +26571,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getBatchQueueResourcePolicy_result getEmptyResultInstance() {
+ return new getBatchQueueResourcePolicy_result();
+ }
+
@Override
public getBatchQueueResourcePolicy_result getResult(I iface, getBatchQueueResourcePolicy_args args) throws org.apache.thrift.TException {
- getBatchQueueResourcePolicy_result result = new getBatchQueueResourcePolicy_result();
+ getBatchQueueResourcePolicy_result result = getEmptyResultInstance();
try {
result.success = iface.getBatchQueueResourcePolicy(args.authzToken, args.resourcePolicyId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25694,7 +26594,7 @@ public class Airavata {
}
}
- public static class getGroupComputeResourcePrefList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePrefList_args> {
+ public static class getGroupComputeResourcePrefList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePrefList_args, getGroupComputeResourcePrefList_result> {
public getGroupComputeResourcePrefList() {
super("getGroupComputeResourcePrefList");
}
@@ -25705,7 +26605,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25714,9 +26614,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupComputeResourcePrefList_result getEmptyResultInstance() {
+ return new getGroupComputeResourcePrefList_result();
+ }
+
@Override
public getGroupComputeResourcePrefList_result getResult(I iface, getGroupComputeResourcePrefList_args args) throws org.apache.thrift.TException {
- getGroupComputeResourcePrefList_result result = new getGroupComputeResourcePrefList_result();
+ getGroupComputeResourcePrefList_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupComputeResourcePrefList(args.authzToken, args.groupResourceProfileId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25732,7 +26637,7 @@ public class Airavata {
}
}
- public static class getGroupBatchQueueResourcePolicyList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupBatchQueueResourcePolicyList_args> {
+ public static class getGroupBatchQueueResourcePolicyList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupBatchQueueResourcePolicyList_args, getGroupBatchQueueResourcePolicyList_result> {
public getGroupBatchQueueResourcePolicyList() {
super("getGroupBatchQueueResourcePolicyList");
}
@@ -25743,7 +26648,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25752,9 +26657,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupBatchQueueResourcePolicyList_result getEmptyResultInstance() {
+ return new getGroupBatchQueueResourcePolicyList_result();
+ }
+
@Override
public getGroupBatchQueueResourcePolicyList_result getResult(I iface, getGroupBatchQueueResourcePolicyList_args args) throws org.apache.thrift.TException {
- getGroupBatchQueueResourcePolicyList_result result = new getGroupBatchQueueResourcePolicyList_result();
+ getGroupBatchQueueResourcePolicyList_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupBatchQueueResourcePolicyList(args.authzToken, args.groupResourceProfileId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25770,7 +26680,7 @@ public class Airavata {
}
}
- public static class getGroupComputeResourcePolicyList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePolicyList_args> {
+ public static class getGroupComputeResourcePolicyList<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGroupComputeResourcePolicyList_args, getGroupComputeResourcePolicyList_result> {
public getGroupComputeResourcePolicyList() {
super("getGroupComputeResourcePolicyList");
}
@@ -25781,7 +26691,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25790,9 +26700,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGroupComputeResourcePolicyList_result getEmptyResultInstance() {
+ return new getGroupComputeResourcePolicyList_result();
+ }
+
@Override
public getGroupComputeResourcePolicyList_result getResult(I iface, getGroupComputeResourcePolicyList_args args) throws org.apache.thrift.TException {
- getGroupComputeResourcePolicyList_result result = new getGroupComputeResourcePolicyList_result();
+ getGroupComputeResourcePolicyList_result result = getEmptyResultInstance();
try {
result.success = iface.getGroupComputeResourcePolicyList(args.authzToken, args.groupResourceProfileId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25808,7 +26723,7 @@ public class Airavata {
}
}
- public static class getGatewayGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayGroups_args> {
+ public static class getGatewayGroups<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayGroups_args, getGatewayGroups_result> {
public getGatewayGroups() {
super("getGatewayGroups");
}
@@ -25819,7 +26734,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25828,9 +26743,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getGatewayGroups_result getEmptyResultInstance() {
+ return new getGatewayGroups_result();
+ }
+
@Override
public getGatewayGroups_result getResult(I iface, getGatewayGroups_args args) throws org.apache.thrift.TException {
- getGatewayGroups_result result = new getGatewayGroups_result();
+ getGatewayGroups_result result = getEmptyResultInstance();
try {
result.success = iface.getGatewayGroups(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25846,7 +26766,7 @@ public class Airavata {
}
}
- public static class getParser<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParser_args> {
+ public static class getParser<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParser_args, getParser_result> {
public getParser() {
super("getParser");
}
@@ -25857,7 +26777,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25866,9 +26786,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getParser_result getEmptyResultInstance() {
+ return new getParser_result();
+ }
+
@Override
public getParser_result getResult(I iface, getParser_args args) throws org.apache.thrift.TException {
- getParser_result result = new getParser_result();
+ getParser_result result = getEmptyResultInstance();
try {
result.success = iface.getParser(args.authzToken, args.parserId, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25884,7 +26809,7 @@ public class Airavata {
}
}
- public static class saveParser<I extends Iface> extends org.apache.thrift.ProcessFunction<I, saveParser_args> {
+ public static class saveParser<I extends Iface> extends org.apache.thrift.ProcessFunction<I, saveParser_args, saveParser_result> {
public saveParser() {
super("saveParser");
}
@@ -25895,7 +26820,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25904,9 +26829,14 @@ public class Airavata {
return false;
}
+ @Override
+ public saveParser_result getEmptyResultInstance() {
+ return new saveParser_result();
+ }
+
@Override
public saveParser_result getResult(I iface, saveParser_args args) throws org.apache.thrift.TException {
- saveParser_result result = new saveParser_result();
+ saveParser_result result = getEmptyResultInstance();
try {
result.success = iface.saveParser(args.authzToken, args.parser);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25922,7 +26852,7 @@ public class Airavata {
}
}
- public static class listAllParsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, listAllParsers_args> {
+ public static class listAllParsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, listAllParsers_args, listAllParsers_result> {
public listAllParsers() {
super("listAllParsers");
}
@@ -25933,7 +26863,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25942,9 +26872,14 @@ public class Airavata {
return false;
}
+ @Override
+ public listAllParsers_result getEmptyResultInstance() {
+ return new listAllParsers_result();
+ }
+
@Override
public listAllParsers_result getResult(I iface, listAllParsers_args args) throws org.apache.thrift.TException {
- listAllParsers_result result = new listAllParsers_result();
+ listAllParsers_result result = getEmptyResultInstance();
try {
result.success = iface.listAllParsers(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -25960,7 +26895,7 @@ public class Airavata {
}
}
- public static class removeParser<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeParser_args> {
+ public static class removeParser<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeParser_args, removeParser_result> {
public removeParser() {
super("removeParser");
}
@@ -25971,7 +26906,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -25980,9 +26915,14 @@ public class Airavata {
return false;
}
+ @Override
+ public removeParser_result getEmptyResultInstance() {
+ return new removeParser_result();
+ }
+
@Override
public removeParser_result getResult(I iface, removeParser_args args) throws org.apache.thrift.TException {
- removeParser_result result = new removeParser_result();
+ removeParser_result result = getEmptyResultInstance();
try {
result.success = iface.removeParser(args.authzToken, args.parserId, args.gatewayId);
result.setSuccessIsSet(true);
@@ -25999,7 +26939,7 @@ public class Airavata {
}
}
- public static class getParsingTemplate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParsingTemplate_args> {
+ public static class getParsingTemplate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParsingTemplate_args, getParsingTemplate_result> {
public getParsingTemplate() {
super("getParsingTemplate");
}
@@ -26010,7 +26950,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26019,9 +26959,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getParsingTemplate_result getEmptyResultInstance() {
+ return new getParsingTemplate_result();
+ }
+
@Override
public getParsingTemplate_result getResult(I iface, getParsingTemplate_args args) throws org.apache.thrift.TException {
- getParsingTemplate_result result = new getParsingTemplate_result();
+ getParsingTemplate_result result = getEmptyResultInstance();
try {
result.success = iface.getParsingTemplate(args.authzToken, args.templateId, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -26037,7 +26982,7 @@ public class Airavata {
}
}
- public static class getParsingTemplatesForExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParsingTemplatesForExperiment_args> {
+ public static class getParsingTemplatesForExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getParsingTemplatesForExperiment_args, getParsingTemplatesForExperiment_result> {
public getParsingTemplatesForExperiment() {
super("getParsingTemplatesForExperiment");
}
@@ -26048,7 +26993,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26057,9 +27002,14 @@ public class Airavata {
return false;
}
+ @Override
+ public getParsingTemplatesForExperiment_result getEmptyResultInstance() {
+ return new getParsingTemplatesForExperiment_result();
+ }
+
@Override
public getParsingTemplatesForExperiment_result getResult(I iface, getParsingTemplatesForExperiment_args args) throws org.apache.thrift.TException {
- getParsingTemplatesForExperiment_result result = new getParsingTemplatesForExperiment_result();
+ getParsingTemplatesForExperiment_result result = getEmptyResultInstance();
try {
result.success = iface.getParsingTemplatesForExperiment(args.authzToken, args.experimentId, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -26075,7 +27025,7 @@ public class Airavata {
}
}
- public static class saveParsingTemplate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, saveParsingTemplate_args> {
+ public static class saveParsingTemplate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, saveParsingTemplate_args, saveParsingTemplate_result> {
public saveParsingTemplate() {
super("saveParsingTemplate");
}
@@ -26086,7 +27036,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26095,9 +27045,14 @@ public class Airavata {
return false;
}
+ @Override
+ public saveParsingTemplate_result getEmptyResultInstance() {
+ return new saveParsingTemplate_result();
+ }
+
@Override
public saveParsingTemplate_result getResult(I iface, saveParsingTemplate_args args) throws org.apache.thrift.TException {
- saveParsingTemplate_result result = new saveParsingTemplate_result();
+ saveParsingTemplate_result result = getEmptyResultInstance();
try {
result.success = iface.saveParsingTemplate(args.authzToken, args.parsingTemplate);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -26113,7 +27068,7 @@ public class Airavata {
}
}
- public static class removeParsingTemplate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeParsingTemplate_args> {
+ public static class removeParsingTemplate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeParsingTemplate_args, removeParsingTemplate_result> {
public removeParsingTemplate() {
super("removeParsingTemplate");
}
@@ -26124,7 +27079,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26133,9 +27088,14 @@ public class Airavata {
return false;
}
+ @Override
+ public removeParsingTemplate_result getEmptyResultInstance() {
+ return new removeParsingTemplate_result();
+ }
+
@Override
public removeParsingTemplate_result getResult(I iface, removeParsingTemplate_args args) throws org.apache.thrift.TException {
- removeParsingTemplate_result result = new removeParsingTemplate_result();
+ removeParsingTemplate_result result = getEmptyResultInstance();
try {
result.success = iface.removeParsingTemplate(args.authzToken, args.templateId, args.gatewayId);
result.setSuccessIsSet(true);
@@ -26152,7 +27112,7 @@ public class Airavata {
}
}
- public static class listAllParsingTemplates<I extends Iface> extends org.apache.thrift.ProcessFunction<I, listAllParsingTemplates_args> {
+ public static class listAllParsingTemplates<I extends Iface> extends org.apache.thrift.ProcessFunction<I, listAllParsingTemplates_args, listAllParsingTemplates_result> {
public listAllParsingTemplates() {
super("listAllParsingTemplates");
}
@@ -26163,7 +27123,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26172,9 +27132,14 @@ public class Airavata {
return false;
}
+ @Override
+ public listAllParsingTemplates_result getEmptyResultInstance() {
+ return new listAllParsingTemplates_result();
+ }
+
@Override
public listAllParsingTemplates_result getResult(I iface, listAllParsingTemplates_args args) throws org.apache.thrift.TException {
- listAllParsingTemplates_result result = new listAllParsingTemplates_result();
+ listAllParsingTemplates_result result = getEmptyResultInstance();
try {
result.success = iface.listAllParsingTemplates(args.authzToken, args.gatewayId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
@@ -26195,14 +27160,14 @@ public class Airavata {
public static class AsyncProcessor<I extends AsyncIface> extends org.apache.airavata.base.api.BaseAPI.AsyncProcessor<I> {
private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
public AsyncProcessor(I iface) {
- super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+ super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>>()));
}
- protected AsyncProcessor(I iface, java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ protected AsyncProcessor(I iface, java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
super(iface, getProcessMap(processMap));
}
- private static <I extends AsyncIface> java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ private static <I extends AsyncIface> java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?, ? extends org.apache.thrift.TBase>> processMap) {
processMap.put("isUserExists", new isUserExists());
processMap.put("addGateway", new addGateway());
processMap.put("getAllUsersInGateway", new getAllUsersInGateway());
@@ -26399,11 +27364,16 @@ public class Airavata {
return processMap;
}
- public static class isUserExists<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isUserExists_args, java.lang.Boolean> {
+ public static class isUserExists<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isUserExists_args, java.lang.Boolean, isUserExists_result> {
public isUserExists() {
super("isUserExists");
}
+ @Override
+ public isUserExists_result getEmptyResultInstance() {
+ return new isUserExists_result();
+ }
+
@Override
public isUserExists_args getEmptyArgsInstance() {
return new isUserExists_args();
@@ -26473,7 +27443,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26483,11 +27453,16 @@ public class Airavata {
}
}
- public static class addGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGateway_args, java.lang.String> {
+ public static class addGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGateway_args, java.lang.String, addGateway_result> {
public addGateway() {
super("addGateway");
}
+ @Override
+ public addGateway_result getEmptyResultInstance() {
+ return new addGateway_result();
+ }
+
@Override
public addGateway_args getEmptyArgsInstance() {
return new addGateway_args();
@@ -26556,7 +27531,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26566,11 +27541,16 @@ public class Airavata {
}
}
- public static class getAllUsersInGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUsersInGateway_args, java.util.List<java.lang.String>> {
+ public static class getAllUsersInGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUsersInGateway_args, java.util.List<java.lang.String>, getAllUsersInGateway_result> {
public getAllUsersInGateway() {
super("getAllUsersInGateway");
}
+ @Override
+ public getAllUsersInGateway_result getEmptyResultInstance() {
+ return new getAllUsersInGateway_result();
+ }
+
@Override
public getAllUsersInGateway_args getEmptyArgsInstance() {
return new getAllUsersInGateway_args();
@@ -26639,7 +27619,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26649,11 +27629,16 @@ public class Airavata {
}
}
- public static class updateGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGateway_args, java.lang.Boolean> {
+ public static class updateGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGateway_args, java.lang.Boolean, updateGateway_result> {
public updateGateway() {
super("updateGateway");
}
+ @Override
+ public updateGateway_result getEmptyResultInstance() {
+ return new updateGateway_result();
+ }
+
@Override
public updateGateway_args getEmptyArgsInstance() {
return new updateGateway_args();
@@ -26723,7 +27708,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26733,11 +27718,16 @@ public class Airavata {
}
}
- public static class getGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGateway_args, org.apache.airavata.model.workspace.Gateway> {
+ public static class getGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGateway_args, org.apache.airavata.model.workspace.Gateway, getGateway_result> {
public getGateway() {
super("getGateway");
}
+ @Override
+ public getGateway_result getEmptyResultInstance() {
+ return new getGateway_result();
+ }
+
@Override
public getGateway_args getEmptyArgsInstance() {
return new getGateway_args();
@@ -26806,7 +27796,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26816,11 +27806,16 @@ public class Airavata {
}
}
- public static class deleteGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGateway_args, java.lang.Boolean> {
+ public static class deleteGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGateway_args, java.lang.Boolean, deleteGateway_result> {
public deleteGateway() {
super("deleteGateway");
}
+ @Override
+ public deleteGateway_result getEmptyResultInstance() {
+ return new deleteGateway_result();
+ }
+
@Override
public deleteGateway_args getEmptyArgsInstance() {
return new deleteGateway_args();
@@ -26890,7 +27885,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26900,11 +27895,16 @@ public class Airavata {
}
}
- public static class getAllGateways<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGateways_args, java.util.List<org.apache.airavata.model.workspace.Gateway>> {
+ public static class getAllGateways<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGateways_args, java.util.List<org.apache.airavata.model.workspace.Gateway>, getAllGateways_result> {
public getAllGateways() {
super("getAllGateways");
}
+ @Override
+ public getAllGateways_result getEmptyResultInstance() {
+ return new getAllGateways_result();
+ }
+
@Override
public getAllGateways_args getEmptyArgsInstance() {
return new getAllGateways_args();
@@ -26973,7 +27973,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -26983,11 +27983,16 @@ public class Airavata {
}
}
- public static class isGatewayExist<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isGatewayExist_args, java.lang.Boolean> {
+ public static class isGatewayExist<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isGatewayExist_args, java.lang.Boolean, isGatewayExist_result> {
public isGatewayExist() {
super("isGatewayExist");
}
+ @Override
+ public isGatewayExist_result getEmptyResultInstance() {
+ return new isGatewayExist_result();
+ }
+
@Override
public isGatewayExist_args getEmptyArgsInstance() {
return new isGatewayExist_args();
@@ -27057,7 +28062,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27067,11 +28072,16 @@ public class Airavata {
}
}
- public static class createNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createNotification_args, java.lang.String> {
+ public static class createNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createNotification_args, java.lang.String, createNotification_result> {
public createNotification() {
super("createNotification");
}
+ @Override
+ public createNotification_result getEmptyResultInstance() {
+ return new createNotification_result();
+ }
+
@Override
public createNotification_args getEmptyArgsInstance() {
return new createNotification_args();
@@ -27140,7 +28150,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27150,11 +28160,16 @@ public class Airavata {
}
}
- public static class updateNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateNotification_args, java.lang.Boolean> {
+ public static class updateNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateNotification_args, java.lang.Boolean, updateNotification_result> {
public updateNotification() {
super("updateNotification");
}
+ @Override
+ public updateNotification_result getEmptyResultInstance() {
+ return new updateNotification_result();
+ }
+
@Override
public updateNotification_args getEmptyArgsInstance() {
return new updateNotification_args();
@@ -27224,7 +28239,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27234,11 +28249,16 @@ public class Airavata {
}
}
- public static class deleteNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteNotification_args, java.lang.Boolean> {
+ public static class deleteNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteNotification_args, java.lang.Boolean, deleteNotification_result> {
public deleteNotification() {
super("deleteNotification");
}
+ @Override
+ public deleteNotification_result getEmptyResultInstance() {
+ return new deleteNotification_result();
+ }
+
@Override
public deleteNotification_args getEmptyArgsInstance() {
return new deleteNotification_args();
@@ -27308,7 +28328,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27318,11 +28338,16 @@ public class Airavata {
}
}
- public static class getNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getNotification_args, org.apache.airavata.model.workspace.Notification> {
+ public static class getNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getNotification_args, org.apache.airavata.model.workspace.Notification, getNotification_result> {
public getNotification() {
super("getNotification");
}
+ @Override
+ public getNotification_result getEmptyResultInstance() {
+ return new getNotification_result();
+ }
+
@Override
public getNotification_args getEmptyArgsInstance() {
return new getNotification_args();
@@ -27391,7 +28416,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27401,11 +28426,16 @@ public class Airavata {
}
}
- public static class getAllNotifications<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllNotifications_args, java.util.List<org.apache.airavata.model.workspace.Notification>> {
+ public static class getAllNotifications<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllNotifications_args, java.util.List<org.apache.airavata.model.workspace.Notification>, getAllNotifications_result> {
public getAllNotifications() {
super("getAllNotifications");
}
+ @Override
+ public getAllNotifications_result getEmptyResultInstance() {
+ return new getAllNotifications_result();
+ }
+
@Override
public getAllNotifications_args getEmptyArgsInstance() {
return new getAllNotifications_args();
@@ -27474,7 +28504,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27484,11 +28514,16 @@ public class Airavata {
}
}
- public static class generateAndRegisterSSHKeys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, generateAndRegisterSSHKeys_args, java.lang.String> {
+ public static class generateAndRegisterSSHKeys<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, generateAndRegisterSSHKeys_args, java.lang.String, generateAndRegisterSSHKeys_result> {
public generateAndRegisterSSHKeys() {
super("generateAndRegisterSSHKeys");
}
+ @Override
+ public generateAndRegisterSSHKeys_result getEmptyResultInstance() {
+ return new generateAndRegisterSSHKeys_result();
+ }
+
@Override
public generateAndRegisterSSHKeys_args getEmptyArgsInstance() {
return new generateAndRegisterSSHKeys_args();
@@ -27553,7 +28588,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27563,11 +28598,16 @@ public class Airavata {
}
}
- public static class registerPwdCredential<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerPwdCredential_args, java.lang.String> {
+ public static class registerPwdCredential<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerPwdCredential_args, java.lang.String, registerPwdCredential_result> {
public registerPwdCredential() {
super("registerPwdCredential");
}
+ @Override
+ public registerPwdCredential_result getEmptyResultInstance() {
+ return new registerPwdCredential_result();
+ }
+
@Override
public registerPwdCredential_args getEmptyArgsInstance() {
return new registerPwdCredential_args();
@@ -27632,7 +28672,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27642,11 +28682,16 @@ public class Airavata {
}
}
- public static class getCredentialSummary<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCredentialSummary_args, org.apache.airavata.model.credential.store.CredentialSummary> {
+ public static class getCredentialSummary<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCredentialSummary_args, org.apache.airavata.model.credential.store.CredentialSummary, getCredentialSummary_result> {
public getCredentialSummary() {
super("getCredentialSummary");
}
+ @Override
+ public getCredentialSummary_result getEmptyResultInstance() {
+ return new getCredentialSummary_result();
+ }
+
@Override
public getCredentialSummary_args getEmptyArgsInstance() {
return new getCredentialSummary_args();
@@ -27715,7 +28760,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27725,11 +28770,16 @@ public class Airavata {
}
}
- public static class getAllCredentialSummaries<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllCredentialSummaries_args, java.util.List<org.apache.airavata.model.credential.store.CredentialSummary>> {
+ public static class getAllCredentialSummaries<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllCredentialSummaries_args, java.util.List<org.apache.airavata.model.credential.store.CredentialSummary>, getAllCredentialSummaries_result> {
public getAllCredentialSummaries() {
super("getAllCredentialSummaries");
}
+ @Override
+ public getAllCredentialSummaries_result getEmptyResultInstance() {
+ return new getAllCredentialSummaries_result();
+ }
+
@Override
public getAllCredentialSummaries_args getEmptyArgsInstance() {
return new getAllCredentialSummaries_args();
@@ -27794,7 +28844,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27804,11 +28854,16 @@ public class Airavata {
}
}
- public static class deleteSSHPubKey<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteSSHPubKey_args, java.lang.Boolean> {
+ public static class deleteSSHPubKey<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteSSHPubKey_args, java.lang.Boolean, deleteSSHPubKey_result> {
public deleteSSHPubKey() {
super("deleteSSHPubKey");
}
+ @Override
+ public deleteSSHPubKey_result getEmptyResultInstance() {
+ return new deleteSSHPubKey_result();
+ }
+
@Override
public deleteSSHPubKey_args getEmptyArgsInstance() {
return new deleteSSHPubKey_args();
@@ -27878,7 +28933,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27888,11 +28943,16 @@ public class Airavata {
}
}
- public static class deletePWDCredential<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deletePWDCredential_args, java.lang.Boolean> {
+ public static class deletePWDCredential<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deletePWDCredential_args, java.lang.Boolean, deletePWDCredential_result> {
public deletePWDCredential() {
super("deletePWDCredential");
}
+ @Override
+ public deletePWDCredential_result getEmptyResultInstance() {
+ return new deletePWDCredential_result();
+ }
+
@Override
public deletePWDCredential_args getEmptyArgsInstance() {
return new deletePWDCredential_args();
@@ -27962,7 +29022,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -27972,11 +29032,16 @@ public class Airavata {
}
}
- public static class createProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createProject_args, java.lang.String> {
+ public static class createProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createProject_args, java.lang.String, createProject_result> {
public createProject() {
super("createProject");
}
+ @Override
+ public createProject_result getEmptyResultInstance() {
+ return new createProject_result();
+ }
+
@Override
public createProject_args getEmptyArgsInstance() {
return new createProject_args();
@@ -28045,7 +29110,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28055,11 +29120,16 @@ public class Airavata {
}
}
- public static class updateProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateProject_args, Void> {
+ public static class updateProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateProject_args, Void, updateProject_result> {
public updateProject() {
super("updateProject");
}
+ @Override
+ public updateProject_result getEmptyResultInstance() {
+ return new updateProject_result();
+ }
+
@Override
public updateProject_args getEmptyArgsInstance() {
return new updateProject_args();
@@ -28131,7 +29201,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28141,11 +29211,16 @@ public class Airavata {
}
}
- public static class getProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getProject_args, org.apache.airavata.model.workspace.Project> {
+ public static class getProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getProject_args, org.apache.airavata.model.workspace.Project, getProject_result> {
public getProject() {
super("getProject");
}
+ @Override
+ public getProject_result getEmptyResultInstance() {
+ return new getProject_result();
+ }
+
@Override
public getProject_args getEmptyArgsInstance() {
return new getProject_args();
@@ -28218,7 +29293,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28228,11 +29303,16 @@ public class Airavata {
}
}
- public static class deleteProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteProject_args, java.lang.Boolean> {
+ public static class deleteProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteProject_args, java.lang.Boolean, deleteProject_result> {
public deleteProject() {
super("deleteProject");
}
+ @Override
+ public deleteProject_result getEmptyResultInstance() {
+ return new deleteProject_result();
+ }
+
@Override
public deleteProject_args getEmptyArgsInstance() {
return new deleteProject_args();
@@ -28306,7 +29386,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28316,11 +29396,16 @@ public class Airavata {
}
}
- public static class getUserProjects<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserProjects_args, java.util.List<org.apache.airavata.model.workspace.Project>> {
+ public static class getUserProjects<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserProjects_args, java.util.List<org.apache.airavata.model.workspace.Project>, getUserProjects_result> {
public getUserProjects() {
super("getUserProjects");
}
+ @Override
+ public getUserProjects_result getEmptyResultInstance() {
+ return new getUserProjects_result();
+ }
+
@Override
public getUserProjects_args getEmptyArgsInstance() {
return new getUserProjects_args();
@@ -28389,7 +29474,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28399,11 +29484,16 @@ public class Airavata {
}
}
- public static class searchProjects<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchProjects_args, java.util.List<org.apache.airavata.model.workspace.Project>> {
+ public static class searchProjects<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchProjects_args, java.util.List<org.apache.airavata.model.workspace.Project>, searchProjects_result> {
public searchProjects() {
super("searchProjects");
}
+ @Override
+ public searchProjects_result getEmptyResultInstance() {
+ return new searchProjects_result();
+ }
+
@Override
public searchProjects_args getEmptyArgsInstance() {
return new searchProjects_args();
@@ -28472,7 +29562,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28482,11 +29572,16 @@ public class Airavata {
}
}
- public static class searchExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperiments_args, java.util.List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
+ public static class searchExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperiments_args, java.util.List<org.apache.airavata.model.experiment.ExperimentSummaryModel>, searchExperiments_result> {
public searchExperiments() {
super("searchExperiments");
}
+ @Override
+ public searchExperiments_result getEmptyResultInstance() {
+ return new searchExperiments_result();
+ }
+
@Override
public searchExperiments_args getEmptyArgsInstance() {
return new searchExperiments_args();
@@ -28555,7 +29650,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28565,11 +29660,16 @@ public class Airavata {
}
}
- public static class getExperimentStatistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatistics_args, org.apache.airavata.model.experiment.ExperimentStatistics> {
+ public static class getExperimentStatistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatistics_args, org.apache.airavata.model.experiment.ExperimentStatistics, getExperimentStatistics_result> {
public getExperimentStatistics() {
super("getExperimentStatistics");
}
+ @Override
+ public getExperimentStatistics_result getEmptyResultInstance() {
+ return new getExperimentStatistics_result();
+ }
+
@Override
public getExperimentStatistics_args getEmptyArgsInstance() {
return new getExperimentStatistics_args();
@@ -28638,7 +29738,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28648,11 +29748,16 @@ public class Airavata {
}
}
- public static class getExperimentsInProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentsInProject_args, java.util.List<org.apache.airavata.model.experiment.ExperimentModel>> {
+ public static class getExperimentsInProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentsInProject_args, java.util.List<org.apache.airavata.model.experiment.ExperimentModel>, getExperimentsInProject_result> {
public getExperimentsInProject() {
super("getExperimentsInProject");
}
+ @Override
+ public getExperimentsInProject_result getEmptyResultInstance() {
+ return new getExperimentsInProject_result();
+ }
+
@Override
public getExperimentsInProject_args getEmptyArgsInstance() {
return new getExperimentsInProject_args();
@@ -28725,7 +29830,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28735,11 +29840,16 @@ public class Airavata {
}
}
- public static class getUserExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserExperiments_args, java.util.List<org.apache.airavata.model.experiment.ExperimentModel>> {
+ public static class getUserExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserExperiments_args, java.util.List<org.apache.airavata.model.experiment.ExperimentModel>, getUserExperiments_result> {
public getUserExperiments() {
super("getUserExperiments");
}
+ @Override
+ public getUserExperiments_result getEmptyResultInstance() {
+ return new getUserExperiments_result();
+ }
+
@Override
public getUserExperiments_args getEmptyArgsInstance() {
return new getUserExperiments_args();
@@ -28808,7 +29918,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28818,11 +29928,16 @@ public class Airavata {
}
}
- public static class createExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createExperiment_args, java.lang.String> {
+ public static class createExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createExperiment_args, java.lang.String, createExperiment_result> {
public createExperiment() {
super("createExperiment");
}
+ @Override
+ public createExperiment_result getEmptyResultInstance() {
+ return new createExperiment_result();
+ }
+
@Override
public createExperiment_args getEmptyArgsInstance() {
return new createExperiment_args();
@@ -28891,7 +30006,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28901,11 +30016,16 @@ public class Airavata {
}
}
- public static class deleteExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteExperiment_args, java.lang.Boolean> {
+ public static class deleteExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteExperiment_args, java.lang.Boolean, deleteExperiment_result> {
public deleteExperiment() {
super("deleteExperiment");
}
+ @Override
+ public deleteExperiment_result getEmptyResultInstance() {
+ return new deleteExperiment_result();
+ }
+
@Override
public deleteExperiment_args getEmptyArgsInstance() {
return new deleteExperiment_args();
@@ -28975,7 +30095,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -28985,11 +30105,16 @@ public class Airavata {
}
}
- public static class getExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperiment_args, org.apache.airavata.model.experiment.ExperimentModel> {
+ public static class getExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperiment_args, org.apache.airavata.model.experiment.ExperimentModel, getExperiment_result> {
public getExperiment() {
super("getExperiment");
}
+ @Override
+ public getExperiment_result getEmptyResultInstance() {
+ return new getExperiment_result();
+ }
+
@Override
public getExperiment_args getEmptyArgsInstance() {
return new getExperiment_args();
@@ -29062,7 +30187,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29072,11 +30197,16 @@ public class Airavata {
}
}
- public static class getExperimentByAdmin<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentByAdmin_args, org.apache.airavata.model.experiment.ExperimentModel> {
+ public static class getExperimentByAdmin<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentByAdmin_args, org.apache.airavata.model.experiment.ExperimentModel, getExperimentByAdmin_result> {
public getExperimentByAdmin() {
super("getExperimentByAdmin");
}
+ @Override
+ public getExperimentByAdmin_result getEmptyResultInstance() {
+ return new getExperimentByAdmin_result();
+ }
+
@Override
public getExperimentByAdmin_args getEmptyArgsInstance() {
return new getExperimentByAdmin_args();
@@ -29149,7 +30279,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29159,11 +30289,16 @@ public class Airavata {
}
}
- public static class getDetailedExperimentTree<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDetailedExperimentTree_args, org.apache.airavata.model.experiment.ExperimentModel> {
+ public static class getDetailedExperimentTree<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDetailedExperimentTree_args, org.apache.airavata.model.experiment.ExperimentModel, getDetailedExperimentTree_result> {
public getDetailedExperimentTree() {
super("getDetailedExperimentTree");
}
+ @Override
+ public getDetailedExperimentTree_result getEmptyResultInstance() {
+ return new getDetailedExperimentTree_result();
+ }
+
@Override
public getDetailedExperimentTree_args getEmptyArgsInstance() {
return new getDetailedExperimentTree_args();
@@ -29236,7 +30371,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29246,11 +30381,16 @@ public class Airavata {
}
}
- public static class updateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperiment_args, Void> {
+ public static class updateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperiment_args, Void, updateExperiment_result> {
public updateExperiment() {
super("updateExperiment");
}
+ @Override
+ public updateExperiment_result getEmptyResultInstance() {
+ return new updateExperiment_result();
+ }
+
@Override
public updateExperiment_args getEmptyArgsInstance() {
return new updateExperiment_args();
@@ -29322,7 +30462,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29332,11 +30472,16 @@ public class Airavata {
}
}
- public static class updateExperimentConfiguration<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperimentConfiguration_args, Void> {
+ public static class updateExperimentConfiguration<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperimentConfiguration_args, Void, updateExperimentConfiguration_result> {
public updateExperimentConfiguration() {
super("updateExperimentConfiguration");
}
+ @Override
+ public updateExperimentConfiguration_result getEmptyResultInstance() {
+ return new updateExperimentConfiguration_result();
+ }
+
@Override
public updateExperimentConfiguration_args getEmptyArgsInstance() {
return new updateExperimentConfiguration_args();
@@ -29392,7 +30537,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29402,11 +30547,16 @@ public class Airavata {
}
}
- public static class updateResourceScheduleing<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateResourceScheduleing_args, Void> {
+ public static class updateResourceScheduleing<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateResourceScheduleing_args, Void, updateResourceScheduleing_result> {
public updateResourceScheduleing() {
super("updateResourceScheduleing");
}
+ @Override
+ public updateResourceScheduleing_result getEmptyResultInstance() {
+ return new updateResourceScheduleing_result();
+ }
+
@Override
public updateResourceScheduleing_args getEmptyArgsInstance() {
return new updateResourceScheduleing_args();
@@ -29462,7 +30612,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29472,11 +30622,16 @@ public class Airavata {
}
}
- public static class validateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, validateExperiment_args, java.lang.Boolean> {
+ public static class validateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, validateExperiment_args, java.lang.Boolean, validateExperiment_result> {
public validateExperiment() {
super("validateExperiment");
}
+ @Override
+ public validateExperiment_result getEmptyResultInstance() {
+ return new validateExperiment_result();
+ }
+
@Override
public validateExperiment_args getEmptyArgsInstance() {
return new validateExperiment_args();
@@ -29550,7 +30705,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29560,11 +30715,16 @@ public class Airavata {
}
}
- public static class launchExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, launchExperiment_args, Void> {
+ public static class launchExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, launchExperiment_args, Void, launchExperiment_result> {
public launchExperiment() {
super("launchExperiment");
}
+ @Override
+ public launchExperiment_result getEmptyResultInstance() {
+ return new launchExperiment_result();
+ }
+
@Override
public launchExperiment_args getEmptyArgsInstance() {
return new launchExperiment_args();
@@ -29636,7 +30796,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29646,11 +30806,16 @@ public class Airavata {
}
}
- public static class getExperimentStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatus_args, org.apache.airavata.model.status.ExperimentStatus> {
+ public static class getExperimentStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatus_args, org.apache.airavata.model.status.ExperimentStatus, getExperimentStatus_result> {
public getExperimentStatus() {
super("getExperimentStatus");
}
+ @Override
+ public getExperimentStatus_result getEmptyResultInstance() {
+ return new getExperimentStatus_result();
+ }
+
@Override
public getExperimentStatus_args getEmptyArgsInstance() {
return new getExperimentStatus_args();
@@ -29723,7 +30888,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29733,11 +30898,16 @@ public class Airavata {
}
}
- public static class getExperimentOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentOutputs_args, java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
+ public static class getExperimentOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentOutputs_args, java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>, getExperimentOutputs_result> {
public getExperimentOutputs() {
super("getExperimentOutputs");
}
+ @Override
+ public getExperimentOutputs_result getEmptyResultInstance() {
+ return new getExperimentOutputs_result();
+ }
+
@Override
public getExperimentOutputs_args getEmptyArgsInstance() {
return new getExperimentOutputs_args();
@@ -29810,7 +30980,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29820,11 +30990,16 @@ public class Airavata {
}
}
- public static class getIntermediateOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getIntermediateOutputs_args, java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
+ public static class getIntermediateOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getIntermediateOutputs_args, java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>, getIntermediateOutputs_result> {
public getIntermediateOutputs() {
super("getIntermediateOutputs");
}
+ @Override
+ public getIntermediateOutputs_result getEmptyResultInstance() {
+ return new getIntermediateOutputs_result();
+ }
+
@Override
public getIntermediateOutputs_args getEmptyArgsInstance() {
return new getIntermediateOutputs_args();
@@ -29897,7 +31072,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29907,11 +31082,16 @@ public class Airavata {
}
}
- public static class fetchIntermediateOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fetchIntermediateOutputs_args, Void> {
+ public static class fetchIntermediateOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fetchIntermediateOutputs_args, Void, fetchIntermediateOutputs_result> {
public fetchIntermediateOutputs() {
super("fetchIntermediateOutputs");
}
+ @Override
+ public fetchIntermediateOutputs_result getEmptyResultInstance() {
+ return new fetchIntermediateOutputs_result();
+ }
+
@Override
public fetchIntermediateOutputs_args getEmptyArgsInstance() {
return new fetchIntermediateOutputs_args();
@@ -29983,7 +31163,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -29993,11 +31173,16 @@ public class Airavata {
}
}
- public static class getIntermediateOutputProcessStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getIntermediateOutputProcessStatus_args, org.apache.airavata.model.status.ProcessStatus> {
+ public static class getIntermediateOutputProcessStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getIntermediateOutputProcessStatus_args, org.apache.airavata.model.status.ProcessStatus, getIntermediateOutputProcessStatus_result> {
public getIntermediateOutputProcessStatus() {
super("getIntermediateOutputProcessStatus");
}
+ @Override
+ public getIntermediateOutputProcessStatus_result getEmptyResultInstance() {
+ return new getIntermediateOutputProcessStatus_result();
+ }
+
@Override
public getIntermediateOutputProcessStatus_args getEmptyArgsInstance() {
return new getIntermediateOutputProcessStatus_args();
@@ -30070,7 +31255,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30080,11 +31265,16 @@ public class Airavata {
}
}
- public static class getJobStatuses<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobStatuses_args, java.util.Map<java.lang.String,org.apache.airavata.model.status.JobStatus>> {
+ public static class getJobStatuses<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobStatuses_args, java.util.Map<java.lang.String,org.apache.airavata.model.status.JobStatus>, getJobStatuses_result> {
public getJobStatuses() {
super("getJobStatuses");
}
+ @Override
+ public getJobStatuses_result getEmptyResultInstance() {
+ return new getJobStatuses_result();
+ }
+
@Override
public getJobStatuses_args getEmptyArgsInstance() {
return new getJobStatuses_args();
@@ -30157,7 +31347,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30167,11 +31357,16 @@ public class Airavata {
}
}
- public static class getJobDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobDetails_args, java.util.List<org.apache.airavata.model.job.JobModel>> {
+ public static class getJobDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobDetails_args, java.util.List<org.apache.airavata.model.job.JobModel>, getJobDetails_result> {
public getJobDetails() {
super("getJobDetails");
}
+ @Override
+ public getJobDetails_result getEmptyResultInstance() {
+ return new getJobDetails_result();
+ }
+
@Override
public getJobDetails_args getEmptyArgsInstance() {
return new getJobDetails_args();
@@ -30244,7 +31439,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30254,11 +31449,16 @@ public class Airavata {
}
}
- public static class cloneExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneExperiment_args, java.lang.String> {
+ public static class cloneExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneExperiment_args, java.lang.String, cloneExperiment_result> {
public cloneExperiment() {
super("cloneExperiment");
}
+ @Override
+ public cloneExperiment_result getEmptyResultInstance() {
+ return new cloneExperiment_result();
+ }
+
@Override
public cloneExperiment_args getEmptyArgsInstance() {
return new cloneExperiment_args();
@@ -30335,7 +31535,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30345,11 +31545,16 @@ public class Airavata {
}
}
- public static class cloneExperimentByAdmin<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneExperimentByAdmin_args, java.lang.String> {
+ public static class cloneExperimentByAdmin<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneExperimentByAdmin_args, java.lang.String, cloneExperimentByAdmin_result> {
public cloneExperimentByAdmin() {
super("cloneExperimentByAdmin");
}
+ @Override
+ public cloneExperimentByAdmin_result getEmptyResultInstance() {
+ return new cloneExperimentByAdmin_result();
+ }
+
@Override
public cloneExperimentByAdmin_args getEmptyArgsInstance() {
return new cloneExperimentByAdmin_args();
@@ -30426,7 +31631,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30436,11 +31641,16 @@ public class Airavata {
}
}
- public static class terminateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, terminateExperiment_args, Void> {
+ public static class terminateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, terminateExperiment_args, Void, terminateExperiment_result> {
public terminateExperiment() {
super("terminateExperiment");
}
+ @Override
+ public terminateExperiment_result getEmptyResultInstance() {
+ return new terminateExperiment_result();
+ }
+
@Override
public terminateExperiment_args getEmptyArgsInstance() {
return new terminateExperiment_args();
@@ -30512,7 +31722,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30522,11 +31732,16 @@ public class Airavata {
}
}
- public static class registerApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationModule_args, java.lang.String> {
+ public static class registerApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationModule_args, java.lang.String, registerApplicationModule_result> {
public registerApplicationModule() {
super("registerApplicationModule");
}
+ @Override
+ public registerApplicationModule_result getEmptyResultInstance() {
+ return new registerApplicationModule_result();
+ }
+
@Override
public registerApplicationModule_args getEmptyArgsInstance() {
return new registerApplicationModule_args();
@@ -30595,7 +31810,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30605,11 +31820,16 @@ public class Airavata {
}
}
- public static class getApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationModule_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> {
+ public static class getApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationModule_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule, getApplicationModule_result> {
public getApplicationModule() {
super("getApplicationModule");
}
+ @Override
+ public getApplicationModule_result getEmptyResultInstance() {
+ return new getApplicationModule_result();
+ }
+
@Override
public getApplicationModule_args getEmptyArgsInstance() {
return new getApplicationModule_args();
@@ -30678,7 +31898,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30688,11 +31908,16 @@ public class Airavata {
}
}
- public static class updateApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationModule_args, java.lang.Boolean> {
+ public static class updateApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationModule_args, java.lang.Boolean, updateApplicationModule_result> {
public updateApplicationModule() {
super("updateApplicationModule");
}
+ @Override
+ public updateApplicationModule_result getEmptyResultInstance() {
+ return new updateApplicationModule_result();
+ }
+
@Override
public updateApplicationModule_args getEmptyArgsInstance() {
return new updateApplicationModule_args();
@@ -30762,7 +31987,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30772,11 +31997,16 @@ public class Airavata {
}
}
- public static class getAllAppModules<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllAppModules_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> {
+ public static class getAllAppModules<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllAppModules_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>, getAllAppModules_result> {
public getAllAppModules() {
super("getAllAppModules");
}
+ @Override
+ public getAllAppModules_result getEmptyResultInstance() {
+ return new getAllAppModules_result();
+ }
+
@Override
public getAllAppModules_args getEmptyArgsInstance() {
return new getAllAppModules_args();
@@ -30845,7 +32075,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30855,11 +32085,16 @@ public class Airavata {
}
}
- public static class getAccessibleAppModules<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAccessibleAppModules_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> {
+ public static class getAccessibleAppModules<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAccessibleAppModules_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>, getAccessibleAppModules_result> {
public getAccessibleAppModules() {
super("getAccessibleAppModules");
}
+ @Override
+ public getAccessibleAppModules_result getEmptyResultInstance() {
+ return new getAccessibleAppModules_result();
+ }
+
@Override
public getAccessibleAppModules_args getEmptyArgsInstance() {
return new getAccessibleAppModules_args();
@@ -30928,7 +32163,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -30938,11 +32173,16 @@ public class Airavata {
}
}
- public static class deleteApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationModule_args, java.lang.Boolean> {
+ public static class deleteApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationModule_args, java.lang.Boolean, deleteApplicationModule_result> {
public deleteApplicationModule() {
super("deleteApplicationModule");
}
+ @Override
+ public deleteApplicationModule_result getEmptyResultInstance() {
+ return new deleteApplicationModule_result();
+ }
+
@Override
public deleteApplicationModule_args getEmptyArgsInstance() {
return new deleteApplicationModule_args();
@@ -31012,7 +32252,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31022,11 +32262,16 @@ public class Airavata {
}
}
- public static class registerApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationDeployment_args, java.lang.String> {
+ public static class registerApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationDeployment_args, java.lang.String, registerApplicationDeployment_result> {
public registerApplicationDeployment() {
super("registerApplicationDeployment");
}
+ @Override
+ public registerApplicationDeployment_result getEmptyResultInstance() {
+ return new registerApplicationDeployment_result();
+ }
+
@Override
public registerApplicationDeployment_args getEmptyArgsInstance() {
return new registerApplicationDeployment_args();
@@ -31095,7 +32340,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31105,11 +32350,16 @@ public class Airavata {
}
}
- public static class getApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationDeployment_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> {
+ public static class getApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationDeployment_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription, getApplicationDeployment_result> {
public getApplicationDeployment() {
super("getApplicationDeployment");
}
+ @Override
+ public getApplicationDeployment_result getEmptyResultInstance() {
+ return new getApplicationDeployment_result();
+ }
+
@Override
public getApplicationDeployment_args getEmptyArgsInstance() {
return new getApplicationDeployment_args();
@@ -31178,7 +32428,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31188,11 +32438,16 @@ public class Airavata {
}
}
- public static class updateApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationDeployment_args, java.lang.Boolean> {
+ public static class updateApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationDeployment_args, java.lang.Boolean, updateApplicationDeployment_result> {
public updateApplicationDeployment() {
super("updateApplicationDeployment");
}
+ @Override
+ public updateApplicationDeployment_result getEmptyResultInstance() {
+ return new updateApplicationDeployment_result();
+ }
+
@Override
public updateApplicationDeployment_args getEmptyArgsInstance() {
return new updateApplicationDeployment_args();
@@ -31262,7 +32517,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31272,11 +32527,16 @@ public class Airavata {
}
}
- public static class deleteApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationDeployment_args, java.lang.Boolean> {
+ public static class deleteApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationDeployment_args, java.lang.Boolean, deleteApplicationDeployment_result> {
public deleteApplicationDeployment() {
super("deleteApplicationDeployment");
}
+ @Override
+ public deleteApplicationDeployment_result getEmptyResultInstance() {
+ return new deleteApplicationDeployment_result();
+ }
+
@Override
public deleteApplicationDeployment_args getEmptyArgsInstance() {
return new deleteApplicationDeployment_args();
@@ -31346,7 +32606,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31356,11 +32616,16 @@ public class Airavata {
}
}
- public static class getAllApplicationDeployments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationDeployments_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>> {
+ public static class getAllApplicationDeployments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationDeployments_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>, getAllApplicationDeployments_result> {
public getAllApplicationDeployments() {
super("getAllApplicationDeployments");
}
+ @Override
+ public getAllApplicationDeployments_result getEmptyResultInstance() {
+ return new getAllApplicationDeployments_result();
+ }
+
@Override
public getAllApplicationDeployments_args getEmptyArgsInstance() {
return new getAllApplicationDeployments_args();
@@ -31429,7 +32694,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31439,11 +32704,16 @@ public class Airavata {
}
}
- public static class getAccessibleApplicationDeployments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAccessibleApplicationDeployments_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>> {
+ public static class getAccessibleApplicationDeployments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAccessibleApplicationDeployments_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>, getAccessibleApplicationDeployments_result> {
public getAccessibleApplicationDeployments() {
super("getAccessibleApplicationDeployments");
}
+ @Override
+ public getAccessibleApplicationDeployments_result getEmptyResultInstance() {
+ return new getAccessibleApplicationDeployments_result();
+ }
+
@Override
public getAccessibleApplicationDeployments_args getEmptyArgsInstance() {
return new getAccessibleApplicationDeployments_args();
@@ -31512,7 +32782,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31522,11 +32792,16 @@ public class Airavata {
}
}
- public static class getAppModuleDeployedResources<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAppModuleDeployedResources_args, java.util.List<java.lang.String>> {
+ public static class getAppModuleDeployedResources<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAppModuleDeployedResources_args, java.util.List<java.lang.String>, getAppModuleDeployedResources_result> {
public getAppModuleDeployedResources() {
super("getAppModuleDeployedResources");
}
+ @Override
+ public getAppModuleDeployedResources_result getEmptyResultInstance() {
+ return new getAppModuleDeployedResources_result();
+ }
+
@Override
public getAppModuleDeployedResources_args getEmptyArgsInstance() {
return new getAppModuleDeployedResources_args();
@@ -31595,7 +32870,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31605,11 +32880,16 @@ public class Airavata {
}
}
- public static class getApplicationDeploymentsForAppModuleAndGroupResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>> {
+ public static class getApplicationDeploymentsForAppModuleAndGroupResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args, java.util.List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>, getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result> {
public getApplicationDeploymentsForAppModuleAndGroupResourceProfile() {
super("getApplicationDeploymentsForAppModuleAndGroupResourceProfile");
}
+ @Override
+ public getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result getEmptyResultInstance() {
+ return new getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result();
+ }
+
@Override
public getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args getEmptyArgsInstance() {
return new getApplicationDeploymentsForAppModuleAndGroupResourceProfile_args();
@@ -31678,7 +32958,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31688,11 +32968,16 @@ public class Airavata {
}
}
- public static class registerApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationInterface_args, java.lang.String> {
+ public static class registerApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationInterface_args, java.lang.String, registerApplicationInterface_result> {
public registerApplicationInterface() {
super("registerApplicationInterface");
}
+ @Override
+ public registerApplicationInterface_result getEmptyResultInstance() {
+ return new registerApplicationInterface_result();
+ }
+
@Override
public registerApplicationInterface_args getEmptyArgsInstance() {
return new registerApplicationInterface_args();
@@ -31761,7 +33046,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31771,11 +33056,16 @@ public class Airavata {
}
}
- public static class cloneApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneApplicationInterface_args, java.lang.String> {
+ public static class cloneApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneApplicationInterface_args, java.lang.String, cloneApplicationInterface_result> {
public cloneApplicationInterface() {
super("cloneApplicationInterface");
}
+ @Override
+ public cloneApplicationInterface_result getEmptyResultInstance() {
+ return new cloneApplicationInterface_result();
+ }
+
@Override
public cloneApplicationInterface_args getEmptyArgsInstance() {
return new cloneApplicationInterface_args();
@@ -31844,7 +33134,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31854,11 +33144,16 @@ public class Airavata {
}
}
- public static class getApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationInterface_args, org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription> {
+ public static class getApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationInterface_args, org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription, getApplicationInterface_result> {
public getApplicationInterface() {
super("getApplicationInterface");
}
+ @Override
+ public getApplicationInterface_result getEmptyResultInstance() {
+ return new getApplicationInterface_result();
+ }
+
@Override
public getApplicationInterface_args getEmptyArgsInstance() {
return new getApplicationInterface_args();
@@ -31927,7 +33222,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -31937,11 +33232,16 @@ public class Airavata {
}
}
- public static class updateApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationInterface_args, java.lang.Boolean> {
+ public static class updateApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationInterface_args, java.lang.Boolean, updateApplicationInterface_result> {
public updateApplicationInterface() {
super("updateApplicationInterface");
}
+ @Override
+ public updateApplicationInterface_result getEmptyResultInstance() {
+ return new updateApplicationInterface_result();
+ }
+
@Override
public updateApplicationInterface_args getEmptyArgsInstance() {
return new updateApplicationInterface_args();
@@ -32011,7 +33311,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32021,11 +33321,16 @@ public class Airavata {
}
}
- public static class deleteApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationInterface_args, java.lang.Boolean> {
+ public static class deleteApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationInterface_args, java.lang.Boolean, deleteApplicationInterface_result> {
public deleteApplicationInterface() {
super("deleteApplicationInterface");
}
+ @Override
+ public deleteApplicationInterface_result getEmptyResultInstance() {
+ return new deleteApplicationInterface_result();
+ }
+
@Override
public deleteApplicationInterface_args getEmptyArgsInstance() {
return new deleteApplicationInterface_args();
@@ -32095,7 +33400,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32105,11 +33410,16 @@ public class Airavata {
}
}
- public static class getAllApplicationInterfaceNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationInterfaceNames_args, java.util.Map<java.lang.String,java.lang.String>> {
+ public static class getAllApplicationInterfaceNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationInterfaceNames_args, java.util.Map<java.lang.String,java.lang.String>, getAllApplicationInterfaceNames_result> {
public getAllApplicationInterfaceNames() {
super("getAllApplicationInterfaceNames");
}
+ @Override
+ public getAllApplicationInterfaceNames_result getEmptyResultInstance() {
+ return new getAllApplicationInterfaceNames_result();
+ }
+
@Override
public getAllApplicationInterfaceNames_args getEmptyArgsInstance() {
return new getAllApplicationInterfaceNames_args();
@@ -32178,7 +33488,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32188,11 +33498,16 @@ public class Airavata {
}
}
- public static class getAllApplicationInterfaces<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationInterfaces_args, java.util.List<org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription>> {
+ public static class getAllApplicationInterfaces<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationInterfaces_args, java.util.List<org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription>, getAllApplicationInterfaces_result> {
public getAllApplicationInterfaces() {
super("getAllApplicationInterfaces");
}
+ @Override
+ public getAllApplicationInterfaces_result getEmptyResultInstance() {
+ return new getAllApplicationInterfaces_result();
+ }
+
@Override
public getAllApplicationInterfaces_args getEmptyArgsInstance() {
return new getAllApplicationInterfaces_args();
@@ -32261,7 +33576,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32271,11 +33586,16 @@ public class Airavata {
}
}
- public static class getApplicationInputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationInputs_args, java.util.List<org.apache.airavata.model.application.io.InputDataObjectType>> {
+ public static class getApplicationInputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationInputs_args, java.util.List<org.apache.airavata.model.application.io.InputDataObjectType>, getApplicationInputs_result> {
public getApplicationInputs() {
super("getApplicationInputs");
}
+ @Override
+ public getApplicationInputs_result getEmptyResultInstance() {
+ return new getApplicationInputs_result();
+ }
+
@Override
public getApplicationInputs_args getEmptyArgsInstance() {
return new getApplicationInputs_args();
@@ -32344,7 +33664,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32354,11 +33674,16 @@ public class Airavata {
}
}
- public static class getApplicationOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationOutputs_args, java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
+ public static class getApplicationOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationOutputs_args, java.util.List<org.apache.airavata.model.application.io.OutputDataObjectType>, getApplicationOutputs_result> {
public getApplicationOutputs() {
super("getApplicationOutputs");
}
+ @Override
+ public getApplicationOutputs_result getEmptyResultInstance() {
+ return new getApplicationOutputs_result();
+ }
+
@Override
public getApplicationOutputs_args getEmptyArgsInstance() {
return new getApplicationOutputs_args();
@@ -32427,7 +33752,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32437,11 +33762,16 @@ public class Airavata {
}
}
- public static class getAvailableAppInterfaceComputeResources<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAvailableAppInterfaceComputeResources_args, java.util.Map<java.lang.String,java.lang.String>> {
+ public static class getAvailableAppInterfaceComputeResources<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAvailableAppInterfaceComputeResources_args, java.util.Map<java.lang.String,java.lang.String>, getAvailableAppInterfaceComputeResources_result> {
public getAvailableAppInterfaceComputeResources() {
super("getAvailableAppInterfaceComputeResources");
}
+ @Override
+ public getAvailableAppInterfaceComputeResources_result getEmptyResultInstance() {
+ return new getAvailableAppInterfaceComputeResources_result();
+ }
+
@Override
public getAvailableAppInterfaceComputeResources_args getEmptyArgsInstance() {
return new getAvailableAppInterfaceComputeResources_args();
@@ -32510,7 +33840,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32520,11 +33850,16 @@ public class Airavata {
}
}
- public static class registerComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerComputeResource_args, java.lang.String> {
+ public static class registerComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerComputeResource_args, java.lang.String, registerComputeResource_result> {
public registerComputeResource() {
super("registerComputeResource");
}
+ @Override
+ public registerComputeResource_result getEmptyResultInstance() {
+ return new registerComputeResource_result();
+ }
+
@Override
public registerComputeResource_args getEmptyArgsInstance() {
return new registerComputeResource_args();
@@ -32593,7 +33928,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32603,11 +33938,16 @@ public class Airavata {
}
}
- public static class getComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getComputeResource_args, org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription> {
+ public static class getComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getComputeResource_args, org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription, getComputeResource_result> {
public getComputeResource() {
super("getComputeResource");
}
+ @Override
+ public getComputeResource_result getEmptyResultInstance() {
+ return new getComputeResource_result();
+ }
+
@Override
public getComputeResource_args getEmptyArgsInstance() {
return new getComputeResource_args();
@@ -32676,7 +34016,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32686,11 +34026,16 @@ public class Airavata {
}
}
- public static class getAllComputeResourceNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllComputeResourceNames_args, java.util.Map<java.lang.String,java.lang.String>> {
+ public static class getAllComputeResourceNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllComputeResourceNames_args, java.util.Map<java.lang.String,java.lang.String>, getAllComputeResourceNames_result> {
public getAllComputeResourceNames() {
super("getAllComputeResourceNames");
}
+ @Override
+ public getAllComputeResourceNames_result getEmptyResultInstance() {
+ return new getAllComputeResourceNames_result();
+ }
+
@Override
public getAllComputeResourceNames_args getEmptyArgsInstance() {
return new getAllComputeResourceNames_args();
@@ -32759,7 +34104,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32769,11 +34114,16 @@ public class Airavata {
}
}
- public static class updateComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateComputeResource_args, java.lang.Boolean> {
+ public static class updateComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateComputeResource_args, java.lang.Boolean, updateComputeResource_result> {
public updateComputeResource() {
super("updateComputeResource");
}
+ @Override
+ public updateComputeResource_result getEmptyResultInstance() {
+ return new updateComputeResource_result();
+ }
+
@Override
public updateComputeResource_args getEmptyArgsInstance() {
return new updateComputeResource_args();
@@ -32843,7 +34193,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32853,11 +34203,16 @@ public class Airavata {
}
}
- public static class deleteComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteComputeResource_args, java.lang.Boolean> {
+ public static class deleteComputeResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteComputeResource_args, java.lang.Boolean, deleteComputeResource_result> {
public deleteComputeResource() {
super("deleteComputeResource");
}
+ @Override
+ public deleteComputeResource_result getEmptyResultInstance() {
+ return new deleteComputeResource_result();
+ }
+
@Override
public deleteComputeResource_args getEmptyArgsInstance() {
return new deleteComputeResource_args();
@@ -32927,7 +34282,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -32937,11 +34292,16 @@ public class Airavata {
}
}
- public static class registerStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerStorageResource_args, java.lang.String> {
+ public static class registerStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerStorageResource_args, java.lang.String, registerStorageResource_result> {
public registerStorageResource() {
super("registerStorageResource");
}
+ @Override
+ public registerStorageResource_result getEmptyResultInstance() {
+ return new registerStorageResource_result();
+ }
+
@Override
public registerStorageResource_args getEmptyArgsInstance() {
return new registerStorageResource_args();
@@ -33010,7 +34370,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33020,11 +34380,16 @@ public class Airavata {
}
}
- public static class getStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getStorageResource_args, org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription> {
+ public static class getStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getStorageResource_args, org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription, getStorageResource_result> {
public getStorageResource() {
super("getStorageResource");
}
+ @Override
+ public getStorageResource_result getEmptyResultInstance() {
+ return new getStorageResource_result();
+ }
+
@Override
public getStorageResource_args getEmptyArgsInstance() {
return new getStorageResource_args();
@@ -33093,7 +34458,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33103,11 +34468,16 @@ public class Airavata {
}
}
- public static class getAllStorageResourceNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllStorageResourceNames_args, java.util.Map<java.lang.String,java.lang.String>> {
+ public static class getAllStorageResourceNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllStorageResourceNames_args, java.util.Map<java.lang.String,java.lang.String>, getAllStorageResourceNames_result> {
public getAllStorageResourceNames() {
super("getAllStorageResourceNames");
}
+ @Override
+ public getAllStorageResourceNames_result getEmptyResultInstance() {
+ return new getAllStorageResourceNames_result();
+ }
+
@Override
public getAllStorageResourceNames_args getEmptyArgsInstance() {
return new getAllStorageResourceNames_args();
@@ -33176,7 +34546,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33186,11 +34556,16 @@ public class Airavata {
}
}
- public static class updateStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateStorageResource_args, java.lang.Boolean> {
+ public static class updateStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateStorageResource_args, java.lang.Boolean, updateStorageResource_result> {
public updateStorageResource() {
super("updateStorageResource");
}
+ @Override
+ public updateStorageResource_result getEmptyResultInstance() {
+ return new updateStorageResource_result();
+ }
+
@Override
public updateStorageResource_args getEmptyArgsInstance() {
return new updateStorageResource_args();
@@ -33260,7 +34635,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33270,11 +34645,16 @@ public class Airavata {
}
}
- public static class deleteStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteStorageResource_args, java.lang.Boolean> {
+ public static class deleteStorageResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteStorageResource_args, java.lang.Boolean, deleteStorageResource_result> {
public deleteStorageResource() {
super("deleteStorageResource");
}
+ @Override
+ public deleteStorageResource_result getEmptyResultInstance() {
+ return new deleteStorageResource_result();
+ }
+
@Override
public deleteStorageResource_args getEmptyArgsInstance() {
return new deleteStorageResource_args();
@@ -33344,7 +34724,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33354,11 +34734,16 @@ public class Airavata {
}
}
- public static class addLocalSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addLocalSubmissionDetails_args, java.lang.String> {
+ public static class addLocalSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addLocalSubmissionDetails_args, java.lang.String, addLocalSubmissionDetails_result> {
public addLocalSubmissionDetails() {
super("addLocalSubmissionDetails");
}
+ @Override
+ public addLocalSubmissionDetails_result getEmptyResultInstance() {
+ return new addLocalSubmissionDetails_result();
+ }
+
@Override
public addLocalSubmissionDetails_args getEmptyArgsInstance() {
return new addLocalSubmissionDetails_args();
@@ -33427,7 +34812,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33437,11 +34822,16 @@ public class Airavata {
}
}
- public static class updateLocalSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateLocalSubmissionDetails_args, java.lang.Boolean> {
+ public static class updateLocalSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateLocalSubmissionDetails_args, java.lang.Boolean, updateLocalSubmissionDetails_result> {
public updateLocalSubmissionDetails() {
super("updateLocalSubmissionDetails");
}
+ @Override
+ public updateLocalSubmissionDetails_result getEmptyResultInstance() {
+ return new updateLocalSubmissionDetails_result();
+ }
+
@Override
public updateLocalSubmissionDetails_args getEmptyArgsInstance() {
return new updateLocalSubmissionDetails_args();
@@ -33511,7 +34901,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33521,11 +34911,16 @@ public class Airavata {
}
}
- public static class getLocalJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocalJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission> {
+ public static class getLocalJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocalJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission, getLocalJobSubmission_result> {
public getLocalJobSubmission() {
super("getLocalJobSubmission");
}
+ @Override
+ public getLocalJobSubmission_result getEmptyResultInstance() {
+ return new getLocalJobSubmission_result();
+ }
+
@Override
public getLocalJobSubmission_args getEmptyArgsInstance() {
return new getLocalJobSubmission_args();
@@ -33594,7 +34989,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33604,11 +34999,16 @@ public class Airavata {
}
}
- public static class addSSHJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSSHJobSubmissionDetails_args, java.lang.String> {
+ public static class addSSHJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSSHJobSubmissionDetails_args, java.lang.String, addSSHJobSubmissionDetails_result> {
public addSSHJobSubmissionDetails() {
super("addSSHJobSubmissionDetails");
}
+ @Override
+ public addSSHJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addSSHJobSubmissionDetails_result();
+ }
+
@Override
public addSSHJobSubmissionDetails_args getEmptyArgsInstance() {
return new addSSHJobSubmissionDetails_args();
@@ -33677,7 +35077,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33687,11 +35087,16 @@ public class Airavata {
}
}
- public static class addSSHForkJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSSHForkJobSubmissionDetails_args, java.lang.String> {
+ public static class addSSHForkJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSSHForkJobSubmissionDetails_args, java.lang.String, addSSHForkJobSubmissionDetails_result> {
public addSSHForkJobSubmissionDetails() {
super("addSSHForkJobSubmissionDetails");
}
+ @Override
+ public addSSHForkJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addSSHForkJobSubmissionDetails_result();
+ }
+
@Override
public addSSHForkJobSubmissionDetails_args getEmptyArgsInstance() {
return new addSSHForkJobSubmissionDetails_args();
@@ -33760,7 +35165,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33770,11 +35175,16 @@ public class Airavata {
}
}
- public static class getSSHJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSSHJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission> {
+ public static class getSSHJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSSHJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission, getSSHJobSubmission_result> {
public getSSHJobSubmission() {
super("getSSHJobSubmission");
}
+ @Override
+ public getSSHJobSubmission_result getEmptyResultInstance() {
+ return new getSSHJobSubmission_result();
+ }
+
@Override
public getSSHJobSubmission_args getEmptyArgsInstance() {
return new getSSHJobSubmission_args();
@@ -33843,7 +35253,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33853,11 +35263,16 @@ public class Airavata {
}
}
- public static class addUNICOREJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUNICOREJobSubmissionDetails_args, java.lang.String> {
+ public static class addUNICOREJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUNICOREJobSubmissionDetails_args, java.lang.String, addUNICOREJobSubmissionDetails_result> {
public addUNICOREJobSubmissionDetails() {
super("addUNICOREJobSubmissionDetails");
}
+ @Override
+ public addUNICOREJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addUNICOREJobSubmissionDetails_result();
+ }
+
@Override
public addUNICOREJobSubmissionDetails_args getEmptyArgsInstance() {
return new addUNICOREJobSubmissionDetails_args();
@@ -33926,7 +35341,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -33936,11 +35351,16 @@ public class Airavata {
}
}
- public static class getUnicoreJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUnicoreJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission> {
+ public static class getUnicoreJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUnicoreJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission, getUnicoreJobSubmission_result> {
public getUnicoreJobSubmission() {
super("getUnicoreJobSubmission");
}
+ @Override
+ public getUnicoreJobSubmission_result getEmptyResultInstance() {
+ return new getUnicoreJobSubmission_result();
+ }
+
@Override
public getUnicoreJobSubmission_args getEmptyArgsInstance() {
return new getUnicoreJobSubmission_args();
@@ -34009,7 +35429,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34019,11 +35439,16 @@ public class Airavata {
}
}
- public static class addCloudJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addCloudJobSubmissionDetails_args, java.lang.String> {
+ public static class addCloudJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addCloudJobSubmissionDetails_args, java.lang.String, addCloudJobSubmissionDetails_result> {
public addCloudJobSubmissionDetails() {
super("addCloudJobSubmissionDetails");
}
+ @Override
+ public addCloudJobSubmissionDetails_result getEmptyResultInstance() {
+ return new addCloudJobSubmissionDetails_result();
+ }
+
@Override
public addCloudJobSubmissionDetails_args getEmptyArgsInstance() {
return new addCloudJobSubmissionDetails_args();
@@ -34092,7 +35517,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34102,11 +35527,16 @@ public class Airavata {
}
}
- public static class getCloudJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCloudJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission> {
+ public static class getCloudJobSubmission<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getCloudJobSubmission_args, org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission, getCloudJobSubmission_result> {
public getCloudJobSubmission() {
super("getCloudJobSubmission");
}
+ @Override
+ public getCloudJobSubmission_result getEmptyResultInstance() {
+ return new getCloudJobSubmission_result();
+ }
+
@Override
public getCloudJobSubmission_args getEmptyArgsInstance() {
return new getCloudJobSubmission_args();
@@ -34175,7 +35605,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34185,11 +35615,16 @@ public class Airavata {
}
}
- public static class updateSSHJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSSHJobSubmissionDetails_args, java.lang.Boolean> {
+ public static class updateSSHJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSSHJobSubmissionDetails_args, java.lang.Boolean, updateSSHJobSubmissionDetails_result> {
public updateSSHJobSubmissionDetails() {
super("updateSSHJobSubmissionDetails");
}
+ @Override
+ public updateSSHJobSubmissionDetails_result getEmptyResultInstance() {
+ return new updateSSHJobSubmissionDetails_result();
+ }
+
@Override
public updateSSHJobSubmissionDetails_args getEmptyArgsInstance() {
return new updateSSHJobSubmissionDetails_args();
@@ -34259,7 +35694,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34269,11 +35704,16 @@ public class Airavata {
}
}
- public static class updateCloudJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateCloudJobSubmissionDetails_args, java.lang.Boolean> {
+ public static class updateCloudJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateCloudJobSubmissionDetails_args, java.lang.Boolean, updateCloudJobSubmissionDetails_result> {
public updateCloudJobSubmissionDetails() {
super("updateCloudJobSubmissionDetails");
}
+ @Override
+ public updateCloudJobSubmissionDetails_result getEmptyResultInstance() {
+ return new updateCloudJobSubmissionDetails_result();
+ }
+
@Override
public updateCloudJobSubmissionDetails_args getEmptyArgsInstance() {
return new updateCloudJobSubmissionDetails_args();
@@ -34343,7 +35783,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34353,11 +35793,16 @@ public class Airavata {
}
}
- public static class updateUnicoreJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUnicoreJobSubmissionDetails_args, java.lang.Boolean> {
+ public static class updateUnicoreJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUnicoreJobSubmissionDetails_args, java.lang.Boolean, updateUnicoreJobSubmissionDetails_result> {
public updateUnicoreJobSubmissionDetails() {
super("updateUnicoreJobSubmissionDetails");
}
+ @Override
+ public updateUnicoreJobSubmissionDetails_result getEmptyResultInstance() {
+ return new updateUnicoreJobSubmissionDetails_result();
+ }
+
@Override
public updateUnicoreJobSubmissionDetails_args getEmptyArgsInstance() {
return new updateUnicoreJobSubmissionDetails_args();
@@ -34427,7 +35872,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34437,11 +35882,16 @@ public class Airavata {
}
}
- public static class addLocalDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addLocalDataMovementDetails_args, java.lang.String> {
+ public static class addLocalDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addLocalDataMovementDetails_args, java.lang.String, addLocalDataMovementDetails_result> {
public addLocalDataMovementDetails() {
super("addLocalDataMovementDetails");
}
+ @Override
+ public addLocalDataMovementDetails_result getEmptyResultInstance() {
+ return new addLocalDataMovementDetails_result();
+ }
+
@Override
public addLocalDataMovementDetails_args getEmptyArgsInstance() {
return new addLocalDataMovementDetails_args();
@@ -34510,7 +35960,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34520,11 +35970,16 @@ public class Airavata {
}
}
- public static class updateLocalDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateLocalDataMovementDetails_args, java.lang.Boolean> {
+ public static class updateLocalDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateLocalDataMovementDetails_args, java.lang.Boolean, updateLocalDataMovementDetails_result> {
public updateLocalDataMovementDetails() {
super("updateLocalDataMovementDetails");
}
+ @Override
+ public updateLocalDataMovementDetails_result getEmptyResultInstance() {
+ return new updateLocalDataMovementDetails_result();
+ }
+
@Override
public updateLocalDataMovementDetails_args getEmptyArgsInstance() {
return new updateLocalDataMovementDetails_args();
@@ -34594,7 +36049,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34604,11 +36059,16 @@ public class Airavata {
}
}
- public static class getLocalDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocalDataMovement_args, org.apache.airavata.model.data.movement.LOCALDataMovement> {
+ public static class getLocalDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocalDataMovement_args, org.apache.airavata.model.data.movement.LOCALDataMovement, getLocalDataMovement_result> {
public getLocalDataMovement() {
super("getLocalDataMovement");
}
+ @Override
+ public getLocalDataMovement_result getEmptyResultInstance() {
+ return new getLocalDataMovement_result();
+ }
+
@Override
public getLocalDataMovement_args getEmptyArgsInstance() {
return new getLocalDataMovement_args();
@@ -34677,7 +36137,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34687,11 +36147,16 @@ public class Airavata {
}
}
- public static class addSCPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSCPDataMovementDetails_args, java.lang.String> {
+ public static class addSCPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSCPDataMovementDetails_args, java.lang.String, addSCPDataMovementDetails_result> {
public addSCPDataMovementDetails() {
super("addSCPDataMovementDetails");
}
+ @Override
+ public addSCPDataMovementDetails_result getEmptyResultInstance() {
+ return new addSCPDataMovementDetails_result();
+ }
+
@Override
public addSCPDataMovementDetails_args getEmptyArgsInstance() {
return new addSCPDataMovementDetails_args();
@@ -34760,7 +36225,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34770,11 +36235,16 @@ public class Airavata {
}
}
- public static class updateSCPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSCPDataMovementDetails_args, java.lang.Boolean> {
+ public static class updateSCPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSCPDataMovementDetails_args, java.lang.Boolean, updateSCPDataMovementDetails_result> {
public updateSCPDataMovementDetails() {
super("updateSCPDataMovementDetails");
}
+ @Override
+ public updateSCPDataMovementDetails_result getEmptyResultInstance() {
+ return new updateSCPDataMovementDetails_result();
+ }
+
@Override
public updateSCPDataMovementDetails_args getEmptyArgsInstance() {
return new updateSCPDataMovementDetails_args();
@@ -34844,7 +36314,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34854,11 +36324,16 @@ public class Airavata {
}
}
- public static class getSCPDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSCPDataMovement_args, org.apache.airavata.model.data.movement.SCPDataMovement> {
+ public static class getSCPDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSCPDataMovement_args, org.apache.airavata.model.data.movement.SCPDataMovement, getSCPDataMovement_result> {
public getSCPDataMovement() {
super("getSCPDataMovement");
}
+ @Override
+ public getSCPDataMovement_result getEmptyResultInstance() {
+ return new getSCPDataMovement_result();
+ }
+
@Override
public getSCPDataMovement_args getEmptyArgsInstance() {
return new getSCPDataMovement_args();
@@ -34927,7 +36402,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -34937,11 +36412,16 @@ public class Airavata {
}
}
- public static class addUnicoreDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUnicoreDataMovementDetails_args, java.lang.String> {
+ public static class addUnicoreDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUnicoreDataMovementDetails_args, java.lang.String, addUnicoreDataMovementDetails_result> {
public addUnicoreDataMovementDetails() {
super("addUnicoreDataMovementDetails");
}
+ @Override
+ public addUnicoreDataMovementDetails_result getEmptyResultInstance() {
+ return new addUnicoreDataMovementDetails_result();
+ }
+
@Override
public addUnicoreDataMovementDetails_args getEmptyArgsInstance() {
return new addUnicoreDataMovementDetails_args();
@@ -35010,7 +36490,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35020,11 +36500,16 @@ public class Airavata {
}
}
- public static class updateUnicoreDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUnicoreDataMovementDetails_args, java.lang.Boolean> {
+ public static class updateUnicoreDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUnicoreDataMovementDetails_args, java.lang.Boolean, updateUnicoreDataMovementDetails_result> {
public updateUnicoreDataMovementDetails() {
super("updateUnicoreDataMovementDetails");
}
+ @Override
+ public updateUnicoreDataMovementDetails_result getEmptyResultInstance() {
+ return new updateUnicoreDataMovementDetails_result();
+ }
+
@Override
public updateUnicoreDataMovementDetails_args getEmptyArgsInstance() {
return new updateUnicoreDataMovementDetails_args();
@@ -35094,7 +36579,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35104,11 +36589,16 @@ public class Airavata {
}
}
- public static class getUnicoreDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUnicoreDataMovement_args, org.apache.airavata.model.data.movement.UnicoreDataMovement> {
+ public static class getUnicoreDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUnicoreDataMovement_args, org.apache.airavata.model.data.movement.UnicoreDataMovement, getUnicoreDataMovement_result> {
public getUnicoreDataMovement() {
super("getUnicoreDataMovement");
}
+ @Override
+ public getUnicoreDataMovement_result getEmptyResultInstance() {
+ return new getUnicoreDataMovement_result();
+ }
+
@Override
public getUnicoreDataMovement_args getEmptyArgsInstance() {
return new getUnicoreDataMovement_args();
@@ -35177,7 +36667,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35187,11 +36677,16 @@ public class Airavata {
}
}
- public static class addGridFTPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGridFTPDataMovementDetails_args, java.lang.String> {
+ public static class addGridFTPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGridFTPDataMovementDetails_args, java.lang.String, addGridFTPDataMovementDetails_result> {
public addGridFTPDataMovementDetails() {
super("addGridFTPDataMovementDetails");
}
+ @Override
+ public addGridFTPDataMovementDetails_result getEmptyResultInstance() {
+ return new addGridFTPDataMovementDetails_result();
+ }
+
@Override
public addGridFTPDataMovementDetails_args getEmptyArgsInstance() {
return new addGridFTPDataMovementDetails_args();
@@ -35260,7 +36755,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35270,11 +36765,16 @@ public class Airavata {
}
}
- public static class updateGridFTPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGridFTPDataMovementDetails_args, java.lang.Boolean> {
+ public static class updateGridFTPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGridFTPDataMovementDetails_args, java.lang.Boolean, updateGridFTPDataMovementDetails_result> {
public updateGridFTPDataMovementDetails() {
super("updateGridFTPDataMovementDetails");
}
+ @Override
+ public updateGridFTPDataMovementDetails_result getEmptyResultInstance() {
+ return new updateGridFTPDataMovementDetails_result();
+ }
+
@Override
public updateGridFTPDataMovementDetails_args getEmptyArgsInstance() {
return new updateGridFTPDataMovementDetails_args();
@@ -35344,7 +36844,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35354,11 +36854,16 @@ public class Airavata {
}
}
- public static class getGridFTPDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGridFTPDataMovement_args, org.apache.airavata.model.data.movement.GridFTPDataMovement> {
+ public static class getGridFTPDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGridFTPDataMovement_args, org.apache.airavata.model.data.movement.GridFTPDataMovement, getGridFTPDataMovement_result> {
public getGridFTPDataMovement() {
super("getGridFTPDataMovement");
}
+ @Override
+ public getGridFTPDataMovement_result getEmptyResultInstance() {
+ return new getGridFTPDataMovement_result();
+ }
+
@Override
public getGridFTPDataMovement_args getEmptyArgsInstance() {
return new getGridFTPDataMovement_args();
@@ -35427,7 +36932,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35437,11 +36942,16 @@ public class Airavata {
}
}
- public static class changeJobSubmissionPriority<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeJobSubmissionPriority_args, java.lang.Boolean> {
+ public static class changeJobSubmissionPriority<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeJobSubmissionPriority_args, java.lang.Boolean, changeJobSubmissionPriority_result> {
public changeJobSubmissionPriority() {
super("changeJobSubmissionPriority");
}
+ @Override
+ public changeJobSubmissionPriority_result getEmptyResultInstance() {
+ return new changeJobSubmissionPriority_result();
+ }
+
@Override
public changeJobSubmissionPriority_args getEmptyArgsInstance() {
return new changeJobSubmissionPriority_args();
@@ -35511,7 +37021,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35521,11 +37031,16 @@ public class Airavata {
}
}
- public static class changeDataMovementPriority<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeDataMovementPriority_args, java.lang.Boolean> {
+ public static class changeDataMovementPriority<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeDataMovementPriority_args, java.lang.Boolean, changeDataMovementPriority_result> {
public changeDataMovementPriority() {
super("changeDataMovementPriority");
}
+ @Override
+ public changeDataMovementPriority_result getEmptyResultInstance() {
+ return new changeDataMovementPriority_result();
+ }
+
@Override
public changeDataMovementPriority_args getEmptyArgsInstance() {
return new changeDataMovementPriority_args();
@@ -35595,7 +37110,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35605,11 +37120,16 @@ public class Airavata {
}
}
- public static class changeJobSubmissionPriorities<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeJobSubmissionPriorities_args, java.lang.Boolean> {
+ public static class changeJobSubmissionPriorities<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeJobSubmissionPriorities_args, java.lang.Boolean, changeJobSubmissionPriorities_result> {
public changeJobSubmissionPriorities() {
super("changeJobSubmissionPriorities");
}
+ @Override
+ public changeJobSubmissionPriorities_result getEmptyResultInstance() {
+ return new changeJobSubmissionPriorities_result();
+ }
+
@Override
public changeJobSubmissionPriorities_args getEmptyArgsInstance() {
return new changeJobSubmissionPriorities_args();
@@ -35679,7 +37199,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35689,11 +37209,16 @@ public class Airavata {
}
}
- public static class changeDataMovementPriorities<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeDataMovementPriorities_args, java.lang.Boolean> {
+ public static class changeDataMovementPriorities<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, changeDataMovementPriorities_args, java.lang.Boolean, changeDataMovementPriorities_result> {
public changeDataMovementPriorities() {
super("changeDataMovementPriorities");
}
+ @Override
+ public changeDataMovementPriorities_result getEmptyResultInstance() {
+ return new changeDataMovementPriorities_result();
+ }
+
@Override
public changeDataMovementPriorities_args getEmptyArgsInstance() {
return new changeDataMovementPriorities_args();
@@ -35763,7 +37288,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35773,11 +37298,16 @@ public class Airavata {
}
}
- public static class deleteJobSubmissionInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteJobSubmissionInterface_args, java.lang.Boolean> {
+ public static class deleteJobSubmissionInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteJobSubmissionInterface_args, java.lang.Boolean, deleteJobSubmissionInterface_result> {
public deleteJobSubmissionInterface() {
super("deleteJobSubmissionInterface");
}
+ @Override
+ public deleteJobSubmissionInterface_result getEmptyResultInstance() {
+ return new deleteJobSubmissionInterface_result();
+ }
+
@Override
public deleteJobSubmissionInterface_args getEmptyArgsInstance() {
return new deleteJobSubmissionInterface_args();
@@ -35847,7 +37377,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35857,11 +37387,16 @@ public class Airavata {
}
}
- public static class deleteDataMovementInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteDataMovementInterface_args, java.lang.Boolean> {
+ public static class deleteDataMovementInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteDataMovementInterface_args, java.lang.Boolean, deleteDataMovementInterface_result> {
public deleteDataMovementInterface() {
super("deleteDataMovementInterface");
}
+ @Override
+ public deleteDataMovementInterface_result getEmptyResultInstance() {
+ return new deleteDataMovementInterface_result();
+ }
+
@Override
public deleteDataMovementInterface_args getEmptyArgsInstance() {
return new deleteDataMovementInterface_args();
@@ -35931,7 +37466,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -35941,11 +37476,16 @@ public class Airavata {
}
}
- public static class registerResourceJobManager<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerResourceJobManager_args, java.lang.String> {
+ public static class registerResourceJobManager<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerResourceJobManager_args, java.lang.String, registerResourceJobManager_result> {
public registerResourceJobManager() {
super("registerResourceJobManager");
}
+ @Override
+ public registerResourceJobManager_result getEmptyResultInstance() {
+ return new registerResourceJobManager_result();
+ }
+
@Override
public registerResourceJobManager_args getEmptyArgsInstance() {
return new registerResourceJobManager_args();
@@ -36014,7 +37554,7 @@ public class Airavata {
}
@Override
- protected boolean isOneway() {
+ public boolean isOneway() {
return false;
}
@@ -36024,11 +37564,16 @@ public class Airavata {
}
}
- public static class updateResourceJobManager<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateResourceJobManager_args, java.lang.Boolean> {
... 32605 lines suppressed ...