This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/spring-module-reorg in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 16b4e308f4903165e81f031c1f704f19e26c4a54 Author: yasithdev <[email protected]> AuthorDate: Fri Mar 27 22:08:21 2026 -0500 refactor: migrate airavata-api from OpenJPA to Hibernate Replace OpenJPA dependency, bytecode enhancement plugin, and @ForeignKey annotations with Hibernate equivalents (@OnDelete). Delete persistence.xml — no longer needed with Hibernate runtime proxies. EntityManagerFactory usage in JPAUtils noted but left for the Spring Boot wrapping task. --- airavata-api/pom.xml | 33 +--- .../compute/model/AppEnvironmentEntity.java | 6 +- .../compute/model/ApplicationInputEntity.java | 6 +- .../compute/model/ApplicationOutputEntity.java | 6 +- .../model/BatchQueueResourcePolicyEntity.java | 6 +- .../compute/model/ComputeResourcePolicyEntity.java | 6 +- .../model/ComputeResourceReservationEntity.java | 6 +- .../model/GroupComputeResourcePrefEntity.java | 6 +- .../model/GroupSSHAccountProvisionerConfig.java | 6 +- .../compute/model/LibraryApendPathEntity.java | 6 +- .../compute/model/LibraryPrependPathEntity.java | 6 +- .../compute/model/ModuleLoadCmdEntity.java | 6 +- .../compute/model/PostjobCommandEntity.java | 6 +- .../compute/model/PrejobCommandEntity.java | 6 +- .../src/main/resources/META-INF/persistence.xml | 203 --------------------- pom.xml | 10 - 16 files changed, 41 insertions(+), 283 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index 3cfd280c24..55718ecbcd 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -111,8 +111,8 @@ under the License. </exclusions> </dependency> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <groupId>org.hibernate.orm</groupId> + <artifactId>hibernate-core</artifactId> </dependency> <dependency> <groupId>org.hibernate.validator</groupId> @@ -499,35 +499,6 @@ under the License. </configuration> </plugin> - <!-- Enhance OpenJPA Entities --> - <plugin> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <configuration> - <includes>**/entities/**/*.class,**/compute/model/*.class,**/storage/model/*.class,**/execution/model/*.class,**/execution/model/workflow/*.class,**/sharing/model/*.class,**/credential/model/*.class</includes> - <excludes>**/entities/**/XML*.class,**/entities/**/*PK.class,**/*PK.class</excludes> - <addDefaultConstructor>true</addDefaultConstructor> - <enforcePropertyRestrictions>true</enforcePropertyRestrictions> - <persistenceXmlFile>${project.basedir}/src/main/resources/META-INF/persistence.xml</persistenceXmlFile> - </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>4.1.1</version> - </dependency> - </dependencies> - </plugin> - <!-- Run Tests --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/AppEnvironmentEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/AppEnvironmentEntity.java index c1b35a7eef..6f8ac4177e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/AppEnvironmentEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/AppEnvironmentEntity.java @@ -21,8 +21,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the app_environment database table. @@ -49,7 +49,7 @@ public class AppEnvironmentEntity implements Serializable { @ManyToOne(targetEntity = ApplicationDeploymentEntity.class) @JoinColumn(name = "DEPLOYMENT_ID", nullable = false, updatable = false) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationDeploymentEntity applicationDeployment; public AppEnvironmentEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationInputEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationInputEntity.java index fc2c0705f1..9d8092a4c1 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationInputEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationInputEntity.java @@ -22,8 +22,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; import org.apache.airavata.model.application.io.DataType; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the application_input database table. @@ -83,7 +83,7 @@ public class ApplicationInputEntity implements Serializable { @ManyToOne(targetEntity = ApplicationInterfaceEntity.class) @JoinColumn(name = "INTERFACE_ID", nullable = false, updatable = false) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationInterfaceEntity applicationInterface; public ApplicationInputEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationOutputEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationOutputEntity.java index a405698780..b50ef9e7ae 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationOutputEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/ApplicationOutputEntity.java @@ -22,8 +22,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; import org.apache.airavata.model.application.io.DataType; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the application_output database table. @@ -75,7 +75,7 @@ public class ApplicationOutputEntity implements Serializable { @ManyToOne(targetEntity = ApplicationInterfaceEntity.class) @JoinColumn(name = "INTERFACE_ID", nullable = false, updatable = false) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationInterfaceEntity applicationInterface; public ApplicationOutputEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/BatchQueueResourcePolicyEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/BatchQueueResourcePolicyEntity.java index 1a86d60591..64df10b84c 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/BatchQueueResourcePolicyEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/BatchQueueResourcePolicyEntity.java @@ -26,8 +26,8 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the batch_queue_resource_policy database table. @@ -62,7 +62,7 @@ public class BatchQueueResourcePolicyEntity implements Serializable { @ManyToOne(targetEntity = GroupResourceProfileEntity.class) @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private GroupResourceProfileEntity groupResourceProfile; public BatchQueueResourcePolicyEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourcePolicyEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourcePolicyEntity.java index 5a9eb51f6e..c43e400734 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourcePolicyEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourcePolicyEntity.java @@ -30,8 +30,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import java.io.Serializable; import java.util.List; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the compute_resource_policy database table. @@ -62,7 +62,7 @@ public class ComputeResourcePolicyEntity implements Serializable { @ManyToOne(targetEntity = GroupResourceProfileEntity.class) @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private GroupResourceProfileEntity groupResourceProfile; public ComputeResourcePolicyEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourceReservationEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourceReservationEntity.java index 2903981a1f..865f383f44 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourceReservationEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/ComputeResourceReservationEntity.java @@ -32,8 +32,8 @@ import jakarta.persistence.Table; import java.io.Serializable; import java.sql.Timestamp; import java.util.List; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the COMPUTE_RESOURCE_RESERVATION database table. @@ -73,7 +73,7 @@ public class ComputeResourceReservationEntity implements Serializable { nullable = false, updatable = false) }) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private GroupComputeResourcePrefEntity groupComputeResourcePref; public ComputeResourceReservationEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupComputeResourcePrefEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupComputeResourcePrefEntity.java index 8deec605b6..76277cbf8d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupComputeResourcePrefEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupComputeResourcePrefEntity.java @@ -36,8 +36,8 @@ import jakarta.persistence.Table; import java.io.Serializable; 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 org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the group_compute_resource_preference database table. @@ -81,7 +81,7 @@ public abstract class GroupComputeResourcePrefEntity implements Serializable { @ManyToOne(targetEntity = GroupResourceProfileEntity.class, cascade = CascadeType.PERSIST) @JoinColumn(name = "GROUP_RESOURCE_PROFILE_ID", nullable = false, updatable = false) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private GroupResourceProfileEntity groupResourceProfile; public GroupComputeResourcePrefEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupSSHAccountProvisionerConfig.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupSSHAccountProvisionerConfig.java index 4def294703..0678f3f9b0 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupSSHAccountProvisionerConfig.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/GroupSSHAccountProvisionerConfig.java @@ -28,8 +28,8 @@ import jakarta.persistence.JoinColumns; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the grp_ssh_acc_prov_config database table. @@ -64,7 +64,7 @@ public class GroupSSHAccountProvisionerConfig implements Serializable { referencedColumnName = "GROUP_RESOURCE_PROFILE_ID", nullable = false) }) - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private GroupComputeResourcePrefEntity groupComputeResourcePref; public GroupSSHAccountProvisionerConfig() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryApendPathEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryApendPathEntity.java index 66520f6be1..02c787ec25 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryApendPathEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryApendPathEntity.java @@ -21,8 +21,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the library_apend_path database table. @@ -46,7 +46,7 @@ public class LibraryApendPathEntity implements Serializable { @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE) @JoinColumn(name = "DEPLOYMENT_ID") - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationDeploymentEntity applicationDeployment; public LibraryApendPathEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryPrependPathEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryPrependPathEntity.java index a1e261151b..986d411a6e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryPrependPathEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/LibraryPrependPathEntity.java @@ -21,8 +21,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the library_apend_path database table. @@ -47,7 +47,7 @@ public class LibraryPrependPathEntity implements Serializable { @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE) @JoinColumn(name = "DEPLOYMENT_ID") - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationDeploymentEntity applicationDeployment; public LibraryPrependPathEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/ModuleLoadCmdEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/ModuleLoadCmdEntity.java index a8d549f179..79cfd0ed6a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/ModuleLoadCmdEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/ModuleLoadCmdEntity.java @@ -21,8 +21,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the module_load_cmd database table. @@ -46,7 +46,7 @@ public class ModuleLoadCmdEntity implements Serializable { @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE) @JoinColumn(name = "APP_DEPLOYMENT_ID") - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationDeploymentEntity applicationDeployment; public ModuleLoadCmdEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/PostjobCommandEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/PostjobCommandEntity.java index bbc934f423..3c59bf2469 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/PostjobCommandEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/PostjobCommandEntity.java @@ -21,8 +21,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the postjob_command database table. @@ -46,7 +46,7 @@ public class PostjobCommandEntity implements Serializable { @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE) @JoinColumn(name = "APPDEPLOYMENT_ID") - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationDeploymentEntity applicationDeployment; public PostjobCommandEntity() {} diff --git a/airavata-api/src/main/java/org/apache/airavata/compute/model/PrejobCommandEntity.java b/airavata-api/src/main/java/org/apache/airavata/compute/model/PrejobCommandEntity.java index fd6cfea735..3cd8a7c7e1 100644 --- a/airavata-api/src/main/java/org/apache/airavata/compute/model/PrejobCommandEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/compute/model/PrejobCommandEntity.java @@ -21,8 +21,8 @@ package org.apache.airavata.compute.model; import jakarta.persistence.*; import java.io.Serializable; -import org.apache.openjpa.persistence.jdbc.ForeignKey; -import org.apache.openjpa.persistence.jdbc.ForeignKeyAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; /** * The persistent class for the prejob_command database table. @@ -46,7 +46,7 @@ public class PrejobCommandEntity implements Serializable { @ManyToOne(targetEntity = ApplicationDeploymentEntity.class, cascade = CascadeType.MERGE) @JoinColumn(name = "APPDEPLOYMENT_ID") - @ForeignKey(deleteAction = ForeignKeyAction.CASCADE) + @OnDelete(action = OnDeleteAction.CASCADE) private ApplicationDeploymentEntity applicationDeployment; public PrejobCommandEntity() {} diff --git a/airavata-api/src/main/resources/META-INF/persistence.xml b/airavata-api/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 5714ac677c..0000000000 --- a/airavata-api/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.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. - * -* --> -<persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="2.0"> - <persistence-unit name="profile_service"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.security.profile.commons.user.entities.UserProfileEntity</class> - <class>org.apache.airavata.security.profile.commons.user.entities.NSFDemographicsEntity</class> - <class>org.apache.airavata.security.profile.commons.user.entities.CustomizedDashboardEntity</class> - <class>org.apache.airavata.security.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="openjpa.jdbc.DBDictionary" value="mysql" /> - </properties> - </persistence-unit> - <persistence-unit name="appcatalog_data_new"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.storage.model.GridftpDataMovementEntity</class> - <class>org.apache.airavata.compute.model.ResourceJobManagerEntity</class> - <class>org.apache.airavata.compute.model.ComputeResourceEntity</class> - <class>org.apache.airavata.compute.model.ApplicationModuleEntity</class> - <class>org.apache.airavata.compute.model.ApplicationDeploymentEntity</class> - <class>org.apache.airavata.compute.model.ApplicationInterfaceEntity</class> - <class>org.apache.airavata.compute.model.GatewayGroupsEntity</class> - <class>org.apache.airavata.compute.model.GatewayProfileEntity</class> - <class>org.apache.airavata.storage.model.StorageResourceEntity</class> - <class>org.apache.airavata.storage.model.ScpDataMovementEntity</class> - <class>org.apache.airavata.compute.model.SshJobSubmissionEntity</class> - <class>org.apache.airavata.compute.model.GlobusSubmissionEntity</class> - <class>org.apache.airavata.compute.model.GsisshSubmissionEntity</class> - <class>org.apache.airavata.storage.model.GridftpEndpointEntity</class> - <class>org.apache.airavata.compute.model.ComputeResourcePreferenceEntity</class> - <class>org.apache.airavata.compute.model.JobSubmissionInterfaceEntity</class> - <class>org.apache.airavata.storage.model.DataMovementInterfaceEntity</class> - <class>org.apache.airavata.storage.model.StorageInterfaceEntity</class> - <class>org.apache.airavata.compute.model.LocalSubmissionEntity</class> - <class>org.apache.airavata.compute.model.GlobusGkEndpointEntity</class> - <class>org.apache.airavata.storage.model.UnicoreDatamovementEntity</class> - <class>org.apache.airavata.compute.model.UnicoreSubmissionEntity</class> - <class>org.apache.airavata.compute.model.GsisshPostjobcommandEntity</class> - <class>org.apache.airavata.compute.model.GsisshPrejobcommandEntity</class> - <class>org.apache.airavata.compute.model.GsisshExportEntity</class> - <class>org.apache.airavata.compute.model.LibraryApendPathEntity</class> - <class>org.apache.airavata.compute.model.LibraryPrependPathEntity</class> - <class>org.apache.airavata.compute.model.AppEnvironmentEntity</class> - <class>org.apache.airavata.compute.model.PrejobCommandEntity</class> - <class>org.apache.airavata.compute.model.PostjobCommandEntity</class> - <class>org.apache.airavata.compute.model.AppModuleMappingEntity</class> - <class>org.apache.airavata.compute.model.ApplicationInputEntity</class> - <class>org.apache.airavata.compute.model.ApplicationOutputEntity</class> - <class>org.apache.airavata.compute.model.BatchQueueEntity</class> - <class>org.apache.airavata.compute.model.ComputeResourceFileSystemEntity</class> - <class>org.apache.airavata.compute.model.CloudJobSubmissionEntity</class> - <class>org.apache.airavata.compute.model.JobManagerCommandEntity</class> - <class>org.apache.airavata.compute.model.ParallelismCommandEntity</class> - <class>org.apache.airavata.storage.model.LocalDataMovementEntity</class> - <class>org.apache.airavata.storage.model.StoragePreferenceEntity</class> - <class>org.apache.airavata.compute.model.SSHAccountProvisionerConfiguration</class> - <class>org.apache.airavata.compute.model.BatchQueueResourcePolicyEntity</class> - <class>org.apache.airavata.compute.model.ComputeResourcePolicyEntity</class> - <class>org.apache.airavata.compute.model.GroupComputeResourcePrefEntity</class> - <class>org.apache.airavata.compute.model.AWSGroupComputeResourcePrefEntity</class> - <class>org.apache.airavata.compute.model.SlurmGroupComputeResourcePrefEntity</class> - <class>org.apache.airavata.compute.model.GroupSSHAccountProvisionerConfig</class> - <class>org.apache.airavata.compute.model.GroupResourceProfileEntity</class> - <class>org.apache.airavata.compute.model.ModuleLoadCmdEntity</class> - <class>org.apache.airavata.compute.model.UserResourceProfileEntity</class> - <class>org.apache.airavata.compute.model.UserComputeResourcePreferenceEntity</class> - <class>org.apache.airavata.storage.model.UserStoragePreferenceEntity</class> - <class>org.apache.airavata.compute.model.ParserEntity</class> - <class>org.apache.airavata.compute.model.ParserInputEntity</class> - <class>org.apache.airavata.compute.model.ParserOutputEntity</class> - <class>org.apache.airavata.compute.model.ParsingTemplateEntity</class> - <class>org.apache.airavata.compute.model.ParsingTemplateInputEntity</class> - <class>org.apache.airavata.compute.model.ParserConnectorInputEntity</class> - <class>org.apache.airavata.compute.model.ParserConnectorEntity</class> - <class>org.apache.airavata.compute.model.ComputeResourceReservationEntity</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="openjpa.jdbc.MappingDefaults" - value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> - <property name="openjpa.jdbc.DBDictionary" value="mysql" /> - </properties> - </persistence-unit> - <persistence-unit name="replicacatalog_data_new"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.storage.model.ConfigurationEntity</class> - <class>org.apache.airavata.storage.model.DataProductEntity</class> - <class>org.apache.airavata.storage.model.DataProductMetadataEntity</class> - <class>org.apache.airavata.storage.model.DataReplicaLocationEntity</class> - <class>org.apache.airavata.storage.model.DataReplicaMetadataEntity</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="openjpa.jdbc.MappingDefaults" - value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> - <property name="openjpa.jdbc.DBDictionary" value="mysql" /> - </properties> - </persistence-unit> - <persistence-unit name="workflowcatalog_data_new"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.execution.model.workflow.AiravataWorkflowEntity</class> - <class> - org.apache.airavata.execution.model.workflow.AiravataWorkflowErrorEntity</class> - <class> - org.apache.airavata.execution.model.workflow.AiravataWorkflowStatusEntity</class> - <class>org.apache.airavata.execution.model.workflow.ApplicationErrorEntity</class> - <class> - org.apache.airavata.execution.model.workflow.ApplicationStatusEntity</class> - <class>org.apache.airavata.execution.model.workflow.HandlerErrorEntity</class> - <class>org.apache.airavata.execution.model.workflow.HandlerInputEntity</class> - <class>org.apache.airavata.execution.model.workflow.HandlerOutputEntity</class> - <class>org.apache.airavata.execution.model.workflow.HandlerStatusEntity</class> - <class> - org.apache.airavata.execution.model.workflow.WorkflowApplicationEntity</class> - <class> - org.apache.airavata.execution.model.workflow.WorkflowConnectionEntity</class> - <class> - org.apache.airavata.execution.model.workflow.WorkflowDataBlockEntity</class> - <class>org.apache.airavata.execution.model.workflow.WorkflowHandlerEntity</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="openjpa.jdbc.MappingDefaults" - value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> - <property name="openjpa.jdbc.DBDictionary" value="mysql" /> - </properties> - </persistence-unit> - <persistence-unit name="experiment_data_new"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.execution.model.ExperimentEntity</class> - <class>org.apache.airavata.execution.model.ExperimentErrorEntity</class> - <class>org.apache.airavata.execution.model.ExperimentInputEntity</class> - <class>org.apache.airavata.execution.model.ExperimentOutputEntity</class> - <class>org.apache.airavata.execution.model.ExperimentStatusEntity</class> - <class>org.apache.airavata.execution.model.ExperimentSummaryEntity</class> - <class>org.apache.airavata.execution.model.GatewayEntity</class> - <class>org.apache.airavata.execution.model.GatewayWorkerEntity</class> - <class>org.apache.airavata.execution.model.GatewayUsageReportingCommandEntity</class> - <class>org.apache.airavata.execution.model.JobEntity</class> - <class>org.apache.airavata.execution.model.JobStatusEntity</class> - <class>org.apache.airavata.execution.model.NotificationEntity</class> - <class>org.apache.airavata.execution.model.ProcessEntity</class> - <class>org.apache.airavata.execution.model.ProcessErrorEntity</class> - <class>org.apache.airavata.execution.model.ProcessInputEntity</class> - <class>org.apache.airavata.execution.model.ProcessOutputEntity</class> - <class>org.apache.airavata.execution.model.ProcessResourceScheduleEntity</class> - <class>org.apache.airavata.execution.model.ProcessStatusEntity</class> - <class>org.apache.airavata.execution.model.ProcessWorkflowEntity</class> - <class>org.apache.airavata.execution.model.ProjectEntity</class> - <class>org.apache.airavata.execution.model.ProjectUserEntity</class> - <class>org.apache.airavata.execution.model.QueueStatusEntity</class> - <class>org.apache.airavata.execution.model.TaskEntity</class> - <class>org.apache.airavata.execution.model.TaskErrorEntity</class> - <class>org.apache.airavata.execution.model.TaskStatusEntity</class> - <class>org.apache.airavata.execution.model.UserConfigurationDataEntity</class> - <class> - org.apache.airavata.execution.model.ComputationalResourceSchedulingEntity</class> - <class>org.apache.airavata.execution.model.UserEntity</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="openjpa.jdbc.MappingDefaults" - value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> - <property name="openjpa.jdbc.DBDictionary" value="mysql" /> - </properties> - </persistence-unit> - <persistence-unit name="airavata-sharing-registry"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.sharing.model.DomainEntity</class> - <class>org.apache.airavata.sharing.model.EntityEntity</class> - <class>org.apache.airavata.sharing.model.EntityTypeEntity</class> - <class>org.apache.airavata.sharing.model.GroupMembershipEntity</class> - <class>org.apache.airavata.sharing.model.PermissionTypeEntity</class> - <class>org.apache.airavata.sharing.model.SharingEntity</class> - <class>org.apache.airavata.sharing.model.UserEntity</class> - <class>org.apache.airavata.sharing.model.GroupAdminEntity</class> - <class>org.apache.airavata.sharing.model.UserGroupEntity</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="openjpa.jdbc.MappingDefaults" - value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> - <property name="openjpa.jdbc.DBDictionary" value="mysql" /> - </properties> - </persistence-unit> -</persistence> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7c9fdd3dca..47eb746ce7 100644 --- a/pom.xml +++ b/pom.xml @@ -252,11 +252,6 @@ under the License. <artifactId>helix-core</artifactId> <version>1.4.3</version> </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>4.1.1</version> - </dependency> <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> @@ -760,11 +755,6 @@ under the License. <artifactId>replacer</artifactId> <version>1.5.3</version> </plugin> - <plugin> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <version>4.1.1</version> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId>
