Merge branch 'master' of codecrew.fi:bortal

Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java
	code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java

@@ -8,6 +8,7 @@ import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
 
 
 import fi.insomnia.bortal.facade.FoodWaveFacade;
 import fi.insomnia.bortal.facade.FoodWaveFacade;
+import fi.insomnia.bortal.enums.apps.ShopPermission;
 import fi.insomnia.bortal.facade.FoodWaveTemplateFacade;
 import fi.insomnia.bortal.facade.FoodWaveTemplateFacade;
 import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
@@ -16,38 +17,38 @@ import fi.insomnia.bortal.model.FoodWaveTemplate;
  * Session Bean implementation class FoodWaveBean
  * Session Bean implementation class FoodWaveBean
  */
  */
 @Stateless
 @Stateless
-@DeclareRoles("SHOP/WRITE")
+@DeclareRoles(ShopPermission.S_MANAGE_PRODUCTS)
 public class FoodWaveBean implements FoodWaveBeanLocal {
 public class FoodWaveBean implements FoodWaveBeanLocal {
 
 
 	@EJB
 	@EJB
 	private FoodWaveTemplateFacade fwtFacade;
 	private FoodWaveTemplateFacade fwtFacade;
-	
-	@EJB
-	private FoodWaveFacade foodWaveFacade;
-	
-	/**
-	 * Default constructor.
-	 */
-	public FoodWaveBean() {
-		// TODO Auto-generated constructor stub
+
+	@Override
+	@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
+	public List<FoodWaveTemplate> getTemplates() {
+		return fwtFacade.findAllTemplates();
 	}
 	}
 
 
 	@Override
 	@Override
-	@RolesAllowed("SHOP/WRITE")
-	public void createTemplate(FoodWaveTemplate waveTemplate) {
-		fwtFacade.create(waveTemplate);
+	@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
+	public FoodWaveTemplate saveOrCreateTemplate(FoodWaveTemplate template) {
+		// TODO Auto-generated method stub
+		return null;
 	}
 	}
 
 
 	@Override
 	@Override
-	@RolesAllowed("SHOP/WRITE")
-	public FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate) {
-		return fwtFacade.merge(waveTemplate);
+	public List<FoodWave> findShoppableFoodwaves() {
+		// TODO Auto-generated method stub
+		return null;
 	}
 	}
 	
 	
 	@Override
 	@Override
 	@RolesAllowed("SHOP/READ")
 	@RolesAllowed("SHOP/READ")
 	public List<FoodWave> getOpenFoodWaves() {
 	public List<FoodWave> getOpenFoodWaves() {
 		return foodWaveFacade.getOpenFoodWaves();
 		return foodWaveFacade.getOpenFoodWaves();
+	public FoodWave findFoodwave(Integer foodwaveId) {
+		// TODO Auto-generated method stub
+		return null;
 	}
 	}
 
 
 }
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MailMessageBean.java

@@ -25,10 +25,10 @@ import fi.insomnia.bortal.util.MailMessage;
  * Message-Driven Bean implementation class for: MailMessageBean
  * Message-Driven Bean implementation class for: MailMessageBean
  * 
  * 
  */
  */
-@MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/mailque")
+@MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/bortalMailQueue")
 public class MailMessageBean implements MessageListener {
 public class MailMessageBean implements MessageListener {
 
 
-	@Resource(name = "mail/lanbortal")
+	@Resource(name = "mail/bortal")
 	private Session mailSession;
 	private Session mailSession;
 	private static final Logger logger = LoggerFactory
 	private static final Logger logger = LoggerFactory
 			.getLogger(MailMessageBean.class);
 			.getLogger(MailMessageBean.class);

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/Menubean.java → code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java

@@ -30,9 +30,9 @@ import fi.insomnia.bortal.model.MenuNavigation;
 @Stateless
 @Stateless
 @LocalBean
 @LocalBean
 @DeclareRoles(SpecialPermission.S_SUPERADMIN)
 @DeclareRoles(SpecialPermission.S_SUPERADMIN)
-public class Menubean implements MenubeanLocal {
+public class MenuBean implements MenuBeanLocal {
 
 
-	public Menubean() {
+	public MenuBean() {
 	}
 	}
 
 
 	@EJB
 	@EJB
@@ -47,7 +47,8 @@ public class Menubean implements MenubeanLocal {
 	@EJB
 	@EJB
 	private PermissionBeanLocal permbean;
 	private PermissionBeanLocal permbean;
 
 
-	private static final Logger logger = LoggerFactory.getLogger(Menubean.class);
+	@SuppressWarnings("unused")
+	private static final Logger logger = LoggerFactory.getLogger(MenuBean.class);
 
 
 	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
 	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
 	@Override
 	@Override

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/OrgRoleBean.java

@@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.facade.OrgRoleFacade;
 import fi.insomnia.bortal.facade.OrgRoleFacade;
 import fi.insomnia.bortal.model.OrgRole;
 import fi.insomnia.bortal.model.OrgRole;
-import fi.insomnia.bortal.utilities.jpa.ModelInterface;
 
 
 /**
 /**
  * Session Bean implementation class OrgRoleBean
  * Session Bean implementation class OrgRoleBean
@@ -25,6 +24,7 @@ import fi.insomnia.bortal.utilities.jpa.ModelInterface;
 @DeclareRoles({ UserPermission.S_READ_ORGROLES, UserPermission.S_WRITE_ORGROLES })
 @DeclareRoles({ UserPermission.S_READ_ORGROLES, UserPermission.S_WRITE_ORGROLES })
 public class OrgRoleBean implements OrgRoleBeanLocal {
 public class OrgRoleBean implements OrgRoleBeanLocal {
 
 
+	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory
 	private static final Logger logger = LoggerFactory
 			.getLogger(OrgRoleBean.class);
 			.getLogger(OrgRoleBean.class);
 
 
@@ -44,7 +44,7 @@ public class OrgRoleBean implements OrgRoleBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	public ModelInterface find(Integer id) {
+	public OrgRole find(Integer id) {
 		return orgRoleFacade.find(id);
 		return orgRoleFacade.find(id);
 	}
 	}
 
 

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PermissionBean.java

@@ -5,6 +5,7 @@ import java.security.Principal;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.DeclareRoles;
 import javax.ejb.EJB;
 import javax.ejb.EJB;
+import javax.ejb.LocalBean;
 import javax.ejb.SessionContext;
 import javax.ejb.SessionContext;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
 import javax.resource.spi.IllegalStateException;
 import javax.resource.spi.IllegalStateException;
@@ -56,6 +57,7 @@ import fi.insomnia.bortal.model.User;
 		ShopPermission.S_SHOP_TO_OTHERS,
 		ShopPermission.S_SHOP_TO_OTHERS,
 		ShopPermission.S_MANAGE_PRODUCTS,
 		ShopPermission.S_MANAGE_PRODUCTS,
 		ShopPermission.S_SHOP_PRODUCTS,
 		ShopPermission.S_SHOP_PRODUCTS,
+		ShopPermission.S_SHOP_FOODWAVE,
 
 
 		BillPermission.S_CREATE_BILL,
 		BillPermission.S_CREATE_BILL,
 		BillPermission.S_READ_ALL,
 		BillPermission.S_READ_ALL,
@@ -88,6 +90,7 @@ import fi.insomnia.bortal.model.User;
 		EventPermission.S_MANAGE_PROPERTIES,
 		EventPermission.S_MANAGE_PROPERTIES,
 
 
 })
 })
+@LocalBean
 public class PermissionBean implements PermissionBeanLocal {
 public class PermissionBean implements PermissionBeanLocal {
 
 
 	private static final Logger logger = LoggerFactory.getLogger(PermissionBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(PermissionBean.class);

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductBean.java

@@ -79,6 +79,7 @@ public class ProductBean implements ProductBeanLocal {
 	@EJB
 	@EJB
 	private ProductPBean productPBean;
 	private ProductPBean productPBean;
 
 
+	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(ProductBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(ProductBean.class);
 
 
 	/**
 	/**

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductPBean.java

@@ -25,6 +25,7 @@ public class ProductPBean {
 
 
 	@EJB
 	@EJB
 	private PermissionBean permbean;
 	private PermissionBean permbean;
+	@EJB
 	private AccountEventFacade accounteventfacade;
 	private AccountEventFacade accounteventfacade;
 
 
 	/**
 	/**

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/RoleBean.java

@@ -39,7 +39,10 @@ public class RoleBean implements RoleBeanLocal {
 
 
 	// private static final String PUBLIC_ROLE_NAME =
 	// private static final String PUBLIC_ROLE_NAME =
 	// BeanRole.ANONYMOUS.toString();
 	// BeanRole.ANONYMOUS.toString();
+	
+	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(RoleBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(RoleBean.class);
+	
 	@Resource
 	@Resource
 	private SessionContext sc;
 	private SessionContext sc;
 	@EJB
 	@EJB

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/SessionMgmtBean.java

@@ -35,6 +35,7 @@ public class SessionMgmtBean implements SessionMgmtBeanLocal {
 	private final Map<String, String> sessionUsers = Collections.synchronizedMap(new HashMap<String, String>());
 	private final Map<String, String> sessionUsers = Collections.synchronizedMap(new HashMap<String, String>());
 	private final Set<HttpSession> sessions = Collections.synchronizedSet(new HashSet<HttpSession>());
 	private final Set<HttpSession> sessions = Collections.synchronizedSet(new HashSet<HttpSession>());
 
 
+	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(SessionMgmtBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(SessionMgmtBean.class);
 
 
 	@Override
 	@Override

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/SitePageBean.java

@@ -51,6 +51,7 @@ public class SitePageBean implements SitePageBeanLocal {
 	@EJB
 	@EJB
 	private UserBean userbean;
 	private UserBean userbean;
 
 
+	@SuppressWarnings("unused")
 	private Logger logger = LoggerFactory.getLogger(SitePageBean.class);
 	private Logger logger = LoggerFactory.getLogger(SitePageBean.class);
 
 
 	@Override
 	@Override

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UtilBean.java

@@ -53,9 +53,9 @@ public class UtilBean implements UtilBeanLocal {
 	public UtilBean() {
 	public UtilBean() {
 	}
 	}
 
 
-	@Resource(name = "jmsQueue", mappedName = "jms/mailque")
+	@Resource(name = "jmsQueue", mappedName = "jms/bortalMailQueue")
 	private Queue mailQueue;
 	private Queue mailQueue;
-	@Resource(name = "connFactory", mappedName = "jms/mailconnectionfactory")
+	@Resource(name = "connFactory", mappedName = "jms/mailConnectionFactory")
 	private QueueConnectionFactory mailQuefactory;
 	private QueueConnectionFactory mailQuefactory;
 	@EJB
 	@EJB
 	private UserFacade userfacade;
 	private UserFacade userfacade;

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/BillLineFacade.java

@@ -25,6 +25,8 @@ import fi.insomnia.bortal.model.Product;
 @Stateless
 @Stateless
 @LocalBean
 @LocalBean
 public class BillLineFacade extends IntegerPkGenericFacade<BillLine> {
 public class BillLineFacade extends IntegerPkGenericFacade<BillLine> {
+	
+	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(BillLineFacade.class);
 	private static final Logger logger = LoggerFactory.getLogger(BillLineFacade.class);
 
 
 	public BillLineFacade() {
 	public BillLineFacade() {

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CompoFacade.java

@@ -12,18 +12,16 @@ import javax.persistence.criteria.Root;
 import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.model.Compo;
 import fi.insomnia.bortal.model.Compo;
 import fi.insomnia.bortal.model.Compo_;
 import fi.insomnia.bortal.model.Compo_;
-import fi.insomnia.bortal.model.NewsGroup;
-import fi.insomnia.bortal.model.NewsGroup_;
 
 
 @Stateless
 @Stateless
 @LocalBean
 @LocalBean
 public class CompoFacade extends IntegerPkGenericFacade<Compo> {
 public class CompoFacade extends IntegerPkGenericFacade<Compo> {
 	@EJB
 	@EJB
 	private EventBeanLocal eventbean;
 	private EventBeanLocal eventbean;
-	
-    public CompoFacade() {
-        super(Compo.class);
-    }
+
+	public CompoFacade() {
+		super(Compo.class);
+	}
 
 
 	public List<Compo> getList() {
 	public List<Compo> getList() {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveTemplateFacade.java

 package fi.insomnia.bortal.facade;
 package fi.insomnia.bortal.facade;
 
 
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
 
 
+import fi.insomnia.bortal.beans.EventBean;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
+import fi.insomnia.bortal.model.FoodWaveTemplate_;
 
 
 @Stateless
 @Stateless
 @LocalBean
 @LocalBean
 public class FoodWaveTemplateFacade extends IntegerPkGenericFacade<FoodWaveTemplate> {
 public class FoodWaveTemplateFacade extends IntegerPkGenericFacade<FoodWaveTemplate> {
 
 
+	@EJB
+	private EventBean eventbean;
+
 	public FoodWaveTemplateFacade() {
 	public FoodWaveTemplateFacade() {
 
 
 		super(FoodWaveTemplate.class);
 		super(FoodWaveTemplate.class);
 	}
 	}
 
 
+	public List<FoodWaveTemplate> findAllTemplates() {
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<FoodWaveTemplate> cq = cb.createQuery(FoodWaveTemplate.class);
+		Root<FoodWaveTemplate> root = cq.from(FoodWaveTemplate.class);
+		cb.equal(root.get(FoodWaveTemplate_.event), eventbean.getCurrentEvent());
+		return getEm().createQuery(cq).getResultList();
+	}
+
 }
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/MenuNavigationFacade.java

@@ -36,6 +36,7 @@ public class MenuNavigationFacade extends IntegerPkGenericFacade<MenuNavigation>
 	@EJB
 	@EJB
 	private PermissionBeanLocal permbean;
 	private PermissionBeanLocal permbean;
 
 
+	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(MenuNavigationFacade.class);
 	private static final Logger logger = LoggerFactory.getLogger(MenuNavigationFacade.class);
 
 
 	public MenuNavigation find(String url) {
 	public MenuNavigation find(String url) {

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/verkkomaksutfi/ContactAddressEntry.java

 package fi.insomnia.bortal.verkkomaksutfi;
 package fi.insomnia.bortal.verkkomaksutfi;
 
 
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java

 package fi.insomnia.bortal.beans;
 package fi.insomnia.bortal.beans;
+
 import java.util.List;
 import java.util.List;
 
 
 import javax.ejb.Local;
 import javax.ejb.Local;
@@ -9,8 +10,11 @@ import fi.insomnia.bortal.model.FoodWaveTemplate;
 @Local
 @Local
 public interface FoodWaveBeanLocal {
 public interface FoodWaveBeanLocal {
 
 
-    void createTemplate(FoodWaveTemplate waveTemplate);
+	List<FoodWaveTemplate> getTemplates();
+
+	FoodWaveTemplate saveOrCreateTemplate(FoodWaveTemplate template);
 
 
+	List<FoodWave> findShoppableFoodwaves();
 
 
     FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate);
     FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate);
     
     

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/MenubeanLocal.java → code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/MenuBeanLocal.java

@@ -7,7 +7,7 @@ import javax.ejb.Local;
 import fi.insomnia.bortal.model.MenuNavigation;
 import fi.insomnia.bortal.model.MenuNavigation;
 
 
 @Local
 @Local
-public interface MenubeanLocal {
+public interface MenuBeanLocal {
 
 
 	// List<MenuNavigation> getTopnavigations();
 	// List<MenuNavigation> getTopnavigations();
 
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/OrgRoleBeanLocal.java

@@ -5,14 +5,13 @@ import java.util.List;
 import javax.ejb.Local;
 import javax.ejb.Local;
 
 
 import fi.insomnia.bortal.model.OrgRole;
 import fi.insomnia.bortal.model.OrgRole;
-import fi.insomnia.bortal.utilities.jpa.ModelInterface;
 
 
 @Local
 @Local
 public interface OrgRoleBeanLocal {
 public interface OrgRoleBeanLocal {
 
 
 	List<OrgRole> listOrgRoles();
 	List<OrgRole> listOrgRoles();
 
 
-	ModelInterface find(Integer id);
+	OrgRole find(Integer id);
 
 
 	List<OrgRole> getPossibleParents(OrgRole orgRole);
 	List<OrgRole> getPossibleParents(OrgRole orgRole);
 
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/clientutils/BortalLocalContextHolder.java

@@ -3,6 +3,9 @@ package fi.insomnia.bortal.clientutils;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -15,6 +18,8 @@ public class BortalLocalContextHolder {
 	private String hostname;
 	private String hostname;
 	private boolean ssl = false;
 	private boolean ssl = false;
 	private Integer hostnameId;
 	private Integer hostnameId;
+	
+	private LoginContext loginContext;
 
 
 	private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>();
 	private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>();
 
 
@@ -30,6 +35,7 @@ public class BortalLocalContextHolder {
 		super();
 		super();
 		this.hostname = old.hostname;
 		this.hostname = old.hostname;
 		this.ssl = old.ssl;
 		this.ssl = old.ssl;
+		this.loginContext = old.loginContext;
 	}
 	}
 
 
 	public static void setHostname(String hostname) {
 	public static void setHostname(String hostname) {
@@ -73,7 +79,6 @@ public class BortalLocalContextHolder {
 
 
 	public static void setPermission(IAppPermission permission, Boolean value) {
 	public static void setPermission(IAppPermission permission, Boolean value) {
 		getThread().rightcache.put(permission, value);
 		getThread().rightcache.put(permission, value);
-
 	}
 	}
 
 
 	public static BortalLocalContextHolder getInstance() {
 	public static BortalLocalContextHolder getInstance() {
@@ -111,4 +116,31 @@ public class BortalLocalContextHolder {
 		}
 		}
 		THREAD_WITH_CONTEXT.set(new BortalLocalContextHolder(contextHolder));
 		THREAD_WITH_CONTEXT.set(new BortalLocalContextHolder(contextHolder));
 	}
 	}
+
+	public void setLoginContext(LoginContext loginContext) {
+		this.loginContext = loginContext;
+	}
+	
+	public LoginContext getLoginContext() {
+		return loginContext;
+	}
+	
+	public boolean executeLogin() {
+		try {
+			this.loginContext.login();
+			System.err.println("execute login");
+			return true;
+		} catch (LoginException e) {
+			return false;
+		}
+	}
+	
+	public void executeLogout() {
+		try {
+			this.loginContext.logout();
+			System.err.println("execute logout");
+		} catch(Exception e) {
+			
+		}
+	}
 }
 }
\ No newline at end of file

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

-package fi.insomnia.bortal.model;
-
-import java.math.BigDecimal;
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-08-18T20:20:22.190+0300")
-@StaticMetamodel(AccountEvent.class)
-public class AccountEvent_ extends GenericEntity_ {
-	public static volatile SingularAttribute<AccountEvent, Boolean> cash;
-	public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
-	public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
-	public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
-	public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
-	public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
-	public static volatile SingularAttribute<AccountEvent, Product> product;
-	public static volatile SingularAttribute<AccountEvent, EventUser> user;
-	public static volatile SingularAttribute<AccountEvent, EventUser> seller;
-	public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
-	public static volatile SingularAttribute<AccountEvent, Bill> bill;
-	public static volatile SingularAttribute<AccountEvent, String> description;
-}
+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.798+0300")
+@StaticMetamodel(AccountEvent.class)
+public class AccountEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<AccountEvent, Boolean> cash;
+	public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
+	public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
+	public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
+	public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
+	public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
+	public static volatile SingularAttribute<AccountEvent, Product> product;
+	public static volatile SingularAttribute<AccountEvent, EventUser> user;
+	public static volatile SingularAttribute<AccountEvent, EventUser> seller;
+	public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
+	public static volatile SingularAttribute<AccountEvent, Bill> bill;
+	public static volatile SingularAttribute<AccountEvent, String> description;
+}

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

@@ -21,6 +21,8 @@ import fi.insomnia.bortal.enums.ActionLogMessageState;
 @Table(name = "actionlog_message_responses")
 @Table(name = "actionlog_message_responses")
 @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
 @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
 public class ActionLogMessageResponse extends GenericEntity {
 public class ActionLogMessageResponse extends GenericEntity {
+    private static final long serialVersionUID = 1L;
+
     @Column(name = "time", nullable = false)
     @Column(name = "time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
     @Temporal(TemporalType.TIMESTAMP)
     private Date time = new Date();
     private Date time = new Date();

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

-package fi.insomnia.bortal.model;
-
-import fi.insomnia.bortal.enums.ActionLogMessageState;
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T16:34:23.398+0300")
-@StaticMetamodel(ActionLogMessageResponse.class)
-public class ActionLogMessageResponse_ extends GenericEntity_ {
-	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
-	public static volatile SingularAttribute<ActionLogMessageResponse, EventUser> user;
-	public static volatile SingularAttribute<ActionLogMessageResponse, String> message;
-	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessageState> stateChange;
-	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessage> actionLogMessage;
-}
+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.ActionLogMessageState;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.825+0300")
+@StaticMetamodel(ActionLogMessageResponse.class)
+public class ActionLogMessageResponse_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
+	public static volatile SingularAttribute<ActionLogMessageResponse, EventUser> user;
+	public static volatile SingularAttribute<ActionLogMessageResponse, String> message;
+	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessageState> stateChange;
+	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessage> actionLogMessage;
+}

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

-package fi.insomnia.bortal.model;
-
-import fi.insomnia.bortal.enums.ActionLogMessageState;
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T20:43:11.360+0300")
-@StaticMetamodel(ActionLogMessage.class)
-public class ActionLogMessage_ extends GenericEntity_ {
-	public static volatile SingularAttribute<ActionLogMessage, Date> time;
-	public static volatile SingularAttribute<ActionLogMessage, User> user;
-	public static volatile SingularAttribute<ActionLogMessage, Role> crew;
-	public static volatile SingularAttribute<ActionLogMessage, String> message;
-	public static volatile ListAttribute<ActionLogMessage, ActionLogMessageResponse> actionLogMessageResponses;
-	public static volatile SingularAttribute<ActionLogMessage, ActionLogMessageState> state;
-}
+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.ActionLogMessageState;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.817+0300")
+@StaticMetamodel(ActionLogMessage.class)
+public class ActionLogMessage_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ActionLogMessage, Date> time;
+	public static volatile SingularAttribute<ActionLogMessage, User> user;
+	public static volatile SingularAttribute<ActionLogMessage, Role> crew;
+	public static volatile SingularAttribute<ActionLogMessage, String> message;
+	public static volatile ListAttribute<ActionLogMessage, ActionLogMessageResponse> actionLogMessageResponses;
+	public static volatile SingularAttribute<ActionLogMessage, ActionLogMessageState> state;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.038+0300")
-@StaticMetamodel(ApplicationPermission.class)
-public class ApplicationPermission_ extends GenericEntity_ {
-	public static volatile SingularAttribute<ApplicationPermission, String> application;
-	public static volatile SingularAttribute<ApplicationPermission, Role> role;
-	public static volatile SingularAttribute<ApplicationPermission, String> permission;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.832+0300")
+@StaticMetamodel(ApplicationPermission.class)
+public class ApplicationPermission_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ApplicationPermission, String> application;
+	public static volatile SingularAttribute<ApplicationPermission, Role> role;
+	public static volatile SingularAttribute<ApplicationPermission, String> permission;
+}

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

-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package fi.insomnia.bortal.model;
 package fi.insomnia.bortal.model;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -136,7 +132,8 @@ public class Bill extends GenericEntity {
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     @JoinColumn(updatable = false, name = "eventuser_id")
     @JoinColumn(updatable = false, name = "eventuser_id")
     private EventUser user;
     private EventUser user;
-
+    
+    @SuppressWarnings("unused")
     private static final Logger logger = LoggerFactory.getLogger(Bill.class);
     private static final Logger logger = LoggerFactory.getLogger(Bill.class);
 
 
     public Integer getReferenceNumberBase() {
     public Integer getReferenceNumberBase() {

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

-package fi.insomnia.bortal.model;
-
-import java.math.BigDecimal;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.042+0300")
-@StaticMetamodel(BillLine.class)
-public class BillLine_ extends GenericEntity_ {
-	public static volatile SingularAttribute<BillLine, Bill> bill;
-	public static volatile SingularAttribute<BillLine, String> name;
-	public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
-	public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
-	public static volatile SingularAttribute<BillLine, String> unitName;
-	public static volatile SingularAttribute<BillLine, BigDecimal> vat;
-	public static volatile SingularAttribute<BillLine, Product> lineProduct;
-}
+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.847+0300")
+@StaticMetamodel(BillLine.class)
+public class BillLine_ extends GenericEntity_ {
+	public static volatile SingularAttribute<BillLine, Bill> bill;
+	public static volatile SingularAttribute<BillLine, String> name;
+	public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
+	public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
+	public static volatile SingularAttribute<BillLine, String> unitName;
+	public static volatile SingularAttribute<BillLine, BigDecimal> vat;
+	public static volatile SingularAttribute<BillLine, Product> lineProduct;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-08-21T16:13:39.892+0300")
-@StaticMetamodel(Bill.class)
-public class Bill_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Bill, LanEvent> event;
-	public static volatile SingularAttribute<Bill, Date> paidDate;
-	public static volatile SingularAttribute<Bill, Integer> billNumber;
-	public static volatile SingularAttribute<Bill, String> addr1;
-	public static volatile SingularAttribute<Bill, String> addr2;
-	public static volatile SingularAttribute<Bill, String> addr3;
-	public static volatile SingularAttribute<Bill, String> addr4;
-	public static volatile SingularAttribute<Bill, String> addr5;
-	public static volatile SingularAttribute<Bill, Calendar> sentDate;
-	public static volatile SingularAttribute<Bill, Integer> paymentTime;
-	public static volatile SingularAttribute<Bill, String> noticetime;
-	public static volatile SingularAttribute<Bill, String> theirReference;
-	public static volatile SingularAttribute<Bill, String> ourReference;
-	public static volatile SingularAttribute<Bill, String> deliveryTerms;
-	public static volatile SingularAttribute<Bill, Integer> delayIntrest;
-	public static volatile SingularAttribute<Bill, String> notes;
-	public static volatile ListAttribute<Bill, BillLine> billLines;
-	public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
-	public static volatile SingularAttribute<Bill, EventUser> user;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.839+0300")
+@StaticMetamodel(Bill.class)
+public class Bill_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Bill, LanEvent> event;
+	public static volatile SingularAttribute<Bill, Date> paidDate;
+	public static volatile SingularAttribute<Bill, Integer> billNumber;
+	public static volatile SingularAttribute<Bill, String> addr1;
+	public static volatile SingularAttribute<Bill, String> addr2;
+	public static volatile SingularAttribute<Bill, String> addr3;
+	public static volatile SingularAttribute<Bill, String> addr4;
+	public static volatile SingularAttribute<Bill, String> addr5;
+	public static volatile SingularAttribute<Bill, Calendar> sentDate;
+	public static volatile SingularAttribute<Bill, Integer> paymentTime;
+	public static volatile SingularAttribute<Bill, String> noticetime;
+	public static volatile SingularAttribute<Bill, String> theirReference;
+	public static volatile SingularAttribute<Bill, String> ourReference;
+	public static volatile SingularAttribute<Bill, String> deliveryTerms;
+	public static volatile SingularAttribute<Bill, Integer> delayIntrest;
+	public static volatile SingularAttribute<Bill, String> notes;
+	public static volatile ListAttribute<Bill, BillLine> billLines;
+	public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
+	public static volatile SingularAttribute<Bill, EventUser> user;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.044+0300")
-@StaticMetamodel(CardTemplate.class)
-public class CardTemplate_ extends GenericEntity_ {
-	public static volatile SingularAttribute<CardTemplate, LanEvent> event;
-	public static volatile SingularAttribute<CardTemplate, byte[]> image;
-	public static volatile SingularAttribute<CardTemplate, String> name;
-	public static volatile SingularAttribute<CardTemplate, Integer> power;
-	public static volatile ListAttribute<CardTemplate, Role> roles;
-	public static volatile ListAttribute<CardTemplate, PrintedCard> cards;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.854+0300")
+@StaticMetamodel(CardTemplate.class)
+public class CardTemplate_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CardTemplate, LanEvent> event;
+	public static volatile SingularAttribute<CardTemplate, byte[]> image;
+	public static volatile SingularAttribute<CardTemplate, String> name;
+	public static volatile SingularAttribute<CardTemplate, Integer> power;
+	public static volatile ListAttribute<CardTemplate, Role> roles;
+	public static volatile ListAttribute<CardTemplate, PrintedCard> cards;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.050+0300")
-@StaticMetamodel(CompoEntryFile.class)
-public class CompoEntryFile_ extends GenericEntity_ {
-	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
-	public static volatile SingularAttribute<CompoEntryFile, String> fileName;
-	public static volatile SingularAttribute<CompoEntryFile, String> description;
-	public static volatile SingularAttribute<CompoEntryFile, String> hash;
-	public static volatile SingularAttribute<CompoEntryFile, byte[]> fileData;
-	public static volatile SingularAttribute<CompoEntryFile, Calendar> uploaded;
-	public static volatile SingularAttribute<CompoEntryFile, CompoEntry> entry;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.876+0300")
+@StaticMetamodel(CompoEntryFile.class)
+public class CompoEntryFile_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
+	public static volatile SingularAttribute<CompoEntryFile, String> fileName;
+	public static volatile SingularAttribute<CompoEntryFile, String> description;
+	public static volatile SingularAttribute<CompoEntryFile, String> hash;
+	public static volatile SingularAttribute<CompoEntryFile, byte[]> fileData;
+	public static volatile SingularAttribute<CompoEntryFile, Calendar> uploaded;
+	public static volatile SingularAttribute<CompoEntryFile, CompoEntry> entry;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.069+0300")
-@StaticMetamodel(CompoEntryParticipant.class)
-public class CompoEntryParticipant_ extends GenericEntity_ {
-	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
-	public static volatile SingularAttribute<CompoEntryParticipant, String> role;
-	public static volatile SingularAttribute<CompoEntryParticipant, String> nick;
-	public static volatile SingularAttribute<CompoEntryParticipant, Calendar> confirmed;
-	public static volatile SingularAttribute<CompoEntryParticipant, EventUser> user;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.885+0300")
+@StaticMetamodel(CompoEntryParticipant.class)
+public class CompoEntryParticipant_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
+	public static volatile SingularAttribute<CompoEntryParticipant, String> role;
+	public static volatile SingularAttribute<CompoEntryParticipant, String> nick;
+	public static volatile SingularAttribute<CompoEntryParticipant, Calendar> confirmed;
+	public static volatile SingularAttribute<CompoEntryParticipant, EventUser> user;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-25T04:25:05.134+0300")
-@StaticMetamodel(CompoEntry.class)
-public class CompoEntry_ extends GenericEntity_ {
-	public static volatile SingularAttribute<CompoEntry, Compo> compo;
-	public static volatile SingularAttribute<CompoEntry, Calendar> created;
-	public static volatile SingularAttribute<CompoEntry, String> title;
-	public static volatile SingularAttribute<CompoEntry, String> author;
-	public static volatile SingularAttribute<CompoEntry, String> notes;
-	public static volatile SingularAttribute<CompoEntry, String> screenMessage;
-	public static volatile SingularAttribute<CompoEntry, Integer> sort;
-	public static volatile SingularAttribute<CompoEntry, Integer> finalPosition;
-	public static volatile SingularAttribute<CompoEntry, CompoEntryFile> currentFile;
-	public static volatile ListAttribute<CompoEntry, Vote> votes;
-	public static volatile ListAttribute<CompoEntry, CompoEntryFile> files;
-	public static volatile ListAttribute<CompoEntry, CompoEntryParticipant> participants;
-	public static volatile SingularAttribute<CompoEntry, EventUser> creator;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.869+0300")
+@StaticMetamodel(CompoEntry.class)
+public class CompoEntry_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CompoEntry, Compo> compo;
+	public static volatile SingularAttribute<CompoEntry, Calendar> created;
+	public static volatile SingularAttribute<CompoEntry, String> title;
+	public static volatile SingularAttribute<CompoEntry, String> author;
+	public static volatile SingularAttribute<CompoEntry, String> notes;
+	public static volatile SingularAttribute<CompoEntry, String> screenMessage;
+	public static volatile SingularAttribute<CompoEntry, Integer> sort;
+	public static volatile SingularAttribute<CompoEntry, Integer> finalPosition;
+	public static volatile SingularAttribute<CompoEntry, CompoEntryFile> currentFile;
+	public static volatile ListAttribute<CompoEntry, Vote> votes;
+	public static volatile ListAttribute<CompoEntry, CompoEntryFile> files;
+	public static volatile ListAttribute<CompoEntry, CompoEntryParticipant> participants;
+	public static volatile SingularAttribute<CompoEntry, EventUser> creator;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T20:43:12.974+0300")
-@StaticMetamodel(Compo.class)
-public class Compo_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Compo, String> name;
-	public static volatile SingularAttribute<Compo, LanEvent> event;
-	public static volatile SingularAttribute<Compo, Calendar> startTime;
-	public static volatile SingularAttribute<Compo, Calendar> endTime;
-	public static volatile SingularAttribute<Compo, Calendar> voteStart;
-	public static volatile SingularAttribute<Compo, Calendar> voteEnd;
-	public static volatile SingularAttribute<Compo, Calendar> submitStart;
-	public static volatile SingularAttribute<Compo, Calendar> submitEnd;
-	public static volatile SingularAttribute<Compo, String> description;
-	public static volatile SingularAttribute<Compo, Integer> maxParticipantCount;
-	public static volatile SingularAttribute<Compo, Boolean> holdVoting;
-	public static volatile ListAttribute<Compo, CompoEntry> compoEntries;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.861+0300")
+@StaticMetamodel(Compo.class)
+public class Compo_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Compo, String> name;
+	public static volatile SingularAttribute<Compo, LanEvent> event;
+	public static volatile SingularAttribute<Compo, Calendar> startTime;
+	public static volatile SingularAttribute<Compo, Calendar> endTime;
+	public static volatile SingularAttribute<Compo, Calendar> voteStart;
+	public static volatile SingularAttribute<Compo, Calendar> voteEnd;
+	public static volatile SingularAttribute<Compo, Calendar> submitStart;
+	public static volatile SingularAttribute<Compo, Calendar> submitEnd;
+	public static volatile SingularAttribute<Compo, String> description;
+	public static volatile SingularAttribute<Compo, Integer> maxParticipantCount;
+	public static volatile SingularAttribute<Compo, Boolean> holdVoting;
+	public static volatile ListAttribute<Compo, CompoEntry> compoEntries;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.056+0300")
-@StaticMetamodel(DiscountInstance.class)
-public class DiscountInstance_ extends GenericEntity_ {
-	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
-	public static volatile SingularAttribute<DiscountInstance, Discount> discount;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.901+0300")
+@StaticMetamodel(DiscountInstance.class)
+public class DiscountInstance_ extends GenericEntity_ {
+	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
+	public static volatile SingularAttribute<DiscountInstance, Discount> discount;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.math.BigDecimal;
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-18T08:56:10.866+0300")
-@StaticMetamodel(Discount.class)
-public class Discount_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Discount, LanEvent> event;
-	public static volatile SingularAttribute<Discount, BigDecimal> percentage;
-	public static volatile SingularAttribute<Discount, String> code;
-	public static volatile SingularAttribute<Discount, Calendar> validFrom;
-	public static volatile SingularAttribute<Discount, Calendar> validTo;
-	public static volatile SingularAttribute<Discount, String> details;
-	public static volatile SingularAttribute<Discount, String> shortdesc;
-	public static volatile SingularAttribute<Discount, BigDecimal> amountMin;
-	public static volatile SingularAttribute<Discount, BigDecimal> amountMax;
-	public static volatile SingularAttribute<Discount, Boolean> active;
-	public static volatile SingularAttribute<Discount, BigDecimal> maxNum;
-	public static volatile SingularAttribute<Discount, BigDecimal> perUser;
-	public static volatile SingularAttribute<Discount, BigDecimal> totalCount;
-	public static volatile ListAttribute<Discount, DiscountInstance> discountInstances;
-	public static volatile SingularAttribute<Discount, Role> role;
-	public static volatile ListAttribute<Discount, Product> products;
-}
+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.893+0300")
+@StaticMetamodel(Discount.class)
+public class Discount_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Discount, LanEvent> event;
+	public static volatile SingularAttribute<Discount, BigDecimal> percentage;
+	public static volatile SingularAttribute<Discount, String> code;
+	public static volatile SingularAttribute<Discount, Calendar> validFrom;
+	public static volatile SingularAttribute<Discount, Calendar> validTo;
+	public static volatile SingularAttribute<Discount, String> details;
+	public static volatile SingularAttribute<Discount, String> shortdesc;
+	public static volatile SingularAttribute<Discount, BigDecimal> amountMin;
+	public static volatile SingularAttribute<Discount, BigDecimal> amountMax;
+	public static volatile SingularAttribute<Discount, Boolean> active;
+	public static volatile SingularAttribute<Discount, BigDecimal> maxNum;
+	public static volatile SingularAttribute<Discount, BigDecimal> perUser;
+	public static volatile SingularAttribute<Discount, BigDecimal> totalCount;
+	public static volatile ListAttribute<Discount, DiscountInstance> discountInstances;
+	public static volatile SingularAttribute<Discount, Role> role;
+	public static volatile ListAttribute<Discount, Product> products;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.057+0300")
-@StaticMetamodel(EntityEquals.class)
-public class EntityEquals_ {
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.908+0300")
+@StaticMetamodel(EntityEquals.class)
+public class EntityEquals_ {
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-08-22T04:30:56.900+0300")
-@StaticMetamodel(EventMap.class)
-public class EventMap_ extends GenericEntity_ {
-	public static volatile SingularAttribute<EventMap, LanEvent> event;
-	public static volatile SingularAttribute<EventMap, byte[]> mapData;
-	public static volatile SingularAttribute<EventMap, String> name;
-	public static volatile ListAttribute<EventMap, Place> places;
-	public static volatile ListAttribute<EventMap, Reader> readers;
-	public static volatile SingularAttribute<EventMap, Boolean> active;
-	public static volatile SingularAttribute<EventMap, String> notes;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.916+0300")
+@StaticMetamodel(EventMap.class)
+public class EventMap_ extends GenericEntity_ {
+	public static volatile SingularAttribute<EventMap, LanEvent> event;
+	public static volatile SingularAttribute<EventMap, byte[]> mapData;
+	public static volatile SingularAttribute<EventMap, String> name;
+	public static volatile ListAttribute<EventMap, Place> places;
+	public static volatile ListAttribute<EventMap, Reader> readers;
+	public static volatile SingularAttribute<EventMap, Boolean> active;
+	public static volatile SingularAttribute<EventMap, String> notes;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T03:01:37.237+0300")
-@StaticMetamodel(EventOrganiser.class)
-public class EventOrganiser_ extends GenericEntity_ {
-	public static volatile SingularAttribute<EventOrganiser, String> organisation;
-	public static volatile SingularAttribute<EventOrganiser, String> bundleCountry;
-	public static volatile ListAttribute<EventOrganiser, LanEvent> events;
-	public static volatile SingularAttribute<EventOrganiser, String> billAddress1;
-	public static volatile SingularAttribute<EventOrganiser, String> billAddress2;
-	public static volatile SingularAttribute<EventOrganiser, String> billAddress3;
-	public static volatile SingularAttribute<EventOrganiser, String> billAddress4;
-	public static volatile SingularAttribute<EventOrganiser, String> bankNumber1;
-	public static volatile SingularAttribute<EventOrganiser, String> bankNumber2;
-	public static volatile SingularAttribute<EventOrganiser, String> bankName1;
-	public static volatile SingularAttribute<EventOrganiser, String> bankName2;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.923+0300")
+@StaticMetamodel(EventOrganiser.class)
+public class EventOrganiser_ extends GenericEntity_ {
+	public static volatile SingularAttribute<EventOrganiser, String> organisation;
+	public static volatile SingularAttribute<EventOrganiser, String> bundleCountry;
+	public static volatile ListAttribute<EventOrganiser, LanEvent> events;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress1;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress2;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress3;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress4;
+	public static volatile SingularAttribute<EventOrganiser, String> bankNumber1;
+	public static volatile SingularAttribute<EventOrganiser, String> bankNumber2;
+	public static volatile SingularAttribute<EventOrganiser, String> bankName1;
+	public static volatile SingularAttribute<EventOrganiser, String> bankName2;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-09-27T09:58:55.015+0300")
-@StaticMetamodel(EventUser.class)
-public class EventUser_ extends GenericEntity_ {
-	public static volatile SingularAttribute<EventUser, User> user;
-	public static volatile SingularAttribute<EventUser, LanEvent> event;
-	public static volatile ListAttribute<EventUser, Vote> votes;
-	public static volatile ListAttribute<EventUser, UserNote> notes;
-	public static volatile ListAttribute<EventUser, Role> roles;
-	public static volatile ListAttribute<EventUser, CompoEntryParticipant> compoEntryParticipants;
-	public static volatile ListAttribute<EventUser, CompoEntry> compoEntries;
-	public static volatile ListAttribute<EventUser, PlaceGroup> placeGroups;
-	public static volatile ListAttribute<EventUser, GroupMembership> groupMemberships;
-	public static volatile ListAttribute<EventUser, Place> currentPlaces;
-	public static volatile ListAttribute<EventUser, PrintedCard> printedCards;
-	public static volatile ListAttribute<EventUser, AccountEvent> accountEvents;
-	public static volatile ListAttribute<EventUser, Bill> bills;
-	public static volatile ListAttribute<EventUser, AccountEvent> soldItems;
-	public static volatile ListAttribute<EventUser, PollAnswer> pollAnswers;
-	public static volatile SingularAttribute<EventUser, EventUser> creator;
-	public static volatile SingularAttribute<EventUser, Date> eventuserCreated;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.931+0300")
+@StaticMetamodel(EventUser.class)
+public class EventUser_ extends GenericEntity_ {
+	public static volatile SingularAttribute<EventUser, User> user;
+	public static volatile SingularAttribute<EventUser, LanEvent> event;
+	public static volatile ListAttribute<EventUser, Vote> votes;
+	public static volatile ListAttribute<EventUser, UserNote> notes;
+	public static volatile ListAttribute<EventUser, Role> roles;
+	public static volatile ListAttribute<EventUser, CompoEntryParticipant> compoEntryParticipants;
+	public static volatile ListAttribute<EventUser, CompoEntry> compoEntries;
+	public static volatile ListAttribute<EventUser, PlaceGroup> placeGroups;
+	public static volatile ListAttribute<EventUser, GroupMembership> groupMemberships;
+	public static volatile ListAttribute<EventUser, Place> currentPlaces;
+	public static volatile ListAttribute<EventUser, PrintedCard> printedCards;
+	public static volatile ListAttribute<EventUser, AccountEvent> accountEvents;
+	public static volatile ListAttribute<EventUser, Bill> bills;
+	public static volatile ListAttribute<EventUser, AccountEvent> soldItems;
+	public static volatile ListAttribute<EventUser, PollAnswer> pollAnswers;
+	public static volatile SingularAttribute<EventUser, EventUser> creator;
+	public static volatile SingularAttribute<EventUser, Date> eventuserCreated;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.063+0300")
-@StaticMetamodel(FoodWaveTemplate.class)
-public class FoodWaveTemplate_ extends GenericEntity_ {
-	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
-	public static volatile SingularAttribute<FoodWaveTemplate, String> name;
-	public static volatile SingularAttribute<FoodWaveTemplate, String> description;
-	public static volatile ListAttribute<FoodWaveTemplate, Product> products;
-	public static volatile ListAttribute<FoodWaveTemplate, FoodWave> foodwaves;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.948+0300")
+@StaticMetamodel(FoodWaveTemplate.class)
+public class FoodWaveTemplate_ extends GenericEntity_ {
+	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
+	public static volatile SingularAttribute<FoodWaveTemplate, String> name;
+	public static volatile SingularAttribute<FoodWaveTemplate, String> description;
+	public static volatile ListAttribute<FoodWaveTemplate, Product> products;
+	public static volatile ListAttribute<FoodWaveTemplate, FoodWave> foodwaves;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.061+0300")
-@StaticMetamodel(FoodWave.class)
-public class FoodWave_ extends GenericEntity_ {
-	public static volatile SingularAttribute<FoodWave, String> name;
-	public static volatile SingularAttribute<FoodWave, String> description;
-	public static volatile SingularAttribute<FoodWave, Calendar> time;
-	public static volatile SingularAttribute<FoodWave, Boolean> closed;
-	public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
-	public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.940+0300")
+@StaticMetamodel(FoodWave.class)
+public class FoodWave_ extends GenericEntity_ {
+	public static volatile SingularAttribute<FoodWave, String> name;
+	public static volatile SingularAttribute<FoodWave, String> description;
+	public static volatile SingularAttribute<FoodWave, Calendar> time;
+	public static volatile SingularAttribute<FoodWave, Boolean> closed;
+	public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
+	public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.067+0300")
-@StaticMetamodel(GenericEntity.class)
-public class GenericEntity_ extends EntityEquals_ {
-	public static volatile SingularAttribute<GenericEntity, Integer> id;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.955+0300")
+@StaticMetamodel(GenericEntity.class)
+public class GenericEntity_ extends EntityEquals_ {
+	public static volatile SingularAttribute<GenericEntity, Integer> id;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.135+0300")
-@StaticMetamodel(GroupMembership.class)
-public class GroupMembership_ extends GenericEntity_ {
-	public static volatile SingularAttribute<GroupMembership, String> inviteToken;
-	public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
-	public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
-	public static volatile SingularAttribute<GroupMembership, String> inviteName;
-	public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
-	public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
-	public static volatile SingularAttribute<GroupMembership, EventUser> user;
-	public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.962+0300")
+@StaticMetamodel(GroupMembership.class)
+public class GroupMembership_ extends GenericEntity_ {
+	public static volatile SingularAttribute<GroupMembership, String> inviteToken;
+	public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
+	public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
+	public static volatile SingularAttribute<GroupMembership, String> inviteName;
+	public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
+	public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
+	public static volatile SingularAttribute<GroupMembership, EventUser> user;
+	public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.075+0300")
-@StaticMetamodel(LanEventDomain.class)
-public class LanEventDomain_ extends GenericEntity_ {
-	public static volatile SingularAttribute<LanEventDomain, String> domain;
-	public static volatile SingularAttribute<LanEventDomain, String> description;
-	public static volatile SingularAttribute<LanEventDomain, LanEvent> event;
-	public static volatile SingularAttribute<LanEventDomain, Integer> overridePriority;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.979+0300")
+@StaticMetamodel(LanEventDomain.class)
+public class LanEventDomain_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEventDomain, String> domain;
+	public static volatile SingularAttribute<LanEventDomain, String> description;
+	public static volatile SingularAttribute<LanEventDomain, LanEvent> event;
+	public static volatile SingularAttribute<LanEventDomain, Integer> overridePriority;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-08-25T03:50:15.426+0300")
-@StaticMetamodel(LanEventPrivateProperty.class)
-public class LanEventPrivateProperty_ extends GenericEntity_ {
-	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
-	public static volatile SingularAttribute<LanEventPrivateProperty, LanEvent> event;
-	public static volatile SingularAttribute<LanEventPrivateProperty, LanEventPrivatePropertyKey> key;
-	public static volatile SingularAttribute<LanEventPrivateProperty, String> description;
-	public static volatile SingularAttribute<LanEventPrivateProperty, Boolean> booleanValue;
-	public static volatile SingularAttribute<LanEventPrivateProperty, String> textvalue;
-	public static volatile SingularAttribute<LanEventPrivateProperty, BigDecimal> decimalValue;
-	public static volatile SingularAttribute<LanEventPrivateProperty, Long> longValue;
-	public static volatile SingularAttribute<LanEventPrivateProperty, String> byteMime;
-	public static volatile SingularAttribute<LanEventPrivateProperty, byte[]> byteValue;
-	public static volatile SingularAttribute<LanEventPrivateProperty, Date> dateValue;
-}
+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.987+0300")
+@StaticMetamodel(LanEventPrivateProperty.class)
+public class LanEventPrivateProperty_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
+	public static volatile SingularAttribute<LanEventPrivateProperty, LanEvent> event;
+	public static volatile SingularAttribute<LanEventPrivateProperty, LanEventPrivatePropertyKey> key;
+	public static volatile SingularAttribute<LanEventPrivateProperty, String> description;
+	public static volatile SingularAttribute<LanEventPrivateProperty, Boolean> booleanValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, String> textvalue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, BigDecimal> decimalValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, Long> longValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, String> byteMime;
+	public static volatile SingularAttribute<LanEventPrivateProperty, byte[]> byteValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, Date> dateValue;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.078+0300")
-@StaticMetamodel(LanEventProperty.class)
-public class LanEventProperty_ extends GenericEntity_ {
-	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
-	public static volatile SingularAttribute<LanEventProperty, LanEvent> event;
-	public static volatile SingularAttribute<LanEventProperty, LanEventPropertyKey> key;
-	public static volatile SingularAttribute<LanEventProperty, String> description;
-	public static volatile SingularAttribute<LanEventProperty, Boolean> booleanValue;
-	public static volatile SingularAttribute<LanEventProperty, String> textvalue;
-	public static volatile SingularAttribute<LanEventProperty, BigDecimal> decimalValue;
-	public static volatile SingularAttribute<LanEventProperty, Long> longValue;
-	public static volatile SingularAttribute<LanEventProperty, String> byteMime;
-	public static volatile SingularAttribute<LanEventProperty, byte[]> byteValue;
-	public static volatile SingularAttribute<LanEventProperty, Date> dateValue;
-}
+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.001+0300")
+@StaticMetamodel(LanEventProperty.class)
+public class LanEventProperty_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
+	public static volatile SingularAttribute<LanEventProperty, LanEvent> event;
+	public static volatile SingularAttribute<LanEventProperty, LanEventPropertyKey> key;
+	public static volatile SingularAttribute<LanEventProperty, String> description;
+	public static volatile SingularAttribute<LanEventProperty, Boolean> booleanValue;
+	public static volatile SingularAttribute<LanEventProperty, String> textvalue;
+	public static volatile SingularAttribute<LanEventProperty, BigDecimal> decimalValue;
+	public static volatile SingularAttribute<LanEventProperty, Long> longValue;
+	public static volatile SingularAttribute<LanEventProperty, String> byteMime;
+	public static volatile SingularAttribute<LanEventProperty, byte[]> byteValue;
+	public static volatile SingularAttribute<LanEventProperty, Date> dateValue;
+}

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

-package fi.insomnia.bortal.model;
-
-import fi.insomnia.bortal.enums.EventStatus;
-import fi.insomnia.bortal.model.salespoint.Salespoint;
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.072+0300")
-@StaticMetamodel(LanEvent.class)
-public class LanEvent_ extends GenericEntity_ {
-	public static volatile SingularAttribute<LanEvent, Calendar> startTime;
-	public static volatile SingularAttribute<LanEvent, Calendar> endTime;
-	public static volatile SingularAttribute<LanEvent, String> name;
-	public static volatile SingularAttribute<LanEvent, Boolean> eventEnabled;
-	public static volatile SingularAttribute<LanEvent, Integer> referenceNumberBase;
-	public static volatile SingularAttribute<LanEvent, Integer> nextBillNumber;
-	public static volatile SingularAttribute<LanEvent, EventOrganiser> organiser;
-	public static volatile SingularAttribute<LanEvent, EventStatus> status;
-	public static volatile ListAttribute<LanEvent, LogEntry> logEntries;
-	public static volatile SingularAttribute<LanEvent, Role> defaultRole;
-	public static volatile ListAttribute<LanEvent, Compo> compos;
-	public static volatile ListAttribute<LanEvent, CardTemplate> cardTemplates;
-	public static volatile ListAttribute<LanEvent, EventMap> eventMaps;
-	public static volatile ListAttribute<LanEvent, Role> roles;
-	public static volatile ListAttribute<LanEvent, Bill> bills;
-	public static volatile ListAttribute<LanEvent, Reader> readers;
-	public static volatile ListAttribute<LanEvent, Poll> polls;
-	public static volatile ListAttribute<LanEvent, Salespoint> salespoints;
-	public static volatile ListAttribute<LanEvent, LanEventDomain> domains;
-	public static volatile ListAttribute<LanEvent, LanEventProperty> properties;
-}
+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.EventStatus;
+import fi.insomnia.bortal.model.salespoint.Salespoint;
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:00.971+0300")
+@StaticMetamodel(LanEvent.class)
+public class LanEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEvent, Calendar> startTime;
+	public static volatile SingularAttribute<LanEvent, Calendar> endTime;
+	public static volatile SingularAttribute<LanEvent, String> name;
+	public static volatile SingularAttribute<LanEvent, Boolean> eventEnabled;
+	public static volatile SingularAttribute<LanEvent, Integer> referenceNumberBase;
+	public static volatile SingularAttribute<LanEvent, Integer> nextBillNumber;
+	public static volatile SingularAttribute<LanEvent, EventOrganiser> organiser;
+	public static volatile SingularAttribute<LanEvent, EventStatus> status;
+	public static volatile ListAttribute<LanEvent, LogEntry> logEntries;
+	public static volatile SingularAttribute<LanEvent, Role> defaultRole;
+	public static volatile ListAttribute<LanEvent, Compo> compos;
+	public static volatile ListAttribute<LanEvent, CardTemplate> cardTemplates;
+	public static volatile ListAttribute<LanEvent, EventMap> eventMaps;
+	public static volatile ListAttribute<LanEvent, Role> roles;
+	public static volatile ListAttribute<LanEvent, Bill> bills;
+	public static volatile ListAttribute<LanEvent, Reader> readers;
+	public static volatile ListAttribute<LanEvent, Poll> polls;
+	public static volatile ListAttribute<LanEvent, Salespoint> salespoints;
+	public static volatile ListAttribute<LanEvent, LanEventDomain> domains;
+	public static volatile ListAttribute<LanEvent, LanEventProperty> properties;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.080+0300")
-@StaticMetamodel(Location.class)
-public class Location_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Location, LanEvent> event;
-	public static volatile SingularAttribute<Location, String> name;
-	public static volatile ListAttribute<Location, Reader> readers;
-	public static volatile ListAttribute<Location, PrintedCard> printedCardsAtLocation;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.011+0300")
+@StaticMetamodel(Location.class)
+public class Location_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Location, LanEvent> event;
+	public static volatile SingularAttribute<Location, String> name;
+	public static volatile ListAttribute<Location, Reader> readers;
+	public static volatile ListAttribute<Location, PrintedCard> printedCardsAtLocation;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.083+0300")
-@StaticMetamodel(LogEntryType.class)
-public class LogEntryType_ extends GenericEntity_ {
-	public static volatile SingularAttribute<LogEntryType, String> name;
-	public static volatile SingularAttribute<LogEntryType, String> description;
-	public static volatile ListAttribute<LogEntryType, LogEntry> logEntries;
-	public static volatile SingularAttribute<LogEntryType, Integer> logLevel;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.030+0300")
+@StaticMetamodel(LogEntryType.class)
+public class LogEntryType_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LogEntryType, String> name;
+	public static volatile SingularAttribute<LogEntryType, String> description;
+	public static volatile ListAttribute<LogEntryType, LogEntry> logEntries;
+	public static volatile SingularAttribute<LogEntryType, Integer> logLevel;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-09-11T02:27:08.849+0300")
-@StaticMetamodel(LogEntry.class)
-public class LogEntry_ extends GenericEntity_ {
-	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
-	public static volatile SingularAttribute<LogEntry, Calendar> time;
-	public static volatile SingularAttribute<LogEntry, String> description;
-	public static volatile SingularAttribute<LogEntry, LogEntryType> type;
-	public static volatile SingularAttribute<LogEntry, User> user;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.021+0300")
+@StaticMetamodel(LogEntry.class)
+public class LogEntry_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
+	public static volatile SingularAttribute<LogEntry, Calendar> time;
+	public static volatile SingularAttribute<LogEntry, String> description;
+	public static volatile SingularAttribute<LogEntry, LogEntryType> type;
+	public static volatile SingularAttribute<LogEntry, User> user;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.088+0300")
-@StaticMetamodel(MenuNavigation.class)
-public class MenuNavigation_ extends GenericEntity_ {
-	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
-	public static volatile SingularAttribute<MenuNavigation, String> key;
-	public static volatile SingularAttribute<MenuNavigation, String> header;
-	public static volatile SingularAttribute<MenuNavigation, String> footer;
-	public static volatile SingularAttribute<MenuNavigation, Integer> sort;
-	public static volatile SingularAttribute<MenuNavigation, Boolean> visible;
-	public static volatile SingularAttribute<MenuNavigation, Menuitem> item;
-	public static volatile SingularAttribute<MenuNavigation, SitePage> sitepage;
-	public static volatile SingularAttribute<MenuNavigation, MenuNavigation> parent;
-	public static volatile ListAttribute<MenuNavigation, MenuNavigation> children;
-	public static volatile SingularAttribute<MenuNavigation, String> application;
-	public static volatile SingularAttribute<MenuNavigation, String> permission;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.058+0300")
+@StaticMetamodel(MenuNavigation.class)
+public class MenuNavigation_ extends GenericEntity_ {
+	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
+	public static volatile SingularAttribute<MenuNavigation, String> key;
+	public static volatile SingularAttribute<MenuNavigation, String> header;
+	public static volatile SingularAttribute<MenuNavigation, String> footer;
+	public static volatile SingularAttribute<MenuNavigation, Integer> sort;
+	public static volatile SingularAttribute<MenuNavigation, Boolean> visible;
+	public static volatile SingularAttribute<MenuNavigation, Menuitem> item;
+	public static volatile SingularAttribute<MenuNavigation, SitePage> sitepage;
+	public static volatile SingularAttribute<MenuNavigation, MenuNavigation> parent;
+	public static volatile ListAttribute<MenuNavigation, MenuNavigation> children;
+	public static volatile SingularAttribute<MenuNavigation, String> application;
+	public static volatile SingularAttribute<MenuNavigation, String> permission;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.085+0300")
-@StaticMetamodel(Menuitem.class)
-public class Menuitem_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Menuitem, String> url;
-	public static volatile SingularAttribute<Menuitem, String> description;
-	public static volatile ListAttribute<Menuitem, MenuNavigation> navigations;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.045+0300")
+@StaticMetamodel(Menuitem.class)
+public class Menuitem_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Menuitem, String> url;
+	public static volatile SingularAttribute<Menuitem, String> description;
+	public static volatile ListAttribute<Menuitem, MenuNavigation> navigations;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.092+0300")
-@StaticMetamodel(NewsGroup.class)
-public class NewsGroup_ extends GenericEntity_ {
-	public static volatile SingularAttribute<NewsGroup, LanEvent> event;
-	public static volatile SingularAttribute<NewsGroup, String> name;
-	public static volatile SingularAttribute<NewsGroup, String> description;
-	public static volatile SingularAttribute<NewsGroup, Integer> priority;
-	public static volatile SingularAttribute<NewsGroup, Role> writerRole;
-	public static volatile ListAttribute<NewsGroup, News> news;
-	public static volatile ListAttribute<NewsGroup, Role> readerRoles;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.084+0300")
+@StaticMetamodel(NewsGroup.class)
+public class NewsGroup_ extends GenericEntity_ {
+	public static volatile SingularAttribute<NewsGroup, LanEvent> event;
+	public static volatile SingularAttribute<NewsGroup, String> name;
+	public static volatile SingularAttribute<NewsGroup, String> description;
+	public static volatile SingularAttribute<NewsGroup, Integer> priority;
+	public static volatile SingularAttribute<NewsGroup, Role> writerRole;
+	public static volatile ListAttribute<NewsGroup, News> news;
+	public static volatile ListAttribute<NewsGroup, Role> readerRoles;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.174+0300")
-@StaticMetamodel(News.class)
-public class News_ extends GenericEntity_ {
-	public static volatile SingularAttribute<News, String> title;
-	public static volatile SingularAttribute<News, String> body;
-	public static volatile SingularAttribute<News, String> bodyAbstract;
-	public static volatile SingularAttribute<News, Date> publish;
-	public static volatile SingularAttribute<News, Date> expire;
-	public static volatile SingularAttribute<News, EventUser> creator;
-	public static volatile SingularAttribute<News, Integer> priority;
-	public static volatile SingularAttribute<News, NewsGroup> group;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.071+0300")
+@StaticMetamodel(News.class)
+public class News_ extends GenericEntity_ {
+	public static volatile SingularAttribute<News, String> title;
+	public static volatile SingularAttribute<News, String> body;
+	public static volatile SingularAttribute<News, String> bodyAbstract;
+	public static volatile SingularAttribute<News, Date> publish;
+	public static volatile SingularAttribute<News, Date> expire;
+	public static volatile SingularAttribute<News, EventUser> creator;
+	public static volatile SingularAttribute<News, Integer> priority;
+	public static volatile SingularAttribute<News, NewsGroup> group;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-08-15T14:06:19.919+0300")
-@StaticMetamodel(OrgRole.class)
-public class OrgRole_ extends GenericEntity_ {
-	public static volatile SingularAttribute<OrgRole, String> name;
-	public static volatile ListAttribute<OrgRole, User> users;
-	public static volatile ListAttribute<OrgRole, OrgRole> parents;
-	public static volatile ListAttribute<OrgRole, OrgRole> children;
-	public static volatile SingularAttribute<OrgRole, EventOrganiser> eventOrganisation;
-	public static volatile SingularAttribute<OrgRole, Boolean> manageOrganisation;
-	public static volatile ListAttribute<OrgRole, Role> eventRoles;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.094+0300")
+@StaticMetamodel(OrgRole.class)
+public class OrgRole_ extends GenericEntity_ {
+	public static volatile SingularAttribute<OrgRole, String> name;
+	public static volatile ListAttribute<OrgRole, User> users;
+	public static volatile ListAttribute<OrgRole, OrgRole> parents;
+	public static volatile ListAttribute<OrgRole, OrgRole> children;
+	public static volatile SingularAttribute<OrgRole, EventOrganiser> eventOrganisation;
+	public static volatile SingularAttribute<OrgRole, Boolean> manageOrganisation;
+	public static volatile ListAttribute<OrgRole, Role> eventRoles;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.094+0300")
-@StaticMetamodel(PageContent.class)
-public class PageContent_ extends GenericEntity_ {
-	public static volatile SingularAttribute<PageContent, SitePage> sitepage;
-	public static volatile SingularAttribute<PageContent, Integer> sort;
-	public static volatile SingularAttribute<PageContent, String> content;
-	public static volatile SingularAttribute<PageContent, Date> publish;
-	public static volatile SingularAttribute<PageContent, Date> expire;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.106+0300")
+@StaticMetamodel(PageContent.class)
+public class PageContent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PageContent, SitePage> sitepage;
+	public static volatile SingularAttribute<PageContent, Integer> sort;
+	public static volatile SingularAttribute<PageContent, String> content;
+	public static volatile SingularAttribute<PageContent, Date> publish;
+	public static volatile SingularAttribute<PageContent, Date> expire;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.226+0300")
-@StaticMetamodel(PlaceGroup.class)
-public class PlaceGroup_ extends GenericEntity_ {
-	public static volatile SingularAttribute<PlaceGroup, Calendar> created;
-	public static volatile SingularAttribute<PlaceGroup, LanEvent> event;
-	public static volatile SingularAttribute<PlaceGroup, Calendar> edited;
-	public static volatile SingularAttribute<PlaceGroup, String> code;
-	public static volatile SingularAttribute<PlaceGroup, String> name;
-	public static volatile SingularAttribute<PlaceGroup, Boolean> active;
-	public static volatile SingularAttribute<PlaceGroup, String> details;
-	public static volatile SingularAttribute<PlaceGroup, EventUser> creator;
-	public static volatile ListAttribute<PlaceGroup, GroupMembership> members;
-	public static volatile ListAttribute<PlaceGroup, Place> places;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.130+0300")
+@StaticMetamodel(PlaceGroup.class)
+public class PlaceGroup_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PlaceGroup, Calendar> created;
+	public static volatile SingularAttribute<PlaceGroup, LanEvent> event;
+	public static volatile SingularAttribute<PlaceGroup, Calendar> edited;
+	public static volatile SingularAttribute<PlaceGroup, String> code;
+	public static volatile SingularAttribute<PlaceGroup, String> name;
+	public static volatile SingularAttribute<PlaceGroup, Boolean> active;
+	public static volatile SingularAttribute<PlaceGroup, String> details;
+	public static volatile SingularAttribute<PlaceGroup, EventUser> creator;
+	public static volatile ListAttribute<PlaceGroup, GroupMembership> members;
+	public static volatile ListAttribute<PlaceGroup, Place> places;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.203+0300")
-@StaticMetamodel(Place.class)
-public class Place_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Place, String> description;
-	public static volatile SingularAttribute<Place, String> name;
-	public static volatile SingularAttribute<Place, Integer> mapX;
-	public static volatile SingularAttribute<Place, Integer> mapY;
-	public static volatile SingularAttribute<Place, Integer> width;
-	public static volatile SingularAttribute<Place, Integer> height;
-	public static volatile SingularAttribute<Place, Calendar> releaseTime;
-	public static volatile SingularAttribute<Place, String> details;
-	public static volatile SingularAttribute<Place, String> code;
-	public static volatile SingularAttribute<Place, GroupMembership> placeReserver;
-	public static volatile SingularAttribute<Place, Boolean> buyable;
-	public static volatile SingularAttribute<Place, Boolean> disabled;
-	public static volatile SingularAttribute<Place, PlaceGroup> group;
-	public static volatile SingularAttribute<Place, Role> providesRole;
-	public static volatile SingularAttribute<Place, EventMap> map;
-	public static volatile SingularAttribute<Place, Product> product;
-	public static volatile SingularAttribute<Place, EventUser> currentUser;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.117+0300")
+@StaticMetamodel(Place.class)
+public class Place_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Place, String> description;
+	public static volatile SingularAttribute<Place, String> name;
+	public static volatile SingularAttribute<Place, Integer> mapX;
+	public static volatile SingularAttribute<Place, Integer> mapY;
+	public static volatile SingularAttribute<Place, Integer> width;
+	public static volatile SingularAttribute<Place, Integer> height;
+	public static volatile SingularAttribute<Place, Calendar> releaseTime;
+	public static volatile SingularAttribute<Place, String> details;
+	public static volatile SingularAttribute<Place, String> code;
+	public static volatile SingularAttribute<Place, GroupMembership> placeReserver;
+	public static volatile SingularAttribute<Place, Boolean> buyable;
+	public static volatile SingularAttribute<Place, Boolean> disabled;
+	public static volatile SingularAttribute<Place, PlaceGroup> group;
+	public static volatile SingularAttribute<Place, Role> providesRole;
+	public static volatile SingularAttribute<Place, EventMap> map;
+	public static volatile SingularAttribute<Place, Product> product;
+	public static volatile SingularAttribute<Place, EventUser> currentUser;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.247+0300")
-@StaticMetamodel(PollAnswer.class)
-public class PollAnswer_ extends GenericEntity_ {
-	public static volatile SingularAttribute<PollAnswer, String> answerText;
-	public static volatile SingularAttribute<PollAnswer, Boolean> answerBoolean;
-	public static volatile SingularAttribute<PollAnswer, PossibleAnswer> choice;
-	public static volatile SingularAttribute<PollAnswer, EventUser> user;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.174+0300")
+@StaticMetamodel(PollAnswer.class)
+public class PollAnswer_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PollAnswer, String> answerText;
+	public static volatile SingularAttribute<PollAnswer, Boolean> answerBoolean;
+	public static volatile SingularAttribute<PollAnswer, PossibleAnswer> choice;
+	public static volatile SingularAttribute<PollAnswer, EventUser> user;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.104+0300")
-@StaticMetamodel(PollQuestion.class)
-public class PollQuestion_ extends GenericEntity_ {
-	public static volatile SingularAttribute<PollQuestion, Integer> characters;
-	public static volatile SingularAttribute<PollQuestion, Poll> poll;
-	public static volatile ListAttribute<PollQuestion, PossibleAnswer> answers;
-	public static volatile SingularAttribute<PollQuestion, String> question;
-	public static volatile SingularAttribute<PollQuestion, Integer> choices;
-	public static volatile SingularAttribute<PollQuestion, Integer> sort;
-	public static volatile SingularAttribute<PollQuestion, Integer> page;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.185+0300")
+@StaticMetamodel(PollQuestion.class)
+public class PollQuestion_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PollQuestion, Integer> characters;
+	public static volatile SingularAttribute<PollQuestion, Poll> poll;
+	public static volatile ListAttribute<PollQuestion, PossibleAnswer> answers;
+	public static volatile SingularAttribute<PollQuestion, String> question;
+	public static volatile SingularAttribute<PollQuestion, Integer> choices;
+	public static volatile SingularAttribute<PollQuestion, Integer> sort;
+	public static volatile SingularAttribute<PollQuestion, Integer> page;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.100+0300")
-@StaticMetamodel(Poll.class)
-public class Poll_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Poll, LanEvent> event;
-	public static volatile SingularAttribute<Poll, Date> begin;
-	public static volatile SingularAttribute<Poll, Date> end;
-	public static volatile SingularAttribute<Poll, String> name;
-	public static volatile SingularAttribute<Poll, String> description;
-	public static volatile ListAttribute<Poll, PollQuestion> questions;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.144+0300")
+@StaticMetamodel(Poll.class)
+public class Poll_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Poll, LanEvent> event;
+	public static volatile SingularAttribute<Poll, Date> begin;
+	public static volatile SingularAttribute<Poll, Date> end;
+	public static volatile SingularAttribute<Poll, String> name;
+	public static volatile SingularAttribute<Poll, String> description;
+	public static volatile ListAttribute<Poll, PollQuestion> questions;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-12T14:43:39.106+0300")
-@StaticMetamodel(PossibleAnswer.class)
-public class PossibleAnswer_ extends GenericEntity_ {
-	public static volatile SingularAttribute<PossibleAnswer, String> answer;
-	public static volatile SingularAttribute<PossibleAnswer, Integer> sort;
-	public static volatile SingularAttribute<PossibleAnswer, Boolean> textanswer;
-	public static volatile SingularAttribute<PossibleAnswer, String> description;
-	public static volatile SingularAttribute<PossibleAnswer, PollQuestion> question;
-	public static volatile ListAttribute<PossibleAnswer, PollAnswer> answers;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.198+0300")
+@StaticMetamodel(PossibleAnswer.class)
+public class PossibleAnswer_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PossibleAnswer, String> answer;
+	public static volatile SingularAttribute<PossibleAnswer, Integer> sort;
+	public static volatile SingularAttribute<PossibleAnswer, Boolean> textanswer;
+	public static volatile SingularAttribute<PossibleAnswer, String> description;
+	public static volatile SingularAttribute<PossibleAnswer, PollQuestion> question;
+	public static volatile ListAttribute<PossibleAnswer, PollAnswer> answers;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-18T08:56:10.935+0300")
-@StaticMetamodel(PrintedCard.class)
-public class PrintedCard_ extends GenericEntity_ {
-	public static volatile SingularAttribute<PrintedCard, LanEvent> event;
-	public static volatile SingularAttribute<PrintedCard, Calendar> printTime;
-	public static volatile SingularAttribute<PrintedCard, String> barcode;
-	public static volatile SingularAttribute<PrintedCard, Boolean> enabled;
-	public static volatile SingularAttribute<PrintedCard, String> rfidUid;
-	public static volatile ListAttribute<PrintedCard, ReaderEvent> readerEvents;
-	public static volatile SingularAttribute<PrintedCard, Integer> printCount;
-	public static volatile SingularAttribute<PrintedCard, Location> currentLocation;
-	public static volatile SingularAttribute<PrintedCard, EventUser> user;
-	public static volatile SingularAttribute<PrintedCard, CardTemplate> template;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.210+0300")
+@StaticMetamodel(PrintedCard.class)
+public class PrintedCard_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PrintedCard, LanEvent> event;
+	public static volatile SingularAttribute<PrintedCard, Calendar> printTime;
+	public static volatile SingularAttribute<PrintedCard, String> barcode;
+	public static volatile SingularAttribute<PrintedCard, Boolean> enabled;
+	public static volatile SingularAttribute<PrintedCard, String> rfidUid;
+	public static volatile ListAttribute<PrintedCard, ReaderEvent> readerEvents;
+	public static volatile SingularAttribute<PrintedCard, Integer> printCount;
+	public static volatile SingularAttribute<PrintedCard, Location> currentLocation;
+	public static volatile SingularAttribute<PrintedCard, EventUser> user;
+	public static volatile SingularAttribute<PrintedCard, CardTemplate> template;
+}

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

@@ -2,7 +2,7 @@ package fi.insomnia.bortal.model;
 
 
 public enum ProductFlag {
 public enum ProductFlag {
 
 
-    FOODWAVE_ITEM,
+    // FOODWAVE_ITEM, Äy... Ei kai tämän täällä tarvitse olla....
     PREPAID_CREDIT,
     PREPAID_CREDIT,
     CREATE_NEW_PLACE_WHEN_BOUGHT,
     CREATE_NEW_PLACE_WHEN_BOUGHT,
     RESERVE_PLACE_WHEN_BOUGHT,
     RESERVE_PLACE_WHEN_BOUGHT,

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

-package fi.insomnia.bortal.model;
-
-import java.math.BigDecimal;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-09-05T23:16:12.829+0300")
-@StaticMetamodel(ProductLimitation.class)
-public class ProductLimitation_ extends GenericEntity_ {
-	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
-	public static volatile SingularAttribute<ProductLimitation, Boolean> last;
-	public static volatile SingularAttribute<ProductLimitation, String> name;
-	public static volatile SingularAttribute<ProductLimitation, String> description;
-	public static volatile SingularAttribute<ProductLimitation, Integer> sort;
-	public static volatile ListAttribute<ProductLimitation, Product> products;
-	public static volatile SingularAttribute<ProductLimitation, BigDecimal> upperLimit;
-	public static volatile SingularAttribute<ProductLimitation, BigDecimal> lowerLimit;
-	public static volatile ListAttribute<ProductLimitation, Role> matchingRoles;
-}
+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.243+0300")
+@StaticMetamodel(ProductLimitation.class)
+public class ProductLimitation_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
+	public static volatile SingularAttribute<ProductLimitation, Boolean> last;
+	public static volatile SingularAttribute<ProductLimitation, String> name;
+	public static volatile SingularAttribute<ProductLimitation, String> description;
+	public static volatile SingularAttribute<ProductLimitation, Integer> sort;
+	public static volatile ListAttribute<ProductLimitation, Product> products;
+	public static volatile SingularAttribute<ProductLimitation, BigDecimal> upperLimit;
+	public static volatile SingularAttribute<ProductLimitation, BigDecimal> lowerLimit;
+	public static volatile ListAttribute<ProductLimitation, Role> matchingRoles;
+}

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T04:12:09.351+0300")
+@Generated(value="Dali", date="2012-10-06T04:04:21.088+0300")
 @StaticMetamodel(Product.class)
 @StaticMetamodel(Product.class)
 public class Product_ extends GenericEntity_ {
 public class Product_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Product, LanEvent> event;
 	public static volatile SingularAttribute<Product, LanEvent> event;
@@ -19,10 +19,10 @@ public class Product_ extends GenericEntity_ {
 	public static volatile SetAttribute<Product, ProductFlag> productFlags;
 	public static volatile SetAttribute<Product, ProductFlag> productFlags;
 	public static volatile SingularAttribute<Product, Role> provides;
 	public static volatile SingularAttribute<Product, Role> provides;
 	public static volatile ListAttribute<Product, Place> places;
 	public static volatile ListAttribute<Product, Place> places;
-	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 	public static volatile ListAttribute<Product, AccountEvent> accountEvents;
 	public static volatile ListAttribute<Product, AccountEvent> accountEvents;
 	public static volatile ListAttribute<Product, Discount> discounts;
 	public static volatile ListAttribute<Product, Discount> discounts;
 	public static volatile SingularAttribute<Product, BigDecimal> vat;
 	public static volatile SingularAttribute<Product, BigDecimal> vat;
 	public static volatile SingularAttribute<Product, String> unitName;
 	public static volatile SingularAttribute<Product, String> unitName;
 	public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
 	public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
+	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 }
 }

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-18T08:56:10.951+0300")
-@StaticMetamodel(ReaderEvent.class)
-public class ReaderEvent_ extends GenericEntity_ {
-	public static volatile SingularAttribute<ReaderEvent, Calendar> time;
-	public static volatile SingularAttribute<ReaderEvent, Calendar> updatetime;
-	public static volatile SingularAttribute<ReaderEvent, String> value;
-	public static volatile SingularAttribute<ReaderEvent, String> notes;
-	public static volatile SingularAttribute<ReaderEvent, Integer> gamePoint;
-	public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
-	public static volatile SingularAttribute<ReaderEvent, Reader> reader;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.270+0300")
+@StaticMetamodel(ReaderEvent.class)
+public class ReaderEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ReaderEvent, Calendar> time;
+	public static volatile SingularAttribute<ReaderEvent, Calendar> updatetime;
+	public static volatile SingularAttribute<ReaderEvent, String> value;
+	public static volatile SingularAttribute<ReaderEvent, String> notes;
+	public static volatile SingularAttribute<ReaderEvent, Integer> gamePoint;
+	public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
+	public static volatile SingularAttribute<ReaderEvent, Reader> reader;
+}

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

@@ -6,10 +6,9 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.StaticMetamodel;
 
 
-@Generated(value="Dali", date="2012-10-06T04:12:09.369+0300")
+@Generated(value="Dali", date="2012-10-06T04:04:21.120+0300")
 @StaticMetamodel(Reader.class)
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
 public class Reader_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Reader, ReaderType> type;
 	public static volatile SingularAttribute<Reader, LanEvent> event;
 	public static volatile SingularAttribute<Reader, LanEvent> event;
 	public static volatile SingularAttribute<Reader, Integer> gamepoints;
 	public static volatile SingularAttribute<Reader, Integer> gamepoints;
 	public static volatile SingularAttribute<Reader, Integer> maxEvents;
 	public static volatile SingularAttribute<Reader, Integer> maxEvents;
@@ -21,4 +20,5 @@ public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, Integer> mapX;
 	public static volatile SingularAttribute<Reader, Integer> mapX;
 	public static volatile SingularAttribute<Reader, Integer> mapY;
 	public static volatile SingularAttribute<Reader, Integer> mapY;
 	public static volatile ListAttribute<Reader, ReaderEvent> events;
 	public static volatile ListAttribute<Reader, ReaderEvent> events;
+	public static volatile SingularAttribute<Reader, ReaderType> type;
 }
 }

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:58:22.632+0300")
-@StaticMetamodel(Role.class)
-public class Role_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Role, String> name;
-	public static volatile ListAttribute<Role, EventUser> users;
-	public static volatile ListAttribute<Role, Role> children;
-	public static volatile ListAttribute<Role, Product> productsProvide;
-	public static volatile ListAttribute<Role, Place> placesProvide;
-	public static volatile ListAttribute<Role, Role> parents;
-	public static volatile ListAttribute<Role, ApplicationPermission> permissions;
-	public static volatile SingularAttribute<Role, CardTemplate> cardTemplate;
-	public static volatile ListAttribute<Role, Discount> discounts;
-	public static volatile ListAttribute<Role, NewsGroup> writeNews;
-	public static volatile ListAttribute<Role, NewsGroup> newsGroups;
-	public static volatile SingularAttribute<Role, LanEvent> event;
-	public static volatile ListAttribute<Role, OrgRole> orgRoles;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.287+0300")
+@StaticMetamodel(Role.class)
+public class Role_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Role, String> name;
+	public static volatile ListAttribute<Role, EventUser> users;
+	public static volatile ListAttribute<Role, Role> children;
+	public static volatile ListAttribute<Role, Product> productsProvide;
+	public static volatile ListAttribute<Role, Place> placesProvide;
+	public static volatile ListAttribute<Role, Role> parents;
+	public static volatile ListAttribute<Role, ApplicationPermission> permissions;
+	public static volatile SingularAttribute<Role, CardTemplate> cardTemplate;
+	public static volatile ListAttribute<Role, Discount> discounts;
+	public static volatile ListAttribute<Role, NewsGroup> writeNews;
+	public static volatile ListAttribute<Role, NewsGroup> newsGroups;
+	public static volatile SingularAttribute<Role, LanEvent> event;
+	public static volatile ListAttribute<Role, OrgRole> orgRoles;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-10-04T21:02:39.749+0300")
-@StaticMetamodel(SitePage.class)
-public class SitePage_ extends GenericEntity_ {
-	public static volatile SingularAttribute<SitePage, LanEvent> event;
-	public static volatile SingularAttribute<SitePage, String> name;
-	public static volatile SingularAttribute<SitePage, SitePage> parent;
-	public static volatile ListAttribute<SitePage, Role> allowedRoles;
-	public static volatile ListAttribute<SitePage, SitePage> children;
-	public static volatile ListAttribute<SitePage, PageContent> contents;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.321+0300")
+@StaticMetamodel(SitePage.class)
+public class SitePage_ extends GenericEntity_ {
+	public static volatile SingularAttribute<SitePage, LanEvent> event;
+	public static volatile SingularAttribute<SitePage, String> name;
+	public static volatile SingularAttribute<SitePage, SitePage> parent;
+	public static volatile ListAttribute<SitePage, Role> allowedRoles;
+	public static volatile ListAttribute<SitePage, SitePage> children;
+	public static volatile ListAttribute<SitePage, PageContent> contents;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-08-22T04:39:06.347+0300")
-@StaticMetamodel(UserImage.class)
-public class UserImage_ extends GenericEntity_ {
-	public static volatile SingularAttribute<UserImage, Calendar> uploaded;
-	public static volatile SingularAttribute<UserImage, String> name;
-	public static volatile SingularAttribute<UserImage, String> description;
-	public static volatile SingularAttribute<UserImage, String> mimeType;
-	public static volatile SingularAttribute<UserImage, byte[]> imageData;
-	public static volatile SingularAttribute<UserImage, User> user;
-	public static volatile SingularAttribute<UserImage, User> defaultImage;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.349+0300")
+@StaticMetamodel(UserImage.class)
+public class UserImage_ extends GenericEntity_ {
+	public static volatile SingularAttribute<UserImage, Calendar> uploaded;
+	public static volatile SingularAttribute<UserImage, String> name;
+	public static volatile SingularAttribute<UserImage, String> description;
+	public static volatile SingularAttribute<UserImage, String> mimeType;
+	public static volatile SingularAttribute<UserImage, byte[]> imageData;
+	public static volatile SingularAttribute<UserImage, User> user;
+	public static volatile SingularAttribute<UserImage, User> defaultImage;
+}

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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.346+0300")
-@StaticMetamodel(UserNote.class)
-public class UserNote_ extends GenericEntity_ {
-	public static volatile SingularAttribute<UserNote, EventUser> user;
-	public static volatile SingularAttribute<UserNote, String> content;
-	public static volatile SingularAttribute<UserNote, UserNoteType> notetype;
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.362+0300")
+@StaticMetamodel(UserNote.class)
+public class UserNote_ extends GenericEntity_ {
+	public static volatile SingularAttribute<UserNote, EventUser> user;
+	public static volatile SingularAttribute<UserNote, String> content;
+	public static volatile SingularAttribute<UserNote, UserNoteType> notetype;
+}

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

-package fi.insomnia.bortal.model;
-
-import fi.insomnia.bortal.enums.Gender;
-import java.util.Calendar;
-import java.util.Date;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-09-09T04:13:51.037+0300")
-@StaticMetamodel(User.class)
-public class User_ extends GenericEntity_ {
-	public static volatile SingularAttribute<User, Calendar> created;
-	public static volatile SingularAttribute<User, String> login;
-	public static volatile SingularAttribute<User, Boolean> active;
-	public static volatile SingularAttribute<User, String> password;
-	public static volatile SingularAttribute<User, String> lastname;
-	public static volatile SingularAttribute<User, String> firstnames;
-	public static volatile SingularAttribute<User, Date> birthday;
-	public static volatile SingularAttribute<User, String> nick;
-	public static volatile SingularAttribute<User, String> email;
-	public static volatile SingularAttribute<User, String> address;
-	public static volatile SingularAttribute<User, String> zip;
-	public static volatile SingularAttribute<User, String> postalTown;
-	public static volatile SingularAttribute<User, String> town;
-	public static volatile SingularAttribute<User, String> phone;
-	public static volatile SingularAttribute<User, UserImage> currentImage;
-	public static volatile SingularAttribute<User, Gender> gender;
-	public static volatile SingularAttribute<User, String> confirmHash;
-	public static volatile SingularAttribute<User, Calendar> confirmTime;
-	public static volatile SingularAttribute<User, Boolean> superadmin;
-	public static volatile ListAttribute<User, UserImage> userImageList;
-}
+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.Gender;
+import java.util.Calendar;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.338+0300")
+@StaticMetamodel(User.class)
+public class User_ extends GenericEntity_ {
+	public static volatile SingularAttribute<User, Calendar> created;
+	public static volatile SingularAttribute<User, String> login;
+	public static volatile SingularAttribute<User, Boolean> active;
+	public static volatile SingularAttribute<User, String> password;
+	public static volatile SingularAttribute<User, String> lastname;
+	public static volatile SingularAttribute<User, String> firstnames;
+	public static volatile SingularAttribute<User, Date> birthday;
+	public static volatile SingularAttribute<User, String> nick;
+	public static volatile SingularAttribute<User, String> email;
+	public static volatile SingularAttribute<User, String> address;
+	public static volatile SingularAttribute<User, String> zip;
+	public static volatile SingularAttribute<User, String> postalTown;
+	public static volatile SingularAttribute<User, String> town;
+	public static volatile SingularAttribute<User, String> phone;
+	public static volatile SingularAttribute<User, UserImage> currentImage;
+	public static volatile SingularAttribute<User, Gender> gender;
+	public static volatile SingularAttribute<User, String> confirmHash;
+	public static volatile SingularAttribute<User, Calendar> confirmTime;
+	public static volatile SingularAttribute<User, Boolean> superadmin;
+	public static volatile ListAttribute<User, UserImage> userImageList;
+}

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

-package fi.insomnia.bortal.model;
-
-import java.util.Calendar;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-05-13T00:35:53.366+0300")
-@StaticMetamodel(Vote.class)
-public class Vote_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Vote, Integer> score;
-	public static volatile SingularAttribute<Vote, String> message;
-	public static volatile SingularAttribute<Vote, Calendar> time;
-	public static volatile SingularAttribute<Vote, CompoEntry> compoEntry;
-	public static volatile SingularAttribute<Vote, EventUser> voter;
-}
+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.372+0300")
+@StaticMetamodel(Vote.class)
+public class Vote_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Vote, Integer> score;
+	public static volatile SingularAttribute<Vote, String> message;
+	public static volatile SingularAttribute<Vote, Calendar> time;
+	public static volatile SingularAttribute<Vote, CompoEntry> compoEntry;
+	public static volatile SingularAttribute<Vote, EventUser> voter;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java

-package fi.insomnia.bortal.model.salespoint;
-
-import fi.insomnia.bortal.model.GenericEntity_;
-import fi.insomnia.bortal.model.Reader;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-04-08T13:33:11.092+0300")
-@StaticMetamodel(SalesEntity.class)
-public class SalesEntity_ extends GenericEntity_ {
-	public static volatile SingularAttribute<SalesEntity, String> certificate;
-	public static volatile SingularAttribute<SalesEntity, String> name;
-	public static volatile SingularAttribute<SalesEntity, String> secret;
-	public static volatile SingularAttribute<SalesEntity, SalesEntityType> type;
-	public static volatile SingularAttribute<SalesEntity, Reader> reader;
-	public static volatile SingularAttribute<SalesEntity, Salespoint> point;
-}
+package fi.insomnia.bortal.model.salespoint;
+
+import fi.insomnia.bortal.model.GenericEntity_;
+import fi.insomnia.bortal.model.Reader;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.296+0300")
+@StaticMetamodel(SalesEntity.class)
+public class SalesEntity_ extends GenericEntity_ {
+	public static volatile SingularAttribute<SalesEntity, String> certificate;
+	public static volatile SingularAttribute<SalesEntity, String> name;
+	public static volatile SingularAttribute<SalesEntity, String> secret;
+	public static volatile SingularAttribute<SalesEntity, SalesEntityType> type;
+	public static volatile SingularAttribute<SalesEntity, Reader> reader;
+	public static volatile SingularAttribute<SalesEntity, Salespoint> point;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java

-package fi.insomnia.bortal.model.salespoint;
-
-import fi.insomnia.bortal.model.GenericEntity_;
-import fi.insomnia.bortal.model.LanEvent;
-import javax.annotation.Generated;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-04-06T18:38:59.377+0300")
-@StaticMetamodel(Salespoint.class)
-public class Salespoint_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Salespoint, LanEvent> event;
-	public static volatile SingularAttribute<Salespoint, String> name;
-	public static volatile SingularAttribute<Salespoint, String> description;
-	public static volatile ListAttribute<Salespoint, SalesEntity> entities;
-}
+package fi.insomnia.bortal.model.salespoint;
+
+import fi.insomnia.bortal.model.GenericEntity_;
+import fi.insomnia.bortal.model.LanEvent;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T21:16:01.311+0300")
+@StaticMetamodel(Salespoint.class)
+public class Salespoint_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Salespoint, LanEvent> event;
+	public static volatile SingularAttribute<Salespoint, String> name;
+	public static volatile SingularAttribute<Salespoint, String> description;
+	public static volatile ListAttribute<Salespoint, SalesEntity> entities;
+}

code/LanBortalUtilities/src/fi/insomnia/bortal/enums/apps/ShopPermission.java

@@ -9,6 +9,7 @@ public enum ShopPermission implements IAppPermission {
 	SHOP_TO_OTHERS, // ("Shop to other users"),
 	SHOP_TO_OTHERS, // ("Shop to other users"),
 	SHOP_PRODUCTS, // ("Shop products to self"),
 	SHOP_PRODUCTS, // ("Shop products to self"),
 	MANAGE_PRODUCTS, // ("Create and modify products"),
 	MANAGE_PRODUCTS, // ("Create and modify products"),
+	SHOP_FOODWAVE, // Shop for food
 
 
 	;
 	;
 
 
@@ -17,6 +18,7 @@ public enum ShopPermission implements IAppPermission {
 	public static final String S_SHOP_TO_OTHERS = "SHOP/SHOP_TO_OTHERS";
 	public static final String S_SHOP_TO_OTHERS = "SHOP/SHOP_TO_OTHERS";
 	public static final String S_SHOP_PRODUCTS = "SHOP/SHOP_PRODUCTS";
 	public static final String S_SHOP_PRODUCTS = "SHOP/SHOP_PRODUCTS";
 	public static final String S_MANAGE_PRODUCTS = "SHOP/MANAGE_PRODUCTS";
 	public static final String S_MANAGE_PRODUCTS = "SHOP/MANAGE_PRODUCTS";
+	public static final String S_SHOP_FOODWAVE = "SHOP/SHOP_FOODWAVE";
 
 
 	private final String fullName;
 	private final String fullName;
 	private final String key;
 	private final String key;

code/LanBortalWeb/WebContent/foodadmin/edit.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{foodWaveView.initEditTemplate()}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['foodwave.template.edit.title']}</h1>
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form>
+				<h:panelGrid columns="3">
+					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
+					<h:inputText id="name" value="#{foodWaveView.template.name}" />
+					<h:message for="name" />
+
+				</h:panelGrid>
+				<h:inputTextarea value="#{foodWaveView.template.description}" />
+				<h:commanButton action="#{foodWaveView.saveTemplate()}" value="#{i18n['foowavetemplate.save']}" />
+				<h:commandButton action="#{foodWaveView.createFoodwave()}" value="#{i18n['foodwavetemplate.createFoodwave']}" />
+			</h:form>
+			<ui:fragment  >
+				
+
+			</ui:fragment>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodadmin/list.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList()}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['foodwave.template.list.title']}</h1>
+		</ui:define>
+
+		<ui:define name="content">
+
+			<h:dataTable var="templ" value="#{foodWaveView.templates}">
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="#{i18n['foodwaveTemplate.name']}" />
+					</f:facet>
+					<h:outputText value="#{templ.name}" />
+				</h:column>
+				<h:column>
+					<h:link outcome="/foodadmin/editTemplate">
+						<f:param value="#{templ.id}" />
+					</h:link>
+				</h:column>
+			</h:dataTable>
+
+		</ui:define>
+
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/layout/insomnia2/template.xhtml

@@ -12,6 +12,8 @@
 		<meta http-equiv="Content-Language" content="fi" />
 		<meta http-equiv="Content-Language" content="fi" />
 
 
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" />
+		<!-- general style for nonlayout elements -->
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/general.css" />
 		<ui:insert name="headerdata" />
 		<ui:insert name="headerdata" />
 		<h:outputScript name="prime_calendar.js" library="script" />
 		<h:outputScript name="prime_calendar.js" library="script" />
 	</h:head>
 	</h:head>

code/LanBortalWeb/WebContent/layout/template1/template.xhtml

@@ -14,6 +14,7 @@
 		<meta http-equiv="Content-Language" content="fi" />
 		<meta http-equiv="Content-Language" content="fi" />
 
 
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/style.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/style.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/general.css" />
 		<ui:insert name="headerdata" />
 		<ui:insert name="headerdata" />
 
 
 	</h:head>
 	</h:head>

code/LanBortalWeb/WebContent/place/adminGroups.xhtml

@@ -50,7 +50,7 @@
 					</h:column>
 					</h:column>
 
 
 					<h:column>
 					<h:column>
-						<h:commandButton rendered="#{placeGroupView.canModify(member) and !empty member.user}"
+						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}"
 							action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}"
 							action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}"
 						/>
 						/>
 					</h:column>
 					</h:column>

code/LanBortalWeb/WebContent/place/edit.xhtml

@@ -15,8 +15,6 @@
 		<ui:define name="content">
 		<ui:define name="content">
 			<h1>#{i18n['editplace.header']}</h1>
 			<h1>#{i18n['editplace.header']}</h1>
 
 
-			<h1>edit:</h1>
-
 			<h:form id="placeEdit">
 			<h:form id="placeEdit">
 				<h:panelGrid columns="2">
 				<h:panelGrid columns="2">
 					<h:outputLabel value="#{i18n['place.name']}:" />
 					<h:outputLabel value="#{i18n['place.name']}:" />
@@ -107,7 +105,7 @@
 				</h:dataTable>
 				</h:dataTable>
 			</h:form>
 			</h:form>
 
 
-			<h:form rendered="#{!empty placeView.place.group and not placeView.place.group.places.empty">
+			<h:form rendered="#{!empty placeView.place.group and !empty placeView.place.group.places}">
 				<h:panelGrid columns="2">
 				<h:panelGrid columns="2">
 					<h:outputLabel value="#{i18n['placegroup.name']}:" />
 					<h:outputLabel value="#{i18n['placegroup.name']}:" />
 					<h:inputText value="#{placeView.place.group.name}" />
 					<h:inputText value="#{placeView.place.group.name}" />
@@ -127,7 +125,7 @@
 					
 					
 					<h:outputLabel value="#{i18n['placegroup.creator']}" />
 					<h:outputLabel value="#{i18n['placegroup.creator']}" />
 					<h:link outcome="/useradmin/edit" value="#{placeView.place.group.creator.wholeName}" >
 					<h:link outcome="/useradmin/edit" value="#{placeView.place.group.creator.wholeName}" >
-						<f:param name="userid" value="#{placeView.place.group.creator.id}"/>
+						<f:param name="userid" value="#{placeView.place.group.creator.user.id}"/>
 					</h:link>
 					</h:link>
 				</h:panelGrid>
 				</h:panelGrid>
 
 

code/LanBortalWeb/WebContent/place/myGroups.xhtml

@@ -49,7 +49,7 @@
 					</h:column>
 					</h:column>
 
 
 					<h:column>
 					<h:column>
-						<h:commandButton rendered="#{placeGroupView.canModify(member) and !empty member.user}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
+						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
 					</h:column>
 					</h:column>
 
 
 				</h:dataTable>
 				</h:dataTable>

code/LanBortalWeb/WebContent/resources/cditools/login/login.xhtml

@@ -18,7 +18,7 @@
 			<c:when test="#{not empty cc.attrs.isOneliner}">
 			<c:when test="#{not empty cc.attrs.isOneliner}">
 				<h:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
 				<h:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
 				<h:inputSecret styleClass="form" id="linepwd" value="#{authView.password}" />
 				<h:inputSecret styleClass="form" id="linepwd" value="#{authView.password}" />
-				<h:commandButton styleClass="button" id="onelinesubmit" action="#{authView.executeLogin()}" value="#{i18n['login.submit']}" />
+				<h:commandButton styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" value="#{i18n['login.submit']}" />
 
 
 			</c:when>
 			</c:when>
 			<c:otherwise>
 			<c:otherwise>

code/LanBortalWeb/WebContent/resources/cditools/products/shop.xhtml

@@ -54,7 +54,7 @@
 			</h:commandButton>
 			</h:commandButton>
 			<h:inputText size="4" id="cartcount" value="#{cart.count}">
 			<h:inputText size="4" id="cartcount" value="#{cart.count}">
 				<f:convertNumber  maxIntegerDigits="2" minFractionDigits="0"/>
 				<f:convertNumber  maxIntegerDigits="2" minFractionDigits="0"/>
-				<f:ajax render="@form" event="valueChange" listener="#{productShopView.updateCartLimits}"/>
+				<f:ajax render="@form" event="valueChange" listener="#{productShopView.updateAllCartLimits()}"/>
 			</h:inputText>
 			</h:inputText>
 			<h:commandButton action="#{productShopView.addOne}" value="#{i18n['productshop.plusOne']}">
 			<h:commandButton action="#{productShopView.addOne}" value="#{i18n['productshop.plusOne']}">
 				<f:ajax render="@form" />
 				<f:ajax render="@form" />

code/LanBortalWeb/WebContent/resources/cditools/role/edit.xhtml

@@ -16,7 +16,7 @@
 				<h:outputText value="#{i18n['nasty.user']}" />
 				<h:outputText value="#{i18n['nasty.user']}" />
 			</f:facet>
 			</f:facet>
 			<ui:include src="form.xhtml" />
 			<ui:include src="form.xhtml" />
-			<h:commandButton rendered="#{roleView.canWriteRoles()}" id="saverole" value="#{i18n['roleView.save']}" action="#{roleView.save}" />
+			<h:commandButton rendered="#{roleView.canWriteRoles}" id="saverole" value="#{i18n['roleView.save']}" action="#{roleView.save}" />
 		</h:form>
 		</h:form>
 	</p>
 	</p>
 
 

code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml

@@ -7,35 +7,33 @@
 </composite:interface>
 </composite:interface>
 
 
 <composite:implementation>
 <composite:implementation>
+<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
 	<h:dataTable styleClass="bordertable" id="user" value="#{userSearchView.results}" var="user">
 	<h:dataTable styleClass="bordertable" id="user" value="#{userSearchView.results}" var="user">
 		<h:column>
 		<h:column>
 			<f:facet name="header">
 			<f:facet name="header">
-				<h:link value="ID" includeViewParams="true">
-					<f:param name="sort" value="id" />
-					<f:param name="page" value="0" />
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.id}" />
-		</h:column>
-		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.login']}" includeViewParams="true">
-					<f:param name="sort" value="login" />
-					<f:param name="page" value="0" />
-
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.login}" />
-		</h:column>
-		<h:column>
-			<f:facet name="header">
 				<h:link value="#{i18n['user.nick']}" includeViewParams="true">
 				<h:link value="#{i18n['user.nick']}" includeViewParams="true">
 					<f:param name="sort" value="nick" />
 					<f:param name="sort" value="nick" />
 					<f:param name="page" value="0" />
 					<f:param name="page" value="0" />
-
 				</h:link>
 				</h:link>
 			</f:facet>
 			</f:facet>
-			<h:outputText value="#{user.nick}" />
+			<h:outputText styleClass="hoverable" value="#{(empty user.nick)?'----':user.nick}" />
+			<div class="userdata_popup">
+		<h:panelGrid columns="2">
+			<img style="width:100px;" src="#{request.contextPath}/dydata/userimage/#{user.currentImage.id}.img" alt="image" />
+
+			<h:panelGroup>
+			<h:outputText value="#{user.nick}"/> <br />
+			<h:outputText value="#{user.firstnames} #{user.lastname}"/> <br />
+			<hr />
+			<h:outputText value="#{user.address}"/> <br />
+			<h:outputText value="#{user.zip} #{user.postalTown}"/> <br />
+			<br />
+			<h:outputText value="#{user.phone}"/> <br />
+			<h:outputText value="#{user.email}"/> <br />
+			</h:panelGroup>
+			</h:panelGrid>
+			</div>
+			
 		</h:column>
 		</h:column>
 		<h:column>
 		<h:column>
 			<f:facet name="header">
 			<f:facet name="header">
@@ -56,42 +54,26 @@
 			</f:facet>
 			</f:facet>
 			<h:outputText value="#{user.lastname}" />
 			<h:outputText value="#{user.lastname}" />
 		</h:column>
 		</h:column>
+		
 		<h:column>
 		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.email']}" includeViewParams="true">
-					<f:param name="sort" value="email" />
-					<f:param name="page" value="0" />
-
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.email}" />
-		</h:column>
-		<!-- <h:column>
-			<f:facet name="header">
-				<h:outputText value="#{i18n['user.accountBalance']}" />
-			</f:facet>
-			<h:outputText value="#{user.accountBalance}">
-				<f:convertNumber />
-			</h:outputText>
-		</h:column>
-		 <h:column>
-				<f:facet name="header">
-					<h:outputText value="#{i18n['user.image']}" />
-				</f:facet>
-				<h:commandLink action="#{userView.showImage()}"
-					value="#{(empty user.currentImage)?i18n['user.noImage']:i18n['user.hasImage']}"
-				/>
-			</h:column>
-			 -->
-		<h:column>
-			<h:link outcome="/useradmin/edit" value="#{i18n['user.edit']}">
-				<f:param name="userid" value="#{user.id}" />
-			</h:link>
+			<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{user.id}')">#{i18n['user.edit']}</button>
 		</h:column>
 		</h:column>
+		
 		<!-- <h:column>
 		<!-- <h:column>
 				<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
 				<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
 			</h:column> -->
 			</h:column> -->
 	</h:dataTable>
 	</h:dataTable>
+	<script>
+ jQuery(function() {
+	jQuery(".hoverable").hover(function () {
+	    jQuery(this).next().fadeIn();
+	  }, 
+	  function () {
+		  jQuery(this).next().fadeOut();
+	  });
+	 });
+</script>
 </composite:implementation>
 </composite:implementation>
+
 </html>
 </html>
 
 

code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css

+/* General css, use for non-layout purposes for general elements */
+
+
+/* userlistview popup */
+.userdata_popup {
+position: absolute;
+border: 1px solid black;
+backgrond: white;
+border-radius: 3px;
+display: none;
+
+}
+
+
+/*  general class for hoverable usage  */
+.hoverable {
+
+}
\ No newline at end of file

code/LanBortalWeb/WebContent/resources/style/template1/css/general.css

+/* General css, use for non-layout purposes for general elements */
+
+
+/* userlistview popup */
+.userdata_popup {
+position: absolute;
+border: 1px solid black;
+background: white;
+border-radius: 3px;
+display: none;
+width: 300px;
+height: 150px;
+}
+
+
+/*  general class for hoverable usage  */
+.hoverable {
+
+}
\ No newline at end of file

code/LanBortalWeb/WebContent/user/create.xhtml

@@ -13,8 +13,6 @@
 		<ui:define name="content">
 		<ui:define name="content">
 			<users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
 			<users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
 
 
-
-
 		</ui:define>
 		</ui:define>
 	</ui:composition>
 	</ui:composition>
 </h:body>
 </h:body>

code/LanBortalWeb/WebContent/useradmin/edit.xhtml

@@ -22,7 +22,7 @@
 			</p>
 			</p>
 			<users:edit commitaction="#{userView.saveUser()}" commitvalue="#{i18n['user.save']}" />
 			<users:edit commitaction="#{userView.saveUser()}" commitvalue="#{i18n['user.save']}" />
 
 
-			<h:form id="roleform" rendered="#{roleView.canReadRoles()}">
+			<h:form id="roleform" rendered="#{roleView.canReadRoles}">
 
 
 				<h2>
 				<h2>
 					<h:outputText value="#{i18n['user.roles']}:" />
 					<h:outputText value="#{i18n['user.roles']}:" />
@@ -31,7 +31,7 @@
 					<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
 					<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
 				</h:selectManyCheckbox>
 				</h:selectManyCheckbox>
 				<div>
 				<div>
-					<h:message rendered="#{roleView.canReadRoles()}" for="roles" />
+					<h:message rendered="#{roleView.canReadRoles}" for="roles" />
 				</div>
 				</div>
 				<h:commandButton action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}" />
 				<h:commandButton action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}" />
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

@@ -24,8 +24,7 @@ import fi.insomnia.bortal.model.User;
  */
  */
 public class HostnameFilter implements Filter {
 public class HostnameFilter implements Filter {
 
 
-	private static final Logger logger = LoggerFactory
-			.getLogger(HostnameFilter.class);
+	private static final Logger logger = LoggerFactory.getLogger(HostnameFilter.class);
 	private boolean developmentMode = false;
 	private boolean developmentMode = false;
 	private static final String HTTP_HOSTNAME_ID = "hostname_session_id";
 	private static final String HTTP_HOSTNAME_ID = "hostname_session_id";
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/cmdline/Hello.java

+package fi.insomnia.bortal.cmdline;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+import javax.ejb.EJB;
+
+import fi.insomnia.bortal.beans.PermissionBeanLocal;
+
+public class Hello implements ICommandlineCommand {
+	
+	private PermissionBeanLocal permBean;
+	
+	public Hello(PermissionBeanLocal permBean) {
+		this.permBean = permBean;
+	}
+	
+	public int execute(String[] argv, InputStreamReader stdin, OutputStreamWriter stdout, OutputStreamWriter stderr) {
+		try {
+			if(argv.length != 2) {
+				stderr.write("usage: "+argv[0]+" <name>\r\n");
+				stderr.flush();
+				return 1;
+			} else {
+				
+				String currentUser = permBean.getPrincipal();
+				if(currentUser.equals(argv[1])) {
+					stdout.write("hello, "+argv[1]+"\r\n");
+				} else {
+					stdout.write("you lie, "+currentUser+"!\r\n");
+				}
+				stdout.flush();
+				return 0;
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			
+			return -1;
+		}
+	}
+}

code/LanBortalWeb/src/fi/insomnia/bortal/cmdline/ICommandlineCommand.java

+package fi.insomnia.bortal.cmdline;
+
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+public interface ICommandlineCommand {
+	public int execute(String[] argv, InputStreamReader stdin, OutputStreamWriter stdout, OutputStreamWriter errstream);
+}

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -330,6 +330,7 @@ permissiondenied.alreadyLoggedIn = You don't have enough rights
 permissiondenied.header          = Access denied
 permissiondenied.header          = Access denied
 permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
 permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
 
 
+place.buyable                     = Buyable
 place.code                        = Placecode
 place.code                        = Placecode
 place.commit                      = Save
 place.commit                      = Save
 place.description                 = Description
 place.description                 = Description
@@ -363,6 +364,7 @@ placegroup.details                = Details
 placegroup.edit                   = Show
 placegroup.edit                   = Show
 placegroup.edited                 = Edited
 placegroup.edited                 = Edited
 placegroup.name                   = Name
 placegroup.name                   = Name
+placegroup.placename              = Place
 placegroup.places                 = Places
 placegroup.places                 = Places
 placegroup.printPdf               = Print placecodes
 placegroup.printPdf               = Print placecodes
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -317,6 +317,7 @@ permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksi
 permissiondenied.header          = P\u00E4\u00E4sy kielletty
 permissiondenied.header          = P\u00E4\u00E4sy kielletty
 permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
 permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
 
 
+place.buyable                     = Ostettavissa
 place.code                        = Paikkakoodi
 place.code                        = Paikkakoodi
 place.commit                      = Tallenna
 place.commit                      = Tallenna
 place.description                 = Kuvaus
 place.description                 = Kuvaus
@@ -352,6 +353,7 @@ placegroup.details                = Tiedot
 placegroup.edit                   = N\u00E4yt\u00E4
 placegroup.edit                   = N\u00E4yt\u00E4
 placegroup.edited                 = Muokattu
 placegroup.edited                 = Muokattu
 placegroup.name                   = Nimi
 placegroup.name                   = Nimi
+placegroup.placename              = Paikka
 placegroup.places                 = Paikat
 placegroup.places                 = Paikat
 placegroup.printPdf               = Tulosta paikkakoodit
 placegroup.printPdf               = Tulosta paikkakoodit
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/servlet/BortalCommand.java

@@ -6,6 +6,10 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
+import java.util.HashMap;
+
+import javax.annotation.PostConstruct;
+import javax.security.auth.login.LoginException;
 
 
 import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.Environment;
@@ -14,20 +18,29 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
 import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
 import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
+import fi.insomnia.bortal.cmdline.Hello;
+import fi.insomnia.bortal.cmdline.ICommandlineCommand;
 
 
 public class BortalCommand implements Command, Runnable {
 public class BortalCommand implements Command, Runnable {
 
 
 	private static Logger logger = LoggerFactory.getLogger(BortalCommand.class);
 	private static Logger logger = LoggerFactory.getLogger(BortalCommand.class);
-	private OutputStream errstream;
+	private OutputStreamWriter errstream;
 	private ExitCallback exitCallback;
 	private ExitCallback exitCallback;
 	private InputStreamReader instream;
 	private InputStreamReader instream;
 	private OutputStreamWriter outstream;
 	private OutputStreamWriter outstream;
 	private BortalLocalContextHolder contextHolder;
 	private BortalLocalContextHolder contextHolder;
 	private Charset UTF8 = Charset.forName("UTF-8");
 	private Charset UTF8 = Charset.forName("UTF-8");
+	
+	private HashMap<String, ICommandlineCommand> commandMap = new HashMap<String, ICommandlineCommand>();
 
 
 	public BortalCommand(BortalLocalContextHolder context) {
 	public BortalCommand(BortalLocalContextHolder context) {
 		contextHolder = context;
 		contextHolder = context;
 	}
 	}
+	
+	public BortalCommand addCommandlineCommand(String name, ICommandlineCommand c) {
+		this.commandMap.put(name, c);
+		return this;
+	}
 
 
 	@Override
 	@Override
 	public void setInputStream(InputStream in) {
 	public void setInputStream(InputStream in) {
@@ -42,7 +55,7 @@ public class BortalCommand implements Command, Runnable {
 
 
 	@Override
 	@Override
 	public void setErrorStream(OutputStream err) {
 	public void setErrorStream(OutputStream err) {
-		errstream = err;
+		errstream = new OutputStreamWriter(err, UTF8);
 	}
 	}
 
 
 	@Override
 	@Override
@@ -59,16 +72,20 @@ public class BortalCommand implements Command, Runnable {
 	@Override
 	@Override
 	public void destroy() {
 	public void destroy() {
 		logger.info("destroying ssh command");
 		logger.info("destroying ssh command");
-
 	}
 	}
 
 
 	@Override
 	@Override
 	public void run() {
 	public void run() {
 		BortalLocalContextHolder.copy(contextHolder);
 		BortalLocalContextHolder.copy(contextHolder);
+		BortalLocalContextHolder.getInstance().executeLogin();
+		
 		try {
 		try {
 			logger.info("Created new bortalCommane");
 			logger.info("Created new bortalCommane");
 			outstream.write("Hello you...");
 			outstream.write("Hello you...");
 			StringBuilder cmdBuilder = new StringBuilder();
 			StringBuilder cmdBuilder = new StringBuilder();
+			
+			// prime 0 return value
+			int returnValue = 0;
 			while (true) {
 			while (true) {
 
 
 				if (!instream.ready()) {
 				if (!instream.ready()) {
@@ -78,9 +95,12 @@ public class BortalCommand implements Command, Runnable {
 
 
 					if (inchar == '\n' || inchar == '\r')
 					if (inchar == '\n' || inchar == '\r')
 					{
 					{
-						outstream.write("\r\n# ");
+						outstream.write("\r\n");
+						outstream.flush();
+						returnValue = parseCommand(cmdBuilder.toString());
+						
+						outstream.write("[" + returnValue + "] " + BortalLocalContextHolder.getInstance().loginContext.getSubject().getPrincipals().iterator().next().getName() + " # ");
 						outstream.flush();
 						outstream.flush();
-						parseCommand(cmdBuilder.toString());
 
 
 						cmdBuilder = new StringBuilder();
 						cmdBuilder = new StringBuilder();
 
 
@@ -99,14 +119,33 @@ public class BortalCommand implements Command, Runnable {
 			// TODO Auto-generated catch block
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
+		
+		BortalLocalContextHolder.getInstance().executeLogout();
 		exitCallback.onExit(3);
 		exitCallback.onExit(3);
 	}
 	}
 
 
-	private void parseCommand(String string) {
-		if (string != null || !string.isEmpty())
-		{
-			logger.info("received command {}", string);
+	private int parseCommand(String args) {
+		String[] argv = null;
+		if(args != null) {
+			if(args.length() == 0) return 0;
+			argv = args.split(" ");
+		}
+		
+		if(argv != null && argv.length > 0) {
+			logger.info("received command {}", argv[0]);
+			ICommandlineCommand cmd;
+			if((cmd = this.commandMap.get(argv[0])) != null) {
+				return cmd.execute(argv,this.instream, this.outstream, this.errstream);
+			} else {
+				try {
+					this.errstream.write("unknown command\r\n");
+					this.errstream.flush();
+				} catch(IOException ioe) {}
+
+				return -1;
+			}
+		} else {
+			return 0;
 		}
 		}
-
 	}
 	}
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/servlet/BortalPasswordAuthenticator.java

@@ -64,6 +64,8 @@ public class BortalPasswordAuthenticator implements PasswordAuthenticator {
 				}
 				}
 			});
 			});
 			loginContext.login();
 			loginContext.login();
+			
+			context.setLoginContext(loginContext);
 			// loginContext.logout();
 			// loginContext.logout();
 			return true;
 			return true;
 		} catch (Exception e) {
 		} catch (Exception e) {