removed :id fetches

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

@@ -24,7 +24,7 @@ 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.findById", query = "SELECT a FROM AccessRight a WHERE a.id = :id"),
+
         @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;

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

@@ -30,7 +30,7 @@ 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.findById", query = "SELECT a FROM AccountEvent a WHERE a.id = :id"),
+
         @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"),

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

@@ -30,7 +30,7 @@ import javax.persistence.Version;
 @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 =
-        // "SELECT b FROM Bill b WHERE id = :id"),
+
         @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
         @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
         @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
         @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
         @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),
         @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),

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

@@ -24,7 +24,7 @@ import javax.persistence.Version;
 @Table(name = "bill_lines")
 @Table(name = "bill_lines")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
         @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
-	@NamedQuery(name = "BillLine.findById", query = "SELECT b FROM BillLine b WHERE id = :id"),
+
         @NamedQuery(name = "BillLine.findByProduct", query = "SELECT b FROM BillLine b WHERE b.product = :name"),
         @NamedQuery(name = "BillLine.findByProduct", query = "SELECT b FROM BillLine b WHERE b.product = :name"),
         @NamedQuery(name = "BillLine.findByUnits", query = "SELECT b FROM BillLine b WHERE b.units = :units"),
         @NamedQuery(name = "BillLine.findByUnits", query = "SELECT b FROM BillLine b WHERE b.units = :units"),
         @NamedQuery(name = "BillLine.findByUnitPrice", query = "SELECT b FROM BillLine b WHERE b.unitPrice = :unitPrice"),
         @NamedQuery(name = "BillLine.findByUnitPrice", query = "SELECT b FROM BillLine b WHERE b.unitPrice = :unitPrice"),

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

@@ -26,7 +26,7 @@ import javax.persistence.Version;
 @Table(name = "card_templates")
 @Table(name = "card_templates")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "CardTemplate.findAll", query = "SELECT c FROM CardTemplate c"),
         @NamedQuery(name = "CardTemplate.findAll", query = "SELECT c FROM CardTemplate c"),
-        @NamedQuery(name = "CardTemplate.findById", query = "SELECT c FROM CardTemplate c WHERE c.id = :id"),
+
         @NamedQuery(name = "CardTemplate.findByName", query = "SELECT c FROM CardTemplate c WHERE c.name = :name") })
         @NamedQuery(name = "CardTemplate.findByName", query = "SELECT c FROM CardTemplate c WHERE c.name = :name") })
 public class CardTemplate implements ModelInterface {
 public class CardTemplate implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

@@ -29,7 +29,7 @@ import javax.persistence.Version;
 @Table(name = "compos")
 @Table(name = "compos")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Compo.findAll", query = "SELECT c FROM Compo c"),
         @NamedQuery(name = "Compo.findAll", query = "SELECT c FROM Compo c"),
-        @NamedQuery(name = "Compo.findById", query = "SELECT c FROM Compo c WHERE c.id = :id"),
+
         @NamedQuery(name = "Compo.findByName", query = "SELECT c FROM Compo c WHERE c.name = :name"),
         @NamedQuery(name = "Compo.findByName", query = "SELECT c FROM Compo c WHERE c.name = :name"),
         @NamedQuery(name = "Compo.findByStartTime", query = "SELECT c FROM Compo c WHERE c.startTime = :startTime"),
         @NamedQuery(name = "Compo.findByStartTime", query = "SELECT c FROM Compo c WHERE c.startTime = :startTime"),
         @NamedQuery(name = "Compo.findByVoteStart", query = "SELECT c FROM Compo c WHERE c.voteStart = :voteStart"),
         @NamedQuery(name = "Compo.findByVoteStart", query = "SELECT c FROM Compo c WHERE c.voteStart = :voteStart"),

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

@@ -30,7 +30,7 @@ import javax.persistence.Version;
 @Table(name = "entries")
 @Table(name = "entries")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "CompoEntry.findAll", query = "SELECT c FROM CompoEntry c"),
         @NamedQuery(name = "CompoEntry.findAll", query = "SELECT c FROM CompoEntry c"),
-        @NamedQuery(name = "CompoEntry.findById", query = "SELECT c FROM CompoEntry c WHERE c.id = :id"),
+
         @NamedQuery(name = "CompoEntry.findByCreated", query = "SELECT c FROM CompoEntry c WHERE c.created = :created"),
         @NamedQuery(name = "CompoEntry.findByCreated", query = "SELECT c FROM CompoEntry c WHERE c.created = :created"),
         @NamedQuery(name = "CompoEntry.findByName", query = "SELECT c FROM CompoEntry c WHERE c.name = :name"),
         @NamedQuery(name = "CompoEntry.findByName", query = "SELECT c FROM CompoEntry c WHERE c.name = :name"),
         @NamedQuery(name = "CompoEntry.findByNotes", query = "SELECT c FROM CompoEntry c WHERE c.notes = :notes"),
         @NamedQuery(name = "CompoEntry.findByNotes", query = "SELECT c FROM CompoEntry c WHERE c.notes = :notes"),

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

@@ -27,7 +27,7 @@ import javax.persistence.Version;
 @Table(name = "entry_files")
 @Table(name = "entry_files")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "CompoEntryFile.findAll", query = "SELECT c FROM CompoEntryFile c"),
         @NamedQuery(name = "CompoEntryFile.findAll", query = "SELECT c FROM CompoEntryFile c"),
-        @NamedQuery(name = "CompoEntryFile.findById", query = "SELECT c FROM CompoEntryFile c WHERE c.id = :id"),
+
         @NamedQuery(name = "CompoEntryFile.findByMimeType", query = "SELECT c FROM CompoEntryFile c WHERE c.mimeType = :mimeType"),
         @NamedQuery(name = "CompoEntryFile.findByMimeType", query = "SELECT c FROM CompoEntryFile c WHERE c.mimeType = :mimeType"),
         @NamedQuery(name = "CompoEntryFile.findByFileName", query = "SELECT c FROM CompoEntryFile c WHERE c.fileName = :fileName"),
         @NamedQuery(name = "CompoEntryFile.findByFileName", query = "SELECT c FROM CompoEntryFile c WHERE c.fileName = :fileName"),
         @NamedQuery(name = "CompoEntryFile.findByDescription", query = "SELECT c FROM CompoEntryFile c WHERE c.description = :description"),
         @NamedQuery(name = "CompoEntryFile.findByDescription", query = "SELECT c FROM CompoEntryFile c WHERE c.description = :description"),

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

@@ -22,7 +22,7 @@ import javax.persistence.Version;
 @Table(name = "entry_participations")
 @Table(name = "entry_participations")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"),
         @NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"),
-	@NamedQuery(name = "CompoEntryParticipant.findById", query = "SELECT c FROM CompoEntryParticipant c WHERE c.id = :id"),
+
         @NamedQuery(name = "CompoEntryParticipant.findByRole", query = "SELECT c FROM CompoEntryParticipant c WHERE c.role = :role") })
         @NamedQuery(name = "CompoEntryParticipant.findByRole", query = "SELECT c FROM CompoEntryParticipant c WHERE c.role = :role") })
 public class CompoEntryParticipant implements ModelInterface {
 public class CompoEntryParticipant implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

@@ -26,7 +26,7 @@ import javax.persistence.Version;
 @Table(name = "discounts")
 @Table(name = "discounts")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Discount.findAll", query = "SELECT d FROM Discount d"),
         @NamedQuery(name = "Discount.findAll", query = "SELECT d FROM Discount d"),
-	@NamedQuery(name = "Discount.findById", query = "SELECT d FROM Discount d WHERE d.id = :id"),
+
         @NamedQuery(name = "Discount.findByPercentage", query = "SELECT d FROM Discount d WHERE d.percentage = :percentage"),
         @NamedQuery(name = "Discount.findByPercentage", query = "SELECT d FROM Discount d WHERE d.percentage = :percentage"),
         @NamedQuery(name = "Discount.findByCode", query = "SELECT d FROM Discount d WHERE d.code = :code"),
         @NamedQuery(name = "Discount.findByCode", query = "SELECT d FROM Discount d WHERE d.code = :code"),
         @NamedQuery(name = "Discount.findByDetails", query = "SELECT d FROM Discount d WHERE d.details = :details"),
         @NamedQuery(name = "Discount.findByDetails", query = "SELECT d FROM Discount d WHERE d.details = :details"),

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

@@ -23,9 +23,7 @@ import javax.persistence.Version;
  */
  */
 @Entity
 @Entity
 @Table(name = "discount_instances")
 @Table(name = "discount_instances")
-@NamedQueries( {
-        @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d"),
-        @NamedQuery(name = "DiscountInstance.findById", query = "SELECT d FROM DiscountInstance d WHERE d.id = :id") })
+@NamedQueries( { @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d"), })
 public class DiscountInstance implements ModelInterface {
 public class DiscountInstance implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

@@ -29,7 +29,7 @@ import javax.persistence.Version;
 @Table(name = "events")
 @Table(name = "events")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Event.findAll", query = "SELECT e FROM Event e"),
         @NamedQuery(name = "Event.findAll", query = "SELECT e FROM Event e"),
-	@NamedQuery(name = "Event.findById", query = "SELECT e FROM Event e WHERE e.id = :id"),
+
         @NamedQuery(name = "Event.findByStartTime", query = "SELECT e FROM Event e WHERE e.startTime = :startTime"),
         @NamedQuery(name = "Event.findByStartTime", query = "SELECT e FROM Event e WHERE e.startTime = :startTime"),
         @NamedQuery(name = "Event.findByEndTime", query = "SELECT e FROM Event e WHERE e.endTime = :endTime"),
         @NamedQuery(name = "Event.findByEndTime", query = "SELECT e FROM Event e WHERE e.endTime = :endTime"),
         @NamedQuery(name = "Event.findByName", query = "SELECT e FROM Event e WHERE e.name = :name"),
         @NamedQuery(name = "Event.findByName", query = "SELECT e FROM Event e WHERE e.name = :name"),

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

@@ -26,7 +26,7 @@ import javax.persistence.Version;
 @Table(name = "maps")
 @Table(name = "maps")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"),
         @NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"),
-	@NamedQuery(name = "EventMap.findById", query = "SELECT e FROM EventMap e WHERE id = :id"),
+
         @NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name") })
         @NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name") })
 public class EventMap implements ModelInterface {
 public class EventMap implements ModelInterface {
 
 

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

@@ -23,7 +23,7 @@ import javax.persistence.Version;
 @Table(name = "event_settings")
 @Table(name = "event_settings")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"),
         @NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"),
-	@NamedQuery(name = "EventSettings.findById", query = "SELECT e FROM EventSettings e WHERE e.id = :id"),
+
         @NamedQuery(name = "EventSettings.findByBaseName", query = "SELECT e FROM EventSettings e WHERE e.baseName = :baseName"),
         @NamedQuery(name = "EventSettings.findByBaseName", query = "SELECT e FROM EventSettings e WHERE e.baseName = :baseName"),
         @NamedQuery(name = "EventSettings.findByStyleSheet", query = "SELECT e FROM EventSettings e WHERE e.styleSheet = :styleSheet") })
         @NamedQuery(name = "EventSettings.findByStyleSheet", query = "SELECT e FROM EventSettings e WHERE e.styleSheet = :styleSheet") })
 public class EventSettings implements ModelInterface {
 public class EventSettings implements ModelInterface {

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

@@ -24,7 +24,7 @@ import javax.persistence.Version;
 @Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
 @Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
         @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
-	@NamedQuery(name = "EventStatus.findById", query = "SELECT e FROM EventStatus e WHERE e.id = :id"),
+
         @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName") })
         @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName") })
 public class EventStatus implements ModelInterface {
 public class EventStatus implements ModelInterface {
 
 

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

@@ -25,7 +25,7 @@ import javax.persistence.Version;
 @Table(name = "food_waves")
 @Table(name = "food_waves")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "FoodWave.findAll", query = "SELECT f FROM FoodWave f"),
         @NamedQuery(name = "FoodWave.findAll", query = "SELECT f FROM FoodWave f"),
-	@NamedQuery(name = "FoodWave.findById", query = "SELECT f FROM FoodWave f WHERE f.id = :id"),
+
         @NamedQuery(name = "FoodWave.findByName", query = "SELECT f FROM FoodWave f WHERE f.name = :name"),
         @NamedQuery(name = "FoodWave.findByName", query = "SELECT f FROM FoodWave f WHERE f.name = :name"),
         @NamedQuery(name = "FoodWave.findByDescription", query = "SELECT f FROM FoodWave f WHERE f.description = :description"),
         @NamedQuery(name = "FoodWave.findByDescription", query = "SELECT f FROM FoodWave f WHERE f.description = :description"),
         @NamedQuery(name = "FoodWave.findByTime", query = "SELECT f FROM FoodWave f WHERE f.time = :time"),
         @NamedQuery(name = "FoodWave.findByTime", query = "SELECT f FROM FoodWave f WHERE f.time = :time"),

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

@@ -22,7 +22,7 @@ import javax.persistence.Version;
 @Table(name = "food_wave_templates")
 @Table(name = "food_wave_templates")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "FoodWaveTemplate.findAll", query = "SELECT f FROM FoodWaveTemplate f"),
         @NamedQuery(name = "FoodWaveTemplate.findAll", query = "SELECT f FROM FoodWaveTemplate f"),
-	@NamedQuery(name = "FoodWaveTemplate.findById", query = "SELECT f FROM FoodWaveTemplate f WHERE f.id = :id"),
+
         @NamedQuery(name = "FoodWaveTemplate.findByName", query = "SELECT f FROM FoodWaveTemplate f WHERE f.name = :name"),
         @NamedQuery(name = "FoodWaveTemplate.findByName", query = "SELECT f FROM FoodWaveTemplate f WHERE f.name = :name"),
         @NamedQuery(name = "FoodWaveTemplate.findByDescription", query = "SELECT f FROM FoodWaveTemplate f WHERE f.description = :description") })
         @NamedQuery(name = "FoodWaveTemplate.findByDescription", query = "SELECT f FROM FoodWaveTemplate f WHERE f.description = :description") })
 public class FoodWaveTemplate implements ModelInterface {
 public class FoodWaveTemplate implements ModelInterface {

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

@@ -28,7 +28,7 @@ import javax.persistence.Version;
         "users_id", "groups_id" }) })
         "users_id", "groups_id" }) })
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "GroupMembership.findAll", query = "SELECT g FROM GroupMembership g"),
         @NamedQuery(name = "GroupMembership.findAll", query = "SELECT g FROM GroupMembership g"),
-	@NamedQuery(name = "GroupMembership.findById", query = "SELECT g FROM GroupMembership g WHERE g.id = :id"),
+
         @NamedQuery(name = "GroupMembership.findByInviteAccepted", query = "SELECT g FROM GroupMembership g WHERE g.inviteAccepted = :inviteAccepted"),
         @NamedQuery(name = "GroupMembership.findByInviteAccepted", query = "SELECT g FROM GroupMembership g WHERE g.inviteAccepted = :inviteAccepted"),
         @NamedQuery(name = "GroupMembership.findByInviteEmail", query = "SELECT g FROM GroupMembership g WHERE g.inviteEmail = :inviteEmail"),
         @NamedQuery(name = "GroupMembership.findByInviteEmail", query = "SELECT g FROM GroupMembership g WHERE g.inviteEmail = :inviteEmail"),
         @NamedQuery(name = "GroupMembership.findByInviteName", query = "SELECT g FROM GroupMembership g WHERE g.inviteName = :inviteName") })
         @NamedQuery(name = "GroupMembership.findByInviteName", query = "SELECT g FROM GroupMembership g WHERE g.inviteName = :inviteName") })

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

@@ -22,7 +22,7 @@ import javax.persistence.Version;
 @Table(name = "locations")
 @Table(name = "locations")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Location.findAll", query = "SELECT l FROM Location l"),
         @NamedQuery(name = "Location.findAll", query = "SELECT l FROM Location l"),
-        @NamedQuery(name = "Location.findById", query = "SELECT l FROM Location l WHERE l.id = :id"),
+
         @NamedQuery(name = "Location.findByLocationName", query = "SELECT l FROM Location l WHERE l.locationName = :name") })
         @NamedQuery(name = "Location.findByLocationName", query = "SELECT l FROM Location l WHERE l.locationName = :name") })
 public class Location implements ModelInterface {
 public class Location implements ModelInterface {
 
 

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

@@ -25,7 +25,7 @@ import javax.persistence.Version;
 @Table(name = "event_log")
 @Table(name = "event_log")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "LogEntry.findAll", query = "SELECT l FROM LogEntry l"),
         @NamedQuery(name = "LogEntry.findAll", query = "SELECT l FROM LogEntry l"),
-	@NamedQuery(name = "LogEntry.findById", query = "SELECT l FROM LogEntry l WHERE l.id = :id"),
+
         @NamedQuery(name = "LogEntry.findByTime", query = "SELECT l FROM LogEntry l WHERE l.time = :time"),
         @NamedQuery(name = "LogEntry.findByTime", query = "SELECT l FROM LogEntry l WHERE l.time = :time"),
         @NamedQuery(name = "LogEntry.findByDescription", query = "SELECT l FROM LogEntry l WHERE l.description = :description") })
         @NamedQuery(name = "LogEntry.findByDescription", query = "SELECT l FROM LogEntry l WHERE l.description = :description") })
 public class LogEntry implements ModelInterface {
 public class LogEntry implements ModelInterface {

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

@@ -23,7 +23,7 @@ import javax.persistence.Version;
 @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.findById", query = "SELECT l FROM LogEntryType l WHERE l.id = :id"),
+
         @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") })
 public class LogEntryType implements ModelInterface {
 public class LogEntryType implements ModelInterface {
 
 

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

@@ -26,7 +26,7 @@ import javax.persistence.Version;
 @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.findById", query = "SELECT n FROM News n WHERE n.id = :id"),
+
         @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"),
         @NamedQuery(name = "News.findByBody", query = "SELECT n FROM News n WHERE n.body = :body"),
         @NamedQuery(name = "News.findByBody", query = "SELECT n FROM News n WHERE n.body = :body"),
         @NamedQuery(name = "News.findByAbstract", query = "SELECT n FROM News n WHERE n.bodyAbstract = :bodyAbstract"),
         @NamedQuery(name = "News.findByAbstract", query = "SELECT n FROM News n WHERE n.bodyAbstract = :bodyAbstract"),

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

@@ -26,7 +26,7 @@ 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.findById", query = "SELECT n FROM NewsGroup n WHERE n.id = :id"),
+
         @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") })

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

@@ -23,7 +23,7 @@ import javax.persistence.Version;
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Place.findAll", query = "SELECT p FROM Place p"),
         @NamedQuery(name = "Place.findAll", query = "SELECT p FROM Place p"),
         @NamedQuery(name = "Place.findByDescription", query = "SELECT p FROM Place p WHERE p.description = :description"),
         @NamedQuery(name = "Place.findByDescription", query = "SELECT p FROM Place p WHERE p.description = :description"),
-	@NamedQuery(name = "Place.findById", query = "SELECT p FROM Place p WHERE p.id = :id"),
+
         @NamedQuery(name = "Place.findByName", query = "SELECT p FROM Place p WHERE p.name = :name"),
         @NamedQuery(name = "Place.findByName", query = "SELECT p FROM Place p WHERE p.name = :name"),
         @NamedQuery(name = "Place.findByMapX", query = "SELECT p FROM Place p WHERE p.mapX = :mapX"),
         @NamedQuery(name = "Place.findByMapX", query = "SELECT p FROM Place p WHERE p.mapX = :mapX"),
         @NamedQuery(name = "Place.findByMapY", query = "SELECT p FROM Place p WHERE p.mapY = :mapY"),
         @NamedQuery(name = "Place.findByMapY", query = "SELECT p FROM Place p WHERE p.mapY = :mapY"),

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

@@ -28,7 +28,7 @@ import javax.persistence.Version;
 @Table(name = "groups")
 @Table(name = "groups")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
         @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
-        @NamedQuery(name = "PlaceGroup.findById", query = "SELECT p FROM PlaceGroup p WHERE p.id = :id"),
+
         @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
         @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
         @NamedQuery(name = "PlaceGroup.findByEdited", query = "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
         @NamedQuery(name = "PlaceGroup.findByEdited", query = "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
         @NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),
         @NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),

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

@@ -29,7 +29,7 @@ import javax.persistence.Version;
 @Table(name = "printed_cards")
 @Table(name = "printed_cards")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "PrintedCard.findAll", query = "SELECT p FROM PrintedCard p"),
         @NamedQuery(name = "PrintedCard.findAll", query = "SELECT p FROM PrintedCard p"),
-	@NamedQuery(name = "PrintedCard.findById", query = "SELECT p FROM PrintedCard p WHERE p.id = :id"),
+
         @NamedQuery(name = "PrintedCard.findByPrintTime", query = "SELECT p FROM PrintedCard p WHERE p.printTime = :printTime"),
         @NamedQuery(name = "PrintedCard.findByPrintTime", query = "SELECT p FROM PrintedCard p WHERE p.printTime = :printTime"),
         @NamedQuery(name = "PrintedCard.findByBarcode", query = "SELECT p FROM PrintedCard p WHERE p.barcode = :barcode"),
         @NamedQuery(name = "PrintedCard.findByBarcode", query = "SELECT p FROM PrintedCard p WHERE p.barcode = :barcode"),
         @NamedQuery(name = "PrintedCard.findByEnabled", query = "SELECT p FROM PrintedCard p WHERE p.enabled = :enabled"),
         @NamedQuery(name = "PrintedCard.findByEnabled", query = "SELECT p FROM PrintedCard p WHERE p.enabled = :enabled"),

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

@@ -27,7 +27,7 @@ import javax.persistence.Version;
 @Table(name = "products")
 @Table(name = "products")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p"),
         @NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p"),
-	@NamedQuery(name = "Product.findById", query = "SELECT p FROM Product p WHERE p.id = :id"),
+
         @NamedQuery(name = "Product.findByProductName", query = "SELECT p FROM Product p WHERE p.name = :name"),
         @NamedQuery(name = "Product.findByProductName", query = "SELECT p FROM Product p WHERE p.name = :name"),
         @NamedQuery(name = "Product.findByPrice", query = "SELECT p FROM Product p WHERE p.price = :price"),
         @NamedQuery(name = "Product.findByPrice", query = "SELECT p FROM Product p WHERE p.price = :price"),
         @NamedQuery(name = "Product.findBySort", query = "SELECT p FROM Product p WHERE p.sort = :sort"),
         @NamedQuery(name = "Product.findBySort", query = "SELECT p FROM Product p WHERE p.sort = :sort"),

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

@@ -25,7 +25,7 @@ import javax.persistence.Version;
 @Table(name = "readers")
 @Table(name = "readers")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Reader.findAll", query = "SELECT r FROM Reader r"),
         @NamedQuery(name = "Reader.findAll", query = "SELECT r FROM Reader r"),
-	@NamedQuery(name = "Reader.findById", query = "SELECT r FROM Reader r WHERE r.id = :id"),
+
         @NamedQuery(name = "Reader.findByIdentification", query = "SELECT r FROM Reader r WHERE r.identification = :identification"),
         @NamedQuery(name = "Reader.findByIdentification", query = "SELECT r FROM Reader r WHERE r.identification = :identification"),
         @NamedQuery(name = "Reader.findByDescription", query = "SELECT r FROM Reader r WHERE r.description = :description") })
         @NamedQuery(name = "Reader.findByDescription", query = "SELECT r FROM Reader r WHERE r.description = :description") })
 public class Reader implements ModelInterface {
 public class Reader implements ModelInterface {

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

@@ -25,7 +25,7 @@ import javax.persistence.Version;
 @Table(name = "reader_events")
 @Table(name = "reader_events")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "ReaderEvent.findAll", query = "SELECT r FROM ReaderEvent r"),
         @NamedQuery(name = "ReaderEvent.findAll", query = "SELECT r FROM ReaderEvent r"),
-	@NamedQuery(name = "ReaderEvent.findById", query = "SELECT r FROM ReaderEvent r WHERE r.id = :id"),
+
         @NamedQuery(name = "ReaderEvent.findByTime", query = "SELECT r FROM ReaderEvent r WHERE r.time = :time"),
         @NamedQuery(name = "ReaderEvent.findByTime", query = "SELECT r FROM ReaderEvent r WHERE r.time = :time"),
         @NamedQuery(name = "ReaderEvent.findByValue", query = "SELECT r FROM ReaderEvent r WHERE r.value = :value") })
         @NamedQuery(name = "ReaderEvent.findByValue", query = "SELECT r FROM ReaderEvent r WHERE r.value = :value") })
 public class ReaderEvent implements ModelInterface {
 public class ReaderEvent implements ModelInterface {

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

@@ -27,7 +27,7 @@ import javax.persistence.Version;
 @Table(name = "roles")
 @Table(name = "roles")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Role.findAll", query = "SELECT r FROM Role r"),
         @NamedQuery(name = "Role.findAll", query = "SELECT r FROM Role r"),
-	@NamedQuery(name = "Role.findById", query = "SELECT r FROM Role r WHERE r.id = :id"),
+
         @NamedQuery(name = "Role.findByRoleName", query = "SELECT r FROM Role r WHERE r.name = :name") })
         @NamedQuery(name = "Role.findByRoleName", query = "SELECT r FROM Role r WHERE r.name = :name") })
 public class Role implements ModelInterface {
 public class Role implements ModelInterface {
 
 

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

@@ -22,7 +22,7 @@ import javax.persistence.Version;
 @Table(name = "role_rights")
 @Table(name = "role_rights")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "RoleRight.findAll", query = "SELECT r FROM RoleRight r"),
         @NamedQuery(name = "RoleRight.findAll", query = "SELECT r FROM RoleRight r"),
-        @NamedQuery(name = "RoleRight.findById", query = "SELECT r FROM RoleRight r WHERE r.id = :id"),
+
         @NamedQuery(name = "RoleRight.findByRead", query = "SELECT r FROM RoleRight r WHERE r.read = :read"),
         @NamedQuery(name = "RoleRight.findByRead", query = "SELECT r FROM RoleRight r WHERE r.read = :read"),
         @NamedQuery(name = "RoleRight.findByWrite", query = "SELECT r FROM RoleRight r WHERE r.write = :write"),
         @NamedQuery(name = "RoleRight.findByWrite", query = "SELECT r FROM RoleRight r WHERE r.write = :write"),
         @NamedQuery(name = "RoleRight.findByExecute", query = "SELECT r FROM RoleRight r WHERE r.execute = :execute") })
         @NamedQuery(name = "RoleRight.findByExecute", query = "SELECT r FROM RoleRight r WHERE r.execute = :execute") })

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

@@ -27,7 +27,7 @@ import javax.persistence.Version;
 @Table(name = "users")
 @Table(name = "users")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "User.findAll", query = "SELECT u FROM User u"),
         @NamedQuery(name = "User.findAll", query = "SELECT u FROM User u"),
-	@NamedQuery(name = "User.findById", query = "SELECT u FROM User u WHERE u.id = :id"),
+
         @NamedQuery(name = "User.findByCreated", query = "SELECT u FROM User u WHERE u.created = :created"),
         @NamedQuery(name = "User.findByCreated", query = "SELECT u FROM User u WHERE u.created = :created"),
         @NamedQuery(name = "User.findByActive", query = "SELECT u FROM User u WHERE u.active = :active"),
         @NamedQuery(name = "User.findByActive", query = "SELECT u FROM User u WHERE u.active = :active"),
         @NamedQuery(name = "User.findByPassword", query = "SELECT u FROM User u WHERE u.password = :password"),
         @NamedQuery(name = "User.findByPassword", query = "SELECT u FROM User u WHERE u.password = :password"),

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

@@ -22,7 +22,7 @@ import javax.persistence.Version;
 @Table(name = "user_images")
 @Table(name = "user_images")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "UserImage.findAll", query = "SELECT u FROM UserImage u"),
         @NamedQuery(name = "UserImage.findAll", query = "SELECT u FROM UserImage u"),
-	@NamedQuery(name = "UserImage.findById", query = "SELECT u FROM UserImage u WHERE u.id = :id"),
+
         @NamedQuery(name = "UserImage.findByName", query = "SELECT u FROM UserImage u WHERE u.name = :name"),
         @NamedQuery(name = "UserImage.findByName", query = "SELECT u FROM UserImage u WHERE u.name = :name"),
         @NamedQuery(name = "UserImage.findByDescription", query = "SELECT u FROM UserImage u WHERE u.description = :description"),
         @NamedQuery(name = "UserImage.findByDescription", query = "SELECT u FROM UserImage u WHERE u.description = :description"),
         @NamedQuery(name = "UserImage.findByMimeType", query = "SELECT u FROM UserImage u WHERE u.mimeType = :mimeType") })
         @NamedQuery(name = "UserImage.findByMimeType", query = "SELECT u FROM UserImage u WHERE u.mimeType = :mimeType") })

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

@@ -27,7 +27,7 @@ import javax.persistence.Version;
         "entries_id", "users_id" }) })
         "entries_id", "users_id" }) })
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Vote.findAll", query = "SELECT v FROM Vote v"),
         @NamedQuery(name = "Vote.findAll", query = "SELECT v FROM Vote v"),
-	@NamedQuery(name = "Vote.findById", query = "SELECT v FROM Vote v WHERE v.id = :id"),
+
         @NamedQuery(name = "Vote.findByScore", query = "SELECT v FROM Vote v WHERE v.score = :score"),
         @NamedQuery(name = "Vote.findByScore", query = "SELECT v FROM Vote v WHERE v.score = :score"),
         @NamedQuery(name = "Vote.findByTime", query = "SELECT v FROM Vote v WHERE v.time = :time") })
         @NamedQuery(name = "Vote.findByTime", query = "SELECT v FROM Vote v WHERE v.time = :time") })
 public class Vote implements ModelInterface {
 public class Vote implements ModelInterface {