User table sequence generator for maximum compatibility

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java
index f61241409241ce2b32035ddfc63b5d589cab0be2..a8c2258f701793bd8585ce0af52b7a75ae5fa980 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java
@@ -19,6 +19,7 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+import javax.persistence.TableGenerator;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -38,14 +39,15 @@ import javax.xml.bind.annotation.XmlRootElement;
     @NamedQuery(name = "Attribute.findByValue", query = "SELECT a FROM Attribute a WHERE a.value = :value"),
     @NamedQuery(name = "Attribute.findByGroupId", query = "SELECT a FROM Attribute a WHERE a.attributeGroup.id=:attributeGroupId")
 })
-@SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 10000)
+@TableGenerator(name = "TABLE_GEN", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
+        valueColumnName = "SEQ_COUNT", pkColumnValue = "DATA_SEQ", allocationSize = 500, initialValue = 10000)
 public class Attribute implements Serializable {
 
     private static final long serialVersionUID = 1L;
     @Id
     @Basic(optional = false)
     @NotNull
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     @Column(name = "id")
     private long id;
     @Size(max = 255)

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java
index b5fe16fd48bb40de930e3638573a1cfd7beff21c..191e346563ca57f7e28407d40eb450d4879806d9 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java
@@ -42,7 +42,7 @@ public class AttributeGroup implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     @Column(name = "id")
     private long id;
     @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, cascade = {CascadeType.ALL}, mappedBy = "attributeGroup")

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java
index e3e5c4b45fb159541ab7ce341aa948aad30e5d98..49221c29f7248376cccdb762ac5f157dc70dd25c 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java
@@ -43,7 +43,7 @@ public class Chunk implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     @Column(name = "id")
     private long id;
     @Column(name = "file_id", nullable = false)

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java
index cd3b0d29a22d6620d45feb1ab55594793cf50e76..f22ff590faaee0dcf5cef82af968a88094ece611 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java
@@ -52,7 +52,7 @@ public class GDEFile implements Serializable {
     @Basic(optional = false)
     @NotNull
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     private long id;
     @Size(max = 255)
     @Column(name = "name")

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java
index d9c900eceb33c45cc2af842e473d2d767ee4ee96..d873d399f759de252db498a23178bd0e1dd5b2bd 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java
@@ -33,7 +33,7 @@ public class Group {
     @Basic(optional = false)
     @NotNull
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     private Long id;
     @Size(max = 255)
     @Column(name = "groupName")

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java
index ad0f1b6b4ff350c4da1077c7428155d3a7a84c83..9903f6c3492434dbe760a502a830ccdf67de9204 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java
@@ -44,7 +44,7 @@ public class GroupPermission implements Serializable {
     @Basic(optional = false)
     @NotNull
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     private Long id;
     @Column(name = "groupId")
     long groupId;

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java
index 95a39ca56284faafd4850f40190fcc081729afbd..9dd45f6231edcde3a2c6ed8cd7ac73ebc393aa74 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java
@@ -45,7 +45,7 @@ public class Profile implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     @Column(name = "id")
     private Long id;
     @Size(max = 255)

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java
index 9060533a2ba62d65b9cb73d4bdcfe6d85d9472ad..66db249dd8399083c882b61fe792912b13ca1c57 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java
@@ -40,7 +40,7 @@ public class ProfileAttribute implements Serializable {
     @Id
     @Basic(optional = false)
     @NotNull
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     @Column(name = "id")
     private Long id;
     @Size(max = 255)

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java
index b196f35c05eab2409eec60a85dc17e371ecf654d..a391b88c51c40f8a446a8bb7e637899d0e1410a3 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java
@@ -51,7 +51,7 @@ public class Study implements Serializable {
     @Basic(optional = false)
     @NotNull
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     private long id;
     @Size(max = 255)
     @Column(name = "name")

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java
index 4815e19e41492528c4b06445ba9a68532cc71ec3..e00e4672fdda2e1e95cf10f16783f06d544c9c2b 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java
@@ -38,7 +38,7 @@ public class User implements Serializable {
     @Basic(optional = false)
     @NotNull
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     private Long id;
     @Size(max = 255)
     @Column(name = "userName")

diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java
index 077597340076343e841b61f7950c887739107936..42cf2c6987dfa704eee64f6bb244d548fd2e81ca 100644 (file)
--- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java
+++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java
@@ -44,7 +44,7 @@ public class UserGroup implements Serializable {
     @Basic(optional = false)
     @NotNull
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TABLE_GEN")
     private Long id;
     @Column(name = "userId")
     long userId;