Lisätty @GeneratedValue ja @lob oleellisiin osiin..

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccessRight.java

@@ -10,7 +10,10 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToMany;
@@ -24,17 +27,18 @@ import javax.persistence.Version;
 @Table(name = "access_rights")
 @Table(name = "access_rights")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "AccessRight.findAll", query = "SELECT a FROM AccessRight a"),
         @NamedQuery(name = "AccessRight.findAll", query = "SELECT a FROM AccessRight a"),
-
         @NamedQuery(name = "AccessRight.findByName", query = "SELECT a FROM AccessRight a WHERE a.name = :name") })
         @NamedQuery(name = "AccessRight.findByName", query = "SELECT a FROM AccessRight a WHERE a.name = :name") })
 public class AccessRight implements ModelInterface {
 public class AccessRight implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "access_rights_id", nullable = false)
     @Column(name = "access_rights_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "right_name", nullable = false)
     @Column(name = "right_name", nullable = false)
     private String name;
     private String name;
 
 
+    @Lob
     @Column(name = "right_description")
     @Column(name = "right_description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java

@@ -11,6 +11,8 @@ import java.util.List;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -30,7 +32,6 @@ import javax.persistence.Version;
 @Table(name = "account_events")
 @Table(name = "account_events")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "AccountEvent.findAll", query = "SELECT a FROM AccountEvent a"),
         @NamedQuery(name = "AccountEvent.findAll", query = "SELECT a FROM AccountEvent a"),
-
         @NamedQuery(name = "AccountEvent.findByUnitPrice", query = "SELECT a FROM AccountEvent a WHERE a.unitPrice = :unitPrice"),
         @NamedQuery(name = "AccountEvent.findByUnitPrice", query = "SELECT a FROM AccountEvent a WHERE a.unitPrice = :unitPrice"),
         @NamedQuery(name = "AccountEvent.findByUnits", query = "SELECT a FROM AccountEvent a WHERE a.units = :units"),
         @NamedQuery(name = "AccountEvent.findByUnits", query = "SELECT a FROM AccountEvent a WHERE a.units = :units"),
         @NamedQuery(name = "AccountEvent.findByEventTime", query = "SELECT a FROM AccountEvent a WHERE a.eventTime = :eventTime"),
         @NamedQuery(name = "AccountEvent.findByEventTime", query = "SELECT a FROM AccountEvent a WHERE a.eventTime = :eventTime"),
@@ -39,6 +40,7 @@ public class AccountEvent implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "account_events_id", nullable = false)
     @Column(name = "account_events_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill.java

@@ -9,8 +9,11 @@ import java.util.List;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -27,7 +30,7 @@ import javax.persistence.Version;
  */
  */
 @Entity
 @Entity
 @Table(name = "bills")
 @Table(name = "bills")
-@NamedQueries( {
+@NamedQueries({
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
         // @NamedQuery(name = "Bill.findById", query =
         // @NamedQuery(name = "Bill.findById", query =
 
 
@@ -40,6 +43,7 @@ public class Bill implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "bills_id", nullable = false)
     @Column(name = "bills_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -54,6 +58,7 @@ public class Bill implements ModelInterface {
     @Column(name = "reference_number")
     @Column(name = "reference_number")
     private String referenceNumber;
     private String referenceNumber;
 
 
+    @Lob
     @Column(name = "notes")
     @Column(name = "notes")
     private String notes;
     private String notes;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java

@@ -9,6 +9,8 @@ import java.math.BigDecimal;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -31,6 +33,7 @@ import javax.persistence.Version;
 public class BillLine implements ModelInterface {
 public class BillLine implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "bill_lines_id", nullable = false)
     @Column(name = "bill_lines_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate.java

@@ -9,6 +9,8 @@ import java.util.List;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
@@ -31,6 +33,7 @@ import javax.persistence.Version;
 public class CardTemplate implements ModelInterface {
 public class CardTemplate implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "card_templates_id", nullable = false)
     @Column(name = "card_templates_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo.java

@@ -11,8 +11,11 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -41,6 +44,7 @@ import javax.persistence.Version;
 public class Compo implements ModelInterface {
 public class Compo implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "compos_id", nullable = false)
     @Column(name = "compos_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -67,6 +71,7 @@ public class Compo implements ModelInterface {
     @Temporal(TemporalType.TIMESTAMP)
     @Temporal(TemporalType.TIMESTAMP)
     private Date submitEnd;
     private Date submitEnd;
 
 
+    @Lob
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry.java

@@ -11,8 +11,11 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -39,6 +42,7 @@ import javax.persistence.Version;
 public class CompoEntry implements ModelInterface {
 public class CompoEntry implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "entries_id", nullable = false)
     @Column(name = "entries_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -49,9 +53,11 @@ public class CompoEntry implements ModelInterface {
     @Column(name = "entry_name", nullable = false)
     @Column(name = "entry_name", nullable = false)
     private String name;
     private String name;
 
 
+    @Lob
     @Column(name = "notes")
     @Column(name = "notes")
     private String notes;
     private String notes;
 
 
+    @Lob
     @Column(name = "screen_message")
     @Column(name = "screen_message")
     private String screenMessage;
     private String screenMessage;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile.java

@@ -9,6 +9,8 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
@@ -36,6 +38,7 @@ import javax.persistence.Version;
 public class CompoEntryFile implements ModelInterface {
 public class CompoEntryFile implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "entry_files_id", nullable = false)
     @Column(name = "entry_files_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -45,6 +48,7 @@ public class CompoEntryFile implements ModelInterface {
     @Column(name = "file_name")
     @Column(name = "file_name")
     private String fileName;
     private String fileName;
 
 
+    @Lob
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java

@@ -7,6 +7,8 @@ package fi.insomnia.bortal.model;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -28,6 +30,7 @@ public class CompoEntryParticipant implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "entry_participations_id", nullable = false)
     @Column(name = "entry_participations_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount.java

@@ -10,8 +10,11 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -38,6 +41,7 @@ import javax.persistence.Version;
 public class Discount implements ModelInterface {
 public class Discount implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "discounts_id", nullable = false)
     @Column(name = "discounts_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -47,6 +51,7 @@ public class Discount implements ModelInterface {
     @Column(name = "code")
     @Column(name = "code")
     private String code;
     private String code;
 
 
+    @Lob
     @Column(name = "details")
     @Column(name = "details")
     private String details;
     private String details;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance.java

@@ -8,6 +8,8 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -28,6 +30,7 @@ public class DiscountInstance implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "discounts_instances_id", nullable = false)
     @Column(name = "discounts_instances_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Event.java

@@ -10,6 +10,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -38,6 +40,7 @@ public class Event implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "events_id", nullable = false)
     @Column(name = "events_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java

@@ -9,6 +9,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
@@ -32,6 +34,7 @@ public class EventMap implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "maps_id", nullable = false)
     @Column(name = "maps_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java

@@ -9,6 +9,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -30,6 +32,7 @@ public class EventSettings implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "event_settings_id", nullable = false)
     @Column(name = "event_settings_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java

@@ -9,6 +9,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -31,6 +33,7 @@ public class EventStatus implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "event_status_id", nullable = false)
     @Column(name = "event_status_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java

@@ -9,7 +9,10 @@ import java.util.List;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToMany;
@@ -34,12 +37,14 @@ public class FoodWave implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "food_waves_id", nullable = false)
     @Column(name = "food_waves_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "wave_name", nullable = false)
     @Column(name = "wave_name", nullable = false)
     private String name;
     private String name;
 
 
+    @Lob
     @Column(name = "wave_description")
     @Column(name = "wave_description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java

@@ -8,7 +8,10 @@ import java.util.List;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -29,12 +32,14 @@ public class FoodWaveTemplate implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "food_wave_templates_id", nullable = false)
     @Column(name = "food_wave_templates_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "template_name", nullable = false)
     @Column(name = "template_name", nullable = false)
     private String name;
     private String name;
 
 
+    @Lob
     @Column(name = "template_description")
     @Column(name = "template_description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java

@@ -8,6 +8,8 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -36,6 +38,7 @@ public class GroupMembership implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "group_memberships_id", nullable = false)
     @Column(name = "group_memberships_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location.java

@@ -8,6 +8,8 @@ import java.util.List;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -27,6 +29,7 @@ public class Location implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "locations_id", nullable = false)
     @Column(name = "locations_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry.java

@@ -8,8 +8,11 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -33,6 +36,7 @@ public class LogEntry implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "event_log_id", nullable = false)
     @Column(name = "event_log_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -40,6 +44,7 @@ public class LogEntry implements ModelInterface {
     @Temporal(TemporalType.TIMESTAMP)
     @Temporal(TemporalType.TIMESTAMP)
     private Date time;
     private Date time;
 
 
+    @Lob
     @Column(name = "event_description")
     @Column(name = "event_description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType.java

@@ -9,7 +9,10 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToMany;
@@ -21,7 +24,7 @@ import javax.persistence.Version;
  */
  */
 @Entity
 @Entity
 @Table(name = "event_log_types")
 @Table(name = "event_log_types")
-@NamedQueries( {
+@NamedQueries({
         @NamedQuery(name = "LogEntryType.findAll", query = "SELECT l FROM LogEntryType l"),
         @NamedQuery(name = "LogEntryType.findAll", query = "SELECT l FROM LogEntryType l"),
 
 
         @NamedQuery(name = "LogEntryType.findByDescription", query = "SELECT l FROM LogEntryType l WHERE l.description = :description") })
         @NamedQuery(name = "LogEntryType.findByDescription", query = "SELECT l FROM LogEntryType l WHERE l.description = :description") })
@@ -30,9 +33,11 @@ public class LogEntryType implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "event_log_types_id", nullable = false)
     @Column(name = "event_log_types_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
+    @Lob
     @Column(name = "event_type_description", nullable = false)
     @Column(name = "event_type_description", nullable = false)
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/News.java

@@ -8,8 +8,11 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -24,7 +27,7 @@ import javax.persistence.Version;
  */
  */
 @Entity
 @Entity
 @Table(name = "news")
 @Table(name = "news")
-@NamedQueries( {
+@NamedQueries({
         @NamedQuery(name = "News.findAll", query = "SELECT n FROM News n"),
         @NamedQuery(name = "News.findAll", query = "SELECT n FROM News n"),
 
 
         @NamedQuery(name = "News.findByTitle", query = "SELECT n FROM News n WHERE n.title = :title"),
         @NamedQuery(name = "News.findByTitle", query = "SELECT n FROM News n WHERE n.title = :title"),
@@ -37,15 +40,18 @@ public class News implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "news_id", nullable = false)
     @Column(name = "news_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "title", nullable = false)
     @Column(name = "title", nullable = false)
     private String title;
     private String title;
 
 
+    @Lob
     @Column(name = "body")
     @Column(name = "body")
     private String body;
     private String body;
 
 
+    @Lob
     @Column(name = "abstract")
     @Column(name = "abstract")
     private String bodyAbstract;
     private String bodyAbstract;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup.java

@@ -9,8 +9,11 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -26,7 +29,6 @@ import javax.persistence.Version;
 @Table(name = "news_groups")
 @Table(name = "news_groups")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "NewsGroup.findAll", query = "SELECT n FROM NewsGroup n"),
         @NamedQuery(name = "NewsGroup.findAll", query = "SELECT n FROM NewsGroup n"),
-
         @NamedQuery(name = "NewsGroup.findByName", query = "SELECT n FROM NewsGroup n WHERE n.name = :name"),
         @NamedQuery(name = "NewsGroup.findByName", query = "SELECT n FROM NewsGroup n WHERE n.name = :name"),
         @NamedQuery(name = "NewsGroup.findByDescription", query = "SELECT n FROM NewsGroup n WHERE n.description = :description"),
         @NamedQuery(name = "NewsGroup.findByDescription", query = "SELECT n FROM NewsGroup n WHERE n.description = :description"),
         @NamedQuery(name = "NewsGroup.findByPriority", query = "SELECT n FROM NewsGroup n WHERE n.priority = :priority") })
         @NamedQuery(name = "NewsGroup.findByPriority", query = "SELECT n FROM NewsGroup n WHERE n.priority = :priority") })
@@ -35,12 +37,14 @@ public class NewsGroup implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "news_groups_id", nullable = false)
     @Column(name = "news_groups_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "group_name", nullable = false)
     @Column(name = "group_name", nullable = false)
     private String name;
     private String name;
-
+    
+    @Lob
     @Column(name = "group_description")
     @Column(name = "group_description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java

@@ -6,8 +6,11 @@ package fi.insomnia.bortal.model;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -33,8 +36,10 @@ public class Place implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "places_id", nullable = false)
     @Column(name = "places_id", nullable = false)
     private Integer id;
     private Integer id;
+    @Lob
     @Column(name = "place_description")
     @Column(name = "place_description")
     private String description;
     private String description;
     @Column(name = "place_name")
     @Column(name = "place_name")
@@ -44,6 +49,7 @@ public class Place implements ModelInterface {
     @Column(name = "map_y")
     @Column(name = "map_y")
     private Integer mapY;
     private Integer mapY;
     @Column(name = "place_details")
     @Column(name = "place_details")
+    @Lob
     private String details;
     private String details;
     @Column(name = "place_code")
     @Column(name = "place_code")
     private String code;
     private String code;

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java

@@ -10,8 +10,11 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -39,6 +42,7 @@ public class PlaceGroup implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "groups_id", nullable = false)
     @Column(name = "groups_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
@@ -59,6 +63,7 @@ public class PlaceGroup implements ModelInterface {
     @Column(name = "group_active", nullable = false)
     @Column(name = "group_active", nullable = false)
     private boolean active;
     private boolean active;
 
 
+    @Lob
     @Column(name = "group_details")
     @Column(name = "group_details")
     private String details;
     private String details;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java

@@ -11,6 +11,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -37,6 +39,7 @@ import javax.persistence.Version;
 public class PrintedCard implements ModelInterface {
 public class PrintedCard implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "printed_cards_id", nullable = false)
     @Column(name = "printed_cards_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java

@@ -10,6 +10,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.JoinTable;
@@ -37,6 +39,7 @@ public class Product implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "products_id", nullable = false)
     @Column(name = "products_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java

@@ -9,8 +9,11 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
@@ -33,12 +36,14 @@ public class Reader implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "readers_id", nullable = false)
     @Column(name = "readers_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "reader_ident")
     @Column(name = "reader_ident")
     private String identification;
     private String identification;
 
 
+    @Lob
     @Column(name = "reader_description")
     @Column(name = "reader_description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java

@@ -8,6 +8,8 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -33,6 +35,7 @@ public class ReaderEvent implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "reader_events_id", nullable = false)
     @Column(name = "reader_events_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java

@@ -9,6 +9,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.JoinTable;
@@ -34,6 +36,7 @@ public class Role implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "roles_id", nullable = false)
     @Column(name = "roles_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight.java

@@ -6,6 +6,8 @@ package fi.insomnia.bortal.model;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -37,6 +39,7 @@ public class RoleRight implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "role_rights_id", nullable = false)
     @Column(name = "role_rights_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java

@@ -10,6 +10,8 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQueries;
@@ -48,6 +50,7 @@ public class User implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "users_id", nullable = false)
     @Column(name = "users_id", nullable = false)
     private Integer id;
     private Integer id;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage.java

@@ -6,6 +6,8 @@ package fi.insomnia.bortal.model;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
@@ -31,12 +33,14 @@ public class UserImage implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "user_images_id", nullable = false)
     @Column(name = "user_images_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
     @Column(name = "name")
     @Column(name = "name")
     private String name;
     private String name;
 
 
+    @Lob
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote.java

@@ -8,6 +8,8 @@ import java.util.Date;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
@@ -34,6 +36,7 @@ public class Vote implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name = "votes_id", nullable = false)
     @Column(name = "votes_id", nullable = false)
     private Integer id;
     private Integer id;
     @Column(name = "score")
     @Column(name = "score")