model fixes

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

@@ -29,7 +29,8 @@ import javax.persistence.Version;
 @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.findByBillsId", query = "SELECT b FROM Bill b WHERE id = :id"),
+        // @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"),
@@ -37,6 +38,7 @@ import javax.persistence.Version;
 public class Bill implements ModelInterface {
 public class Bill implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
+
     @Id
     @Id
     @Column(name = "bills_id", nullable = false)
     @Column(name = "bills_id", nullable = false)
     private Integer id;
     private Integer id;

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

@@ -31,7 +31,7 @@ import javax.persistence.Version;
         @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.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.findByCompoStart", query = "SELECT c FROM Compo c WHERE c.compoStart = :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"),
         @NamedQuery(name = "Compo.findByVoteEnd", query = "SELECT c FROM Compo c WHERE c.voteEnd = :voteEnd"),
         @NamedQuery(name = "Compo.findByVoteEnd", query = "SELECT c FROM Compo c WHERE c.voteEnd = :voteEnd"),
         @NamedQuery(name = "Compo.findBySubmitStart", query = "SELECT c FROM Compo c WHERE c.submitStart = :submitStart"),
         @NamedQuery(name = "Compo.findBySubmitStart", query = "SELECT c FROM Compo c WHERE c.submitStart = :submitStart"),

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

@@ -32,7 +32,6 @@ import javax.persistence.Version;
         @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"),
         @NamedQuery(name = "CompoEntryFile.findByHash", query = "SELECT c FROM CompoEntryFile c WHERE c.hash = :hash"),
         @NamedQuery(name = "CompoEntryFile.findByHash", query = "SELECT c FROM CompoEntryFile c WHERE c.hash = :hash"),
-	@NamedQuery(name = "CompoEntryFile.findByComment", query = "SELECT c FROM CompoEntryFile c WHERE c.comment = :comment"),
         @NamedQuery(name = "CompoEntryFile.findByUploaded", query = "SELECT c FROM CompoEntryFile c WHERE c.uploaded = :uploaded") })
         @NamedQuery(name = "CompoEntryFile.findByUploaded", query = "SELECT c FROM CompoEntryFile c WHERE c.uploaded = :uploaded") })
 public class CompoEntryFile implements ModelInterface {
 public class CompoEntryFile implements ModelInterface {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

@@ -33,13 +33,13 @@ public class RoleRight implements ModelInterface {
     @Column(name = "role_rights_id", nullable = false)
     @Column(name = "role_rights_id", nullable = false)
     private Integer id;
     private Integer id;
 
 
-    @Column(name = "read", nullable = false)
+    @Column(name = "read_permission", nullable = false)
     private boolean read;
     private boolean read;
 
 
-    @Column(name = "write", nullable = false)
+    @Column(name = "write_permission", nullable = false)
     private boolean write;
     private boolean write;
 
 
-    @Column(name = "write", nullable = false)
+    @Column(name = "execute_permission", nullable = false)
     private boolean execute;
     private boolean execute;
 
 
     @JoinColumn(name = "access_rights_id", referencedColumnName = "access_rights_id")
     @JoinColumn(name = "access_rights_id", referencedColumnName = "access_rights_id")