Skip to content

Linnea Samila / Moya

Go to a project
Commit f4294176 by tuomari
Options

* Poistettu rikkinäiset HelloWorld höhät 

  * Korjattu rikkinäisimmät tietokantafileet.
    * Viittaukset pitää käydä vielä läpi 
    * Many-to-Many kentät todennäköisesti hajalla.
    * Kenttien nimet troolattava.

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@51 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent 9e92470d
Expand all
Inline Side-by-side
Showing with 439 additions and 289 deletions
code/LanBortalBeans/.settings/org.eclipse.jdt.core.prefs
#Sun Mar 07 02:21:14 EET 2010 #Sun Mar 07 04:54:45 EET 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.compliance=1.6
......
code/LanBortalBeans/.settings/org.eclipse.jdt.ui.prefs
#Sun Mar 07 02:21:14 EET 2010 #Sun Mar 07 04:54:42 EET 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
formatter_profile=org.eclipse.jdt.ui.default.sun_profile formatter_profile=org.eclipse.jdt.ui.default.sun_profile
formatter_settings_version=11 formatter_settings_version=11
code/LanBortalBeans/ejbModule/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: lib/LanBortalDatabase.jar
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/HelloBean.java deleted 100644 → 0
package fi.insomnia.bortal;
import java.util.List;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.db.HelloTo;
/**
* Session Bean implementation class HelloBean
*/
@LocalBean
@Stateless
public class HelloBean implements HelloBeanLocal {
private static final Logger logger = LoggerFactory
.getLogger(HelloBean.class);
@PersistenceContext
private EntityManager em;
/**
* Default constructor.
*/
public HelloBean() {
// TODO Auto-generated constructor stub
}
public String getHello(String name) {
HelloTo hello = new HelloTo();
hello.setName(name);
em.persist(hello);
return "Hello World from EJB for " + name + ".";
}
public List<HelloTo> getHelloHistory() {
List<HelloTo> ret = em.createQuery("select t from HelloTo t",
HelloTo.class).getResultList();
logger.info("Size: " + ret.size());
return ret;
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -11,7 +11,7 @@ import org.slf4j.Logger; ...@@ -11,7 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.UserBeanLocal; import fi.insomnia.bortal.UserBeanLocal;
import fi.insomnia.bortal.db.User; import fi.insomnia.bortal.model.User;
/** /**
* Session Bean implementation class UserBean * Session Bean implementation class UserBean
...@@ -20,8 +20,7 @@ import fi.insomnia.bortal.db.User; ...@@ -20,8 +20,7 @@ import fi.insomnia.bortal.db.User;
@Stateless @Stateless
public class UserBean implements UserBeanLocal { public class UserBean implements UserBeanLocal {
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory.getLogger(UserBean.class);
.getLogger(UserBean.class);
/** /**
* Java EE container injektoi t�m�n luokkamuuttujan luokan luonnin * Java EE container injektoi t�m�n luokkamuuttujan luokan luonnin
* yhteydess�. * yhteydess�.
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GenericFacade.java 0 → 100644
package fi.insomnia.bortal.facade;
import java.util.List;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.insomnia.bortal.model.ModelInterface;
/**
* Session Bean implementation class GenericFacade
*/
@Stateless
public class GenericFacade<T extends ModelInterface> implements GenericFacadeLocal<T> {
@PersistenceContext
private EntityManager em;
private Class<T> clazz;
/**
* Default constructor.
*/
public GenericFacade(Class<T> entityType) {
clazz = entityType;
}
public void create(T entity) {
em.persist(entity);
}
public void remove(T entity) {
em.remove(entity);
}
public T merge(T entity) {
return em.merge(entity);
}
public T find(Object id) {
return em.find(clazz, id);
}
public List<T> findAll() {
CriteriaQuery<T> cq = em.getCriteriaBuilder().createQuery(clazz);
cq.select(cq.from(clazz));
return em.createQuery(cq).getResultList();
}
public List<T> findRange(int[] range) {
CriteriaQuery<T> cq = em.getCriteriaBuilder().createQuery(clazz);
cq.select(cq.from(clazz));
TypedQuery<T> q = em.createQuery(cq);
q.setMaxResults(range[1] - range[0]);
q.setFirstResult(range[0]);
return q.getResultList();
}
public long count() {
CriteriaQuery<Long> cq = em.getCriteriaBuilder().createQuery(Long.class);
Root<T> rt = cq.from(clazz);
cq.select(em.getCriteriaBuilder().count(rt));
TypedQuery<Long> q = em.createQuery(cq);
return q.getSingleResult();
}
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/HelloBeanLocal.java deleted 100644 → 0
package fi.insomnia.bortal;
import java.util.List;
import javax.ejb.Local;
import fi.insomnia.bortal.db.HelloTo;
@Local
public interface HelloBeanLocal {
String getHello(String name);
List<HelloTo> getHelloHistory();
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/UserBeanLocal.java
...@@ -4,7 +4,8 @@ import java.util.List; ...@@ -4,7 +4,8 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.db.User; import fi.insomnia.bortal.model.User;
@Local @Local
public interface UserBeanLocal { public interface UserBeanLocal {
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/facade/GenericFacadeLocal.java 0 → 100644
package fi.insomnia.bortal.facade;
import java.util.List;
import javax.ejb.Local;
import fi.insomnia.bortal.model.ModelInterface;
@Local
public interface GenericFacadeLocal<T extends ModelInterface> {
void create(T entity);
void remove(T entity);
T merge(T entity);
T find(Object id);
List<T> findAll();
List<T> findRange(int[] range);
long count();
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccessRight.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
...@@ -24,92 +24,106 @@ import javax.persistence.Version; ...@@ -24,92 +24,106 @@ import javax.persistence.Version;
*/ */
@Entity @Entity
@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.findByAccessRightsId", query = "SELECT a FROM AccessRight a WHERE a.accessRightsId = :accessRightsId"), @NamedQuery(name = "AccessRight.findByAccessRightsId", query = "SELECT a FROM AccessRight a WHERE a.accessRightsId = :accessRightsId"),
@NamedQuery(name = "AccessRight.findByAccessRight", query = "SELECT a FROM AccessRight a WHERE a.accessRight = :accessRight") }) @NamedQuery(name = "AccessRight.findByAccessRight", query = "SELECT a FROM AccessRight a WHERE a.accessRight = :accessRight") })
public class AccessRight implements Serializable { public class AccessRight implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
@Column(name = "access_rights_id", nullable = false) @Column(name = "access_rights_id", nullable = false)
private Integer id; private Integer id;
@Basic(optional = false) @Basic(optional = false)
@Column(name = "access_right", nullable = false) @Column(name = "access_right", nullable = false)
private String accessRight; private String accessRight;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "accessRightsId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "accessRightsId")
private List<NewsGroup> newsGroupList; private List<NewsGroup> newsGroupList;
@OneToMany(mappedBy = "accessRightsId") @OneToMany(mappedBy = "accessRightsId")
private List<RoleRight> roleRightList; private List<RoleRight> roleRightList;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Version @Version
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField; private int jpaVersionField;
public AccessRight() {
public AccessRight() { }
}
public AccessRight(Integer accessRightsId) {
public AccessRight(Integer accessRightsId) { this.id = accessRightsId;
this.id = accessRightsId; }
}
public AccessRight(Integer accessRightsId, String accessRight) {
public AccessRight(Integer accessRightsId, String accessRight) { this.id = accessRightsId;
this.id = accessRightsId; this.accessRight = accessRight;
this.accessRight = accessRight; }
}
public String getAccessRight() {
public String getAccessRight() { return accessRight;
return accessRight; }
}
public void setAccessRight(String accessRight) {
public void setAccessRight(String accessRight) { this.accessRight = accessRight;
this.accessRight = accessRight; }
}
public List<NewsGroup> getNewsGroupList() {
public List<NewsGroup> getNewsGroupList() { return newsGroupList;
return newsGroupList; }
public void setNewsGroupList(List<NewsGroup> newsGroupList) {
this.newsGroupList = newsGroupList;
}
public List<RoleRight> getRoleRightList() {
return roleRightList;
}
public void setRoleRightList(List<RoleRight> roleRightList) {
this.roleRightList = roleRightList;
}
@Override
public int hashCode() {
int hash = 0;
hash += (id != null ? id.hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof AccessRight)) {
return false;
} }
AccessRight other = (AccessRight) object;
public void setNewsGroupList(List<NewsGroup> newsGroupList) { if ((this.id == null && other.id != null)
this.newsGroupList = newsGroupList; || (this.id != null && !this.id.equals(other.id))) {
} return false;
public List<RoleRight> getRoleRightList() {
return roleRightList;
}
public void setRoleRightList(List<RoleRight> roleRightList) {
this.roleRightList = roleRightList;
}
@Override
public int hashCode() {
int hash = 0;
hash += (id != null ? id.hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof AccessRight)) {
return false;
}
AccessRight other = (AccessRight) object;
if ((this.id == null && other.id != null)
|| (this.id != null && !this.id
.equals(other.id))) {
return false;
}
return true;
}
@Override
public String toString() {
return "fi.insomnia.bortal.model.AccessRight[accessRightsId="
+ id + "]";
} }
return true;
}
@Override
public String toString() {
return "fi.insomnia.bortal.model.AccessRight[accessRightsId=" + id
+ "]";
}
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill.java
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -20,6 +19,7 @@ import javax.persistence.OneToMany; ...@@ -20,6 +19,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
...@@ -34,7 +34,7 @@ import javax.persistence.TemporalType; ...@@ -34,7 +34,7 @@ import javax.persistence.TemporalType;
@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"),
@NamedQuery(name = "Bill.findByNotes", query = "SELECT b FROM Bill b WHERE b.notes = :notes")}) @NamedQuery(name = "Bill.findByNotes", query = "SELECT b FROM Bill b WHERE b.notes = :notes")})
public class Bill implements Serializable { public class Bill implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
...@@ -60,6 +60,14 @@ public class Bill implements Serializable { ...@@ -60,6 +60,14 @@ public class Bill implements Serializable {
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User usersId; private User usersId;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Version @Version
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField; private int jpaVersionField;
...@@ -152,4 +160,12 @@ public class Bill implements Serializable { ...@@ -152,4 +160,12 @@ public class Bill implements Serializable {
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Bill[billsId=" + id + "]"; return "fi.insomnia.bortal.model.Bill[billsId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
...@@ -16,6 +16,7 @@ import javax.persistence.ManyToOne; ...@@ -16,6 +16,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version;
/** /**
* *
...@@ -30,7 +31,7 @@ import javax.persistence.Table; ...@@ -30,7 +31,7 @@ import javax.persistence.Table;
@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"),
@NamedQuery(name = "BillLine.findByVat", query = "SELECT b FROM BillLine b WHERE b.vat = :vat")}) @NamedQuery(name = "BillLine.findByVat", query = "SELECT b FROM BillLine b WHERE b.vat = :vat")})
public class BillLine implements Serializable { public class BillLine implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -137,4 +138,20 @@ public class BillLine implements Serializable { ...@@ -137,4 +138,20 @@ public class BillLine implements Serializable {
return "fi.insomnia.bortal.model.BillLine[billLinesId=" + id + "]"; return "fi.insomnia.bortal.model.BillLine[billLinesId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic; import javax.persistence.Basic;
...@@ -19,6 +19,7 @@ import javax.persistence.NamedQueries; ...@@ -19,6 +19,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version;
/** /**
* *
...@@ -30,7 +31,7 @@ import javax.persistence.Table; ...@@ -30,7 +31,7 @@ import javax.persistence.Table;
@NamedQuery(name = "CardTemplate.findAll", query = "SELECT c FROM CardTemplate c"), @NamedQuery(name = "CardTemplate.findAll", query = "SELECT c FROM CardTemplate c"),
@NamedQuery(name = "CardTemplate.findByCardTemplatesId", query = "SELECT c FROM CardTemplate c WHERE c.cardTemplatesId = :cardTemplatesId"), @NamedQuery(name = "CardTemplate.findByCardTemplatesId", query = "SELECT c FROM CardTemplate c WHERE c.cardTemplatesId = :cardTemplatesId"),
@NamedQuery(name = "CardTemplate.findByTemplateName", query = "SELECT c FROM CardTemplate c WHERE c.templateName = :templateName")}) @NamedQuery(name = "CardTemplate.findByTemplateName", query = "SELECT c FROM CardTemplate c WHERE c.templateName = :templateName")})
public class CardTemplate implements Serializable { public class CardTemplate implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -85,6 +86,14 @@ public class CardTemplate implements Serializable { ...@@ -85,6 +86,14 @@ public class CardTemplate implements Serializable {
return eventsId; return eventsId;
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public void setEventsId(Event eventsId) { public void setEventsId(Event eventsId) {
this.eventsId = eventsId; this.eventsId = eventsId;
} }
...@@ -122,4 +131,12 @@ public class CardTemplate implements Serializable { ...@@ -122,4 +131,12 @@ public class CardTemplate implements Serializable {
return "fi.insomnia.bortal.model.CardTemplate[cardTemplatesId=" + id + "]"; return "fi.insomnia.bortal.model.CardTemplate[cardTemplatesId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -22,6 +22,7 @@ import javax.persistence.OneToMany; ...@@ -22,6 +22,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
...@@ -39,7 +40,7 @@ import javax.persistence.TemporalType; ...@@ -39,7 +40,7 @@ import javax.persistence.TemporalType;
@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"),
@NamedQuery(name = "Compo.findBySubmitEnd", query = "SELECT c FROM Compo c WHERE c.submitEnd = :submitEnd"), @NamedQuery(name = "Compo.findBySubmitEnd", query = "SELECT c FROM Compo c WHERE c.submitEnd = :submitEnd"),
@NamedQuery(name = "Compo.findByHoldVoting", query = "SELECT c FROM Compo c WHERE c.holdVoting = :holdVoting")}) @NamedQuery(name = "Compo.findByHoldVoting", query = "SELECT c FROM Compo c WHERE c.holdVoting = :holdVoting")})
public class Compo implements Serializable { public class Compo implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -77,6 +78,14 @@ public class Compo implements Serializable { ...@@ -77,6 +78,14 @@ public class Compo implements Serializable {
private int jpaVersionField; private int jpaVersionField;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Compo() { public Compo() {
} }
...@@ -187,4 +196,12 @@ public class Compo implements Serializable { ...@@ -187,4 +196,12 @@ public class Compo implements Serializable {
return "fi.insomnia.bortal.model.Compo[composId=" + id + "]"; return "fi.insomnia.bortal.model.Compo[composId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -22,6 +22,7 @@ import javax.persistence.OneToMany; ...@@ -22,6 +22,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
...@@ -37,7 +38,7 @@ import javax.persistence.TemporalType; ...@@ -37,7 +38,7 @@ import javax.persistence.TemporalType;
@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"),
@NamedQuery(name = "CompoEntry.findByScreenMessage", query = "SELECT c FROM CompoEntry c WHERE c.screenMessage = :screenMessage"), @NamedQuery(name = "CompoEntry.findByScreenMessage", query = "SELECT c FROM CompoEntry c WHERE c.screenMessage = :screenMessage"),
@NamedQuery(name = "CompoEntry.findBySort", query = "SELECT c FROM CompoEntry c WHERE c.sort = :sort")}) @NamedQuery(name = "CompoEntry.findBySort", query = "SELECT c FROM CompoEntry c WHERE c.sort = :sort")})
public class CompoEntry implements Serializable { public class CompoEntry implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -56,11 +57,11 @@ public class CompoEntry implements Serializable { ...@@ -56,11 +57,11 @@ public class CompoEntry implements Serializable {
private String screenMessage; private String screenMessage;
@Column(name = "sort") @Column(name = "sort")
private Integer sort; private Integer sort;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "entriesId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "compoEntry")
private List<Vote> voteList; private List<Vote> voteList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "entriesId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "entry")
private List<CompoEntryFile> compoEntryFileList; private List<CompoEntryFile> compoEntryFileList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "entriesId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "entry")
private List<CompoEntryParticipant> compoEntryParticipantList; private List<CompoEntryParticipant> compoEntryParticipantList;
@JoinColumn(name = "compos_id", referencedColumnName = "compos_id", nullable = false) @JoinColumn(name = "compos_id", referencedColumnName = "compos_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
...@@ -74,6 +75,14 @@ public class CompoEntry implements Serializable { ...@@ -74,6 +75,14 @@ public class CompoEntry implements Serializable {
private int jpaVersionField; private int jpaVersionField;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public CompoEntry() { public CompoEntry() {
} }
...@@ -192,4 +201,12 @@ public class CompoEntry implements Serializable { ...@@ -192,4 +201,12 @@ public class CompoEntry implements Serializable {
return "fi.insomnia.bortal.model.CompoEntry[entriesId=" + id + "]"; return "fi.insomnia.bortal.model.CompoEntry[entriesId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
...@@ -20,6 +20,7 @@ import javax.persistence.NamedQuery; ...@@ -20,6 +20,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
...@@ -36,7 +37,7 @@ import javax.persistence.TemporalType; ...@@ -36,7 +37,7 @@ import javax.persistence.TemporalType;
@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.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 Serializable { public class CompoEntryFile implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -61,13 +62,21 @@ public class CompoEntryFile implements Serializable { ...@@ -61,13 +62,21 @@ public class CompoEntryFile implements Serializable {
private Date uploaded; private Date uploaded;
@JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false) @JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private CompoEntry entriesId; private CompoEntry entry;
@Version @Version
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField; private int jpaVersionField;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public CompoEntryFile() { public CompoEntryFile() {
} }
...@@ -137,11 +146,11 @@ public class CompoEntryFile implements Serializable { ...@@ -137,11 +146,11 @@ public class CompoEntryFile implements Serializable {
} }
public CompoEntry getEntriesId() { public CompoEntry getEntriesId() {
return entriesId; return entry;
} }
public void setEntriesId(CompoEntry entriesId) { public void setEntriesId(CompoEntry entriesId) {
this.entriesId = entriesId; this.entry = entriesId;
} }
@Override @Override
...@@ -169,4 +178,12 @@ public class CompoEntryFile implements Serializable { ...@@ -169,4 +178,12 @@ public class CompoEntryFile implements Serializable {
return "fi.insomnia.bortal.model.CompoEntryFile[entryFilesId=" + id + "]"; return "fi.insomnia.bortal.model.CompoEntryFile[entryFilesId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
...@@ -16,6 +16,7 @@ import javax.persistence.ManyToOne; ...@@ -16,6 +16,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version;
/** /**
* *
...@@ -27,7 +28,7 @@ import javax.persistence.Table; ...@@ -27,7 +28,7 @@ import javax.persistence.Table;
@NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"), @NamedQuery(name = "CompoEntryParticipant.findAll", query = "SELECT c FROM CompoEntryParticipant c"),
@NamedQuery(name = "CompoEntryParticipant.findByEntryParticipationsId", query = "SELECT c FROM CompoEntryParticipant c WHERE c.entryParticipationsId = :entryParticipationsId"), @NamedQuery(name = "CompoEntryParticipant.findByEntryParticipationsId", query = "SELECT c FROM CompoEntryParticipant c WHERE c.entryParticipationsId = :entryParticipationsId"),
@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 Serializable { public class CompoEntryParticipant implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -37,7 +38,7 @@ public class CompoEntryParticipant implements Serializable { ...@@ -37,7 +38,7 @@ public class CompoEntryParticipant implements Serializable {
private String role; private String role;
@JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false) @JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private CompoEntry entriesId; private CompoEntry entry;
@JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false) @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User users; private User users;
...@@ -47,6 +48,30 @@ public class CompoEntryParticipant implements Serializable { ...@@ -47,6 +48,30 @@ public class CompoEntryParticipant implements Serializable {
private int jpaVersionField; private int jpaVersionField;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public CompoEntry getEntry() {
return entry;
}
public void setEntry(CompoEntry entry) {
this.entry = entry;
}
public User getUsers() {
return users;
}
public void setUsers(User users) {
this.users = users;
}
public CompoEntryParticipant() { public CompoEntryParticipant() {
} }
...@@ -63,11 +88,11 @@ public class CompoEntryParticipant implements Serializable { ...@@ -63,11 +88,11 @@ public class CompoEntryParticipant implements Serializable {
} }
public CompoEntry getEntriesId() { public CompoEntry getEntriesId() {
return entriesId; return entry;
} }
public void setEntriesId(CompoEntry entriesId) { public void setEntriesId(CompoEntry entriesId) {
this.entriesId = entriesId; this.entry = entriesId;
} }
public User getUsersId() { public User getUsersId() {
...@@ -103,4 +128,12 @@ public class CompoEntryParticipant implements Serializable { ...@@ -103,4 +128,12 @@ public class CompoEntryParticipant implements Serializable {
return "fi.insomnia.bortal.model.CompoEntryParticipant[entryParticipationsId=" + id + "]"; return "fi.insomnia.bortal.model.CompoEntryParticipant[entryParticipationsId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.List; import java.util.List;
...@@ -18,6 +18,7 @@ import javax.persistence.NamedQueries; ...@@ -18,6 +18,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version;
/** /**
* *
...@@ -36,7 +37,7 @@ import javax.persistence.Table; ...@@ -36,7 +37,7 @@ import javax.persistence.Table;
@NamedQuery(name = "Discount.findByActive", query = "SELECT d FROM Discount d WHERE d.active = :active"), @NamedQuery(name = "Discount.findByActive", query = "SELECT d FROM Discount d WHERE d.active = :active"),
@NamedQuery(name = "Discount.findByMaxNum", query = "SELECT d FROM Discount d WHERE d.maxNum = :maxNum"), @NamedQuery(name = "Discount.findByMaxNum", query = "SELECT d FROM Discount d WHERE d.maxNum = :maxNum"),
@NamedQuery(name = "Discount.findByPerUser", query = "SELECT d FROM Discount d WHERE d.perUser = :perUser")}) @NamedQuery(name = "Discount.findByPerUser", query = "SELECT d FROM Discount d WHERE d.perUser = :perUser")})
public class Discount implements Serializable { public class Discount implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -79,6 +80,14 @@ public class Discount implements Serializable { ...@@ -79,6 +80,14 @@ public class Discount implements Serializable {
this.id = discountsId; this.id = discountsId;
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Discount(Integer discountsId, BigInteger percentage, int amountMin, int amountMax, boolean active, int maxNum, int perUser) { public Discount(Integer discountsId, BigInteger percentage, int amountMin, int amountMax, boolean active, int maxNum, int perUser) {
this.id = discountsId; this.id = discountsId;
this.percentage = percentage; this.percentage = percentage;
...@@ -186,4 +195,12 @@ public class Discount implements Serializable { ...@@ -186,4 +195,12 @@ public class Discount implements Serializable {
return "fi.insomnia.bortal.model.Discount[discountsId=" + id + "]"; return "fi.insomnia.bortal.model.Discount[discountsId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ModelInterface.java
...@@ -7,6 +7,8 @@ package fi.insomnia.bortal.model; ...@@ -7,6 +7,8 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
/** /**
* *
* @author tuukka * @author tuukka
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -22,6 +22,7 @@ import javax.persistence.OneToMany; ...@@ -22,6 +22,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
...@@ -37,7 +38,7 @@ import javax.persistence.TemporalType; ...@@ -37,7 +38,7 @@ import javax.persistence.TemporalType;
@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.findByCardEnabled", query = "SELECT p FROM PrintedCard p WHERE p.cardEnabled = :cardEnabled"), @NamedQuery(name = "PrintedCard.findByCardEnabled", query = "SELECT p FROM PrintedCard p WHERE p.cardEnabled = :cardEnabled"),
@NamedQuery(name = "PrintedCard.findByRfidUid", query = "SELECT p FROM PrintedCard p WHERE p.rfidUid = :rfidUid")}) @NamedQuery(name = "PrintedCard.findByRfidUid", query = "SELECT p FROM PrintedCard p WHERE p.rfidUid = :rfidUid")})
public class PrintedCard implements Serializable { public class PrintedCard implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
...@@ -74,6 +75,14 @@ public class PrintedCard implements Serializable { ...@@ -74,6 +75,14 @@ public class PrintedCard implements Serializable {
public PrintedCard() { public PrintedCard() {
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public PrintedCard(Integer printedCardsId) { public PrintedCard(Integer printedCardsId) {
this.id = printedCardsId; this.id = printedCardsId;
} }
...@@ -174,4 +183,12 @@ public class PrintedCard implements Serializable { ...@@ -174,4 +183,12 @@ public class PrintedCard implements Serializable {
return "fi.insomnia.bortal.model.PrintedCard[printedCardsId=" + id + "]"; return "fi.insomnia.bortal.model.PrintedCard[printedCardsId=" + id + "]";
} }
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public int getJpaVersionField() {
return jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.List; import java.util.List;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java
...@@ -12,6 +12,7 @@ import javax.persistence.Column; ...@@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToMany;
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,8 +42,8 @@ public class Role implements ModelInterface { ...@@ -41,8 +42,8 @@ public class Role implements ModelInterface {
private String roleName; private String roleName;
@OneToMany(mappedBy = "defaultRole") @OneToMany(mappedBy = "defaultRole")
private List<Event> eventList; private List<Event> eventList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "rolesId") @ManyToMany(cascade = CascadeType.ALL)
private List<RoleMembership> roleMembershipList; private List<User> users;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "rolesId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "rolesId")
private List<RoleInheritance> roleInheritanceList; private List<RoleInheritance> roleInheritanceList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "inherits") @OneToMany(cascade = CascadeType.ALL, mappedBy = "inherits")
...@@ -87,14 +88,6 @@ public class Role implements ModelInterface { ...@@ -87,14 +88,6 @@ public class Role implements ModelInterface {
this.eventList = eventList; this.eventList = eventList;
} }
public List<RoleMembership> getRoleMembershipList() {
return roleMembershipList;
}
public void setRoleMembershipList(List<RoleMembership> roleMembershipList) {
this.roleMembershipList = roleMembershipList;
}
public List<RoleInheritance> getRoleInheritanceList() { public List<RoleInheritance> getRoleInheritanceList() {
return roleInheritanceList; return roleInheritanceList;
} }
...@@ -187,4 +180,12 @@ public class Role implements ModelInterface { ...@@ -187,4 +180,12 @@ public class Role implements ModelInterface {
public void setJpaVersionField(int jpaVersionField) { public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField; this.jpaVersionField = jpaVersionField;
} }
public void setUsers(List<User> users) {
this.users = users;
}
public List<User> getUsers() {
return users;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleInheritance.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
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.Id; import javax.persistence.Id;
import javax.persistence.Lob; import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
...@@ -84,15 +83,15 @@ public class User implements ModelInterface { ...@@ -84,15 +83,15 @@ public class User implements ModelInterface {
private Boolean female; private Boolean female;
@Column(name = "login", length = 2147483647) @Column(name = "login", length = 2147483647)
private String login; private String login;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "voter")
private List<Vote> votes; private List<Vote> votes;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId") @ManyToMany(cascade = CascadeType.ALL, mappedBy = "users")
private List<RoleMembership> roleMembershipList; private List<Role> roles;
@OneToMany(mappedBy = "usersId") @OneToMany(mappedBy = "usersId")
private List<LogEntry> logEntryList; private List<LogEntry> logEntryList;
@OneToMany(mappedBy = "usersId") @OneToMany(mappedBy = "user")
private List<UserImage> userImageList; private List<UserImage> userImageList;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "users")
private List<CompoEntryParticipant> compoEntryParticipantList; private List<CompoEntryParticipant> compoEntryParticipantList;
@OneToMany(mappedBy = "creator") @OneToMany(mappedBy = "creator")
private List<CompoEntry> compoEntryList; private List<CompoEntry> compoEntryList;
...@@ -121,6 +120,14 @@ public class User implements ModelInterface { ...@@ -121,6 +120,14 @@ public class User implements ModelInterface {
this.id = usersId; this.id = usersId;
} }
public List<Vote> getVotes() {
return votes;
}
public void setVotes(List<Vote> votes) {
this.votes = votes;
}
public User(Integer usersId, Date created, boolean active, String lastname, String firstnames) { public User(Integer usersId, Date created, boolean active, String lastname, String firstnames) {
this.id = usersId; this.id = usersId;
this.created = created; this.created = created;
...@@ -258,14 +265,7 @@ public class User implements ModelInterface { ...@@ -258,14 +265,7 @@ public class User implements ModelInterface {
this.votes = voteList; this.votes = voteList;
} }
public List<RoleMembership> getRoleMembershipList() {
return roleMembershipList;
}
public void setRoleMembershipList(List<RoleMembership> roleMembershipList) {
this.roleMembershipList = roleMembershipList;
}
public List<LogEntry> getLogEntryList() { public List<LogEntry> getLogEntryList() {
return logEntryList; return logEntryList;
} }
...@@ -406,4 +406,12 @@ public class User implements ModelInterface { ...@@ -406,4 +406,12 @@ public class User implements ModelInterface {
public void setJpaVersionField(int jpaVersionField) { public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField; this.jpaVersionField = jpaVersionField;
} }
public void setRoles(List<Role> roles) {
this.roles = roles;
}
public List<Role> getRoles() {
return roles;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage.java
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote.java
...@@ -4,10 +4,9 @@ ...@@ -4,10 +4,9 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
......
code/LanBortalWeb/src/fi/insomnia/bortal/HelloWorld.java deleted 100644 → 0
package fi.insomnia.bortal;
import java.util.List;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.model.ListDataModel;
import fi.insomnia.bortal.db.HelloTo;
@ManagedBean(name = "helloWorld")
@SessionScoped
public class HelloWorld {
/*
* Let's inject Hello bean instance to the variable with the @EJB annotation
*/
@EJB
private HelloBeanLocal helloBean;
private String name;
private int size;
private ListDataModel<HelloTo> items;
private HelloTo detailItem;
public String sayHello() {
return helloBean.getHello(name);
}
public String getHello() {
return "Managed Bean says: Hello World!";
}
public ListDataModel<HelloTo> getHelloedPeople() {
List<HelloTo> peopleList = helloBean.getHelloHistory();
items = new ListDataModel<HelloTo>(peopleList);
setSize(peopleList.size());
return items;
}
public String getDetail() {
setDetailItem(items.getRowData());
return "detail";
}
/*
* Getter and setter for "name"
*/
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setSize(int size) {
this.size = size;
}
public int getSize() {
return size;
}
public void setDetailItem(HelloTo detailItem) {
this.detailItem = detailItem;
}
public HelloTo getDetailItem() {
return detailItem;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
...@@ -11,7 +11,7 @@ import org.slf4j.Logger; ...@@ -11,7 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.UserBeanLocal; import fi.insomnia.bortal.UserBeanLocal;
import fi.insomnia.bortal.db.User; import fi.insomnia.bortal.model.User;
@ManagedBean(name = "userView") @ManagedBean(name = "userView")
@SessionScoped @SessionScoped
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!