diff --git a/processes-services/src/main/java/org/exoplatform/processes/entity/WorkEntity.java b/processes-services/src/main/java/org/exoplatform/processes/entity/WorkEntity.java
index a3757681f..cebbe9408 100644
--- a/processes-services/src/main/java/org/exoplatform/processes/entity/WorkEntity.java
+++ b/processes-services/src/main/java/org/exoplatform/processes/entity/WorkEntity.java
@@ -16,26 +16,33 @@
*/
package org.exoplatform.processes.entity;
-import lombok.Data;
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
-import jakarta.persistence.*;
import java.io.Serializable;
import java.util.Date;
+import io.meeds.common.persistence.PortableSequence;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import lombok.Data;
+
@Entity(name = "Work")
-@ExoEntity
@Table(name = "PROCESSES_WORK")
@Data
-@NamedQueries({
- @NamedQuery(name = "Work.findAllWorkDraftsByUser", query = "SELECT DISTINCT w FROM Work w where w.creatorId = :userId and w.isDraft = true order by w.id desc"),
- @NamedQuery(name = "Work.getWorkDraftByTaskId", query = "SELECT DISTINCT w FROM Work w where w.taskId = :taskId and w.isDraft = true"),
- @NamedQuery(name = "Work.findAllWorkDraftsByWorkflowId", query = "SELECT DISTINCT w FROM Work w where w.workFlow.id = :workflowId and w.isDraft = true"),})
+@NamedQuery(name = "Work.findAllWorkDraftsByUser", query = "SELECT DISTINCT w FROM Work w where w.creatorId = :userId and w.isDraft = true order by w.id desc")
+@NamedQuery(name = "Work.getWorkDraftByTaskId", query = "SELECT DISTINCT w FROM Work w where w.taskId = :taskId and w.isDraft = true")
+@NamedQuery(name = "Work.findAllWorkDraftsByWorkflowId", query = "SELECT DISTINCT w FROM Work w where w.workFlow.id = :workflowId and w.isDraft = true")
public class WorkEntity implements Serializable {
+ private static final long serialVersionUID = -8490912256477367410L;
+
@Id
- @SequenceGenerator(name = "SEQ_WORK_ID", sequenceName = "SEQ_WORK_ID", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WORK_ID")
+ @PortableSequence(name = "SEQ_WORK_ID")
@Column(name = "WORK_ID", nullable = false)
private Long id;
diff --git a/processes-services/src/main/java/org/exoplatform/processes/entity/WorkFlowEntity.java b/processes-services/src/main/java/org/exoplatform/processes/entity/WorkFlowEntity.java
index 1376beeda..66d6f1471 100644
--- a/processes-services/src/main/java/org/exoplatform/processes/entity/WorkFlowEntity.java
+++ b/processes-services/src/main/java/org/exoplatform/processes/entity/WorkFlowEntity.java
@@ -5,31 +5,33 @@
import java.util.HashSet;
import java.util.Set;
-import jakarta.persistence.*;
-
-import org.exoplatform.commons.api.persistence.ExoEntity;
-
+import io.meeds.common.persistence.PortableSequence;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
import lombok.Data;
@Entity(name = "WorkFlow")
-@ExoEntity
@Table(name = "PROCESSES_WORK_FLOW")
@Data
-@NamedQueries({
- @NamedQuery(name = "WorkFlow.getWorkFlowByProjectId", query = "SELECT DISTINCT c FROM WorkFlow c where c.projectId = :projectId"),
- @NamedQuery(name = "WorkFlow.findAllWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId order by c.id desc"),
- @NamedQuery(name = "WorkFlow.findEnabledWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId and c.enabled = true order by c.id desc"),
- @NamedQuery(name = "WorkFlow.findAllWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c order by c.id desc"),
- @NamedQuery(name = "WorkFlow.findEnabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = true order by c.id desc"),
- @NamedQuery(name = "WorkFlow.findDisabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = false order by c.id desc"),
-
-})
-
+@NamedQuery(name = "WorkFlow.getWorkFlowByProjectId", query = "SELECT DISTINCT c FROM WorkFlow c where c.projectId = :projectId")
+@NamedQuery(name = "WorkFlow.findAllWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId order by c.id desc")
+@NamedQuery(name = "WorkFlow.findEnabledWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId and c.enabled = true order by c.id desc")
+@NamedQuery(name = "WorkFlow.findAllWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c order by c.id desc")
+@NamedQuery(name = "WorkFlow.findEnabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = true order by c.id desc")
+@NamedQuery(name = "WorkFlow.findDisabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = false order by c.id desc")
public class WorkFlowEntity implements Serializable {
+ private static final long serialVersionUID = 6804751507896811367L;
+
@Id
- @SequenceGenerator(name = "SEQ_WORK_FLOW_ID", sequenceName = "SEQ_WORK_FLOW_ID", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WORK_FLOW_ID")
+ @PortableSequence(name = "SEQ_WORK_FLOW_ID")
@Column(name = "WORK_FLOW_ID", nullable = false)
private Long id;
diff --git a/processes-services/src/main/resources/jpa-entities.idx b/processes-services/src/main/resources/jpa-entities.idx
new file mode 100644
index 000000000..f9a6af74d
--- /dev/null
+++ b/processes-services/src/main/resources/jpa-entities.idx
@@ -0,0 +1,2 @@
+org.exoplatform.processes.entity.WorkEntity
+org.exoplatform.processes.entity.WorkFlowEntity
diff --git a/processes-webapp/pom.xml b/processes-webapp/pom.xml
index 4993fe968..4d98193bd 100644
--- a/processes-webapp/pom.xml
+++ b/processes-webapp/pom.xml
@@ -88,7 +88,7 @@
org.apache.maven.plugins
maven-war-plugin
- **/*.less,**/less/**,**/*.vue,css/lib/*,vue-app/**,js/mock/**/*,**-dev.*
+ WEB-INF/lib/**,**/*.less,**/less/**,**/*.vue,css/lib/*,vue-app/**,js/mock/**/*,**-dev.*