rikoin ui:n, toisin tuon default, insomnia ui ok.

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.827+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.709+0300")
 @StaticMetamodel(AccountEvent.class)
 public class AccountEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<AccountEvent, Boolean> cash;

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

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.843+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.771+0300")
 @StaticMetamodel(ActionLogMessageResponse.class)
 public class ActionLogMessageResponse_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.836+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.752+0300")
 @StaticMetamodel(ActionLogMessage.class)
 public class ActionLogMessage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ActionLogMessage, Date> time;

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

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.849+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.785+0300")
 @StaticMetamodel(ApplicationPermission.class)
 public class ApplicationPermission_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ApplicationPermission, String> application;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.862+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.831+0300")
 @StaticMetamodel(BillLine.class)
 public class BillLine_ extends GenericEntity_ {
 	public static volatile SingularAttribute<BillLine, Bill> bill;

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.855+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.803+0300")
 @StaticMetamodel(Bill.class)
 public class Bill_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Bill, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.868+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.842+0300")
 @StaticMetamodel(CardTemplate.class)
 public class CardTemplate_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CardTemplate, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.892+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.916+0300")
 @StaticMetamodel(CompoEntryFile.class)
 public class CompoEntryFile_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.899+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.933+0300")
 @StaticMetamodel(CompoEntryParticipant.class)
 public class CompoEntryParticipant_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.883+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.896+0300")
 @StaticMetamodel(CompoEntry.class)
 public class CompoEntry_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntry, Compo> compo;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.874+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.873+0300")
 @StaticMetamodel(Compo.class)
 public class Compo_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Compo, String> name;

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

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.914+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.966+0300")
 @StaticMetamodel(DiscountInstance.class)
 public class DiscountInstance_ extends GenericEntity_ {
 	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.906+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.950+0300")
 @StaticMetamodel(Discount.class)
 public class Discount_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Discount, LanEvent> event;

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

@@ -3,7 +3,7 @@ package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.921+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.985+0300")
 @StaticMetamodel(EntityEquals.class)
 public class EntityEquals_ {
 }

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.927+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.002+0300")
 @StaticMetamodel(EventMap.class)
 public class EventMap_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventMap, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.934+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.013+0300")
 @StaticMetamodel(EventOrganiser.class)
 public class EventOrganiser_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventOrganiser, String> organisation;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.940+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.034+0300")
 @StaticMetamodel(EventUser.class)
 public class EventUser_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventUser, User> user;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.953+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.056+0300")
 @StaticMetamodel(FoodWaveTemplate.class)
 public class FoodWaveTemplate_ extends GenericEntity_ {
 	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.947+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.046+0300")
 @StaticMetamodel(FoodWave.class)
 public class FoodWave_ extends GenericEntity_ {
 	public static volatile SingularAttribute<FoodWave, String> name;

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

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.959+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.065+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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.966+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.078+0300")
 @StaticMetamodel(GroupMembership.class)
 public class GroupMembership_ extends GenericEntity_ {
 	public static volatile SingularAttribute<GroupMembership, String> inviteToken;

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

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.979+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.115+0300")
 @StaticMetamodel(LanEventDomain.class)
 public class LanEventDomain_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventDomain, String> domain;

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

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.985+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:15.127+0300")
 @StaticMetamodel(LanEventPrivateProperty.class)
 public class LanEventPrivateProperty_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;

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

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.005+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.127+0300")
 @StaticMetamodel(LanEventProperty.class)
 public class LanEventProperty_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;

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

@@ -8,7 +8,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:54.973+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.088+0300")
 @StaticMetamodel(LanEvent.class)
 public class LanEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEvent, Calendar> startTime;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.011+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.138+0300")
 @StaticMetamodel(Location.class)
 public class Location_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Location, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.025+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.159+0300")
 @StaticMetamodel(LogEntryType.class)
 public class LogEntryType_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LogEntryType, String> name;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.018+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.154+0300")
 @StaticMetamodel(LogEntry.class)
 public class LogEntry_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.038+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.179+0300")
 @StaticMetamodel(MenuNavigation.class)
 public class MenuNavigation_ extends GenericEntity_ {
 	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.031+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.174+0300")
 @StaticMetamodel(Menuitem.class)
 public class Menuitem_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Menuitem, String> url;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.052+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.198+0300")
 @StaticMetamodel(NewsGroup.class)
 public class NewsGroup_ extends GenericEntity_ {
 	public static volatile SingularAttribute<NewsGroup, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.045+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.193+0300")
 @StaticMetamodel(News.class)
 public class News_ extends GenericEntity_ {
 	public static volatile SingularAttribute<News, String> title;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.059+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.209+0300")
 @StaticMetamodel(OrgRole.class)
 public class OrgRole_ extends GenericEntity_ {
 	public static volatile SingularAttribute<OrgRole, String> name;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.066+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.220+0300")
 @StaticMetamodel(PageContent.class)
 public class PageContent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PageContent, SitePage> sitepage;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.093+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.246+0300")
 @StaticMetamodel(PlaceGroup.class)
 public class PlaceGroup_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PlaceGroup, Calendar> created;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.075+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.232+0300")
 @StaticMetamodel(Place.class)
 public class Place_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Place, String> description;

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

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.110+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.270+0300")
 @StaticMetamodel(PollAnswer.class)
 public class PollAnswer_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PollAnswer, String> answerText;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.118+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.275+0300")
 @StaticMetamodel(PollQuestion.class)
 public class PollQuestion_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PollQuestion, Integer> characters;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.102+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.259+0300")
 @StaticMetamodel(Poll.class)
 public class Poll_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Poll, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.126+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.292+0300")
 @StaticMetamodel(PossibleAnswer.class)
 public class PossibleAnswer_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PossibleAnswer, String> answer;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.134+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.300+0300")
 @StaticMetamodel(PrintedCard.class)
 public class PrintedCard_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PrintedCard, LanEvent> event;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.148+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.323+0300")
 @StaticMetamodel(ProductLimitation.class)
 public class ProductLimitation_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;

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.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.141+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.312+0300")
 @StaticMetamodel(Product.class)
 public class Product_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Product, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.162+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.350+0300")
 @StaticMetamodel(ReaderEvent.class)
 public class ReaderEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ReaderEvent, Calendar> time;

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

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.155+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.338+0300")
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, ReaderType> type;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.170+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.359+0300")
 @StaticMetamodel(Role.class)
 public class Role_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Role, String> name;

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

@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.192+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.400+0300")
 @StaticMetamodel(SitePage.class)
 public class SitePage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<SitePage, LanEvent> event;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.209+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.422+0300")
 @StaticMetamodel(UserImage.class)
 public class UserImage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<UserImage, Calendar> uploaded;

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

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.216+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.435+0300")
 @StaticMetamodel(UserNote.class)
 public class UserNote_ extends GenericEntity_ {
 	public static volatile SingularAttribute<UserNote, EventUser> user;

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

@@ -8,7 +8,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.201+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.412+0300")
 @StaticMetamodel(User.class)
 public class User_ extends GenericEntity_ {
 	public static volatile SingularAttribute<User, Calendar> created;

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

@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.223+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.446+0300")
 @StaticMetamodel(Vote.class)
 public class Vote_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Vote, Integer> score;

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

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.176+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.370+0300")
 @StaticMetamodel(SalesEntity.class)
 public class SalesEntity_ extends GenericEntity_ {
 	public static volatile SingularAttribute<SalesEntity, String> certificate;

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-10-06T13:36:55.186+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.384+0300")
 @StaticMetamodel(Salespoint.class)
 public class Salespoint_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Salespoint, LanEvent> event;

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

@@ -22,8 +22,6 @@
 
 	<h:body>
 		<div id="page-container">
-	
-		<div id="page-header">
 		<div id="logo">
 				<h:link outcome="/index">
 					<c:choose>
@@ -37,14 +35,14 @@
 									<h:outputText value="#{layoutView.headertext}" />
 								</h1>
 							</ui:fragment>
-							<!--		 <img src="#{request.contextPath}/resources/style/insomnia2/img/logo.png" />
-						<h1>STREAM INTRA</h1> -->
 						</c:otherwise>
 					</c:choose>
 				</h:link>
 
 
 			</div>
+		<div id="page-header">
+			
 
 			<div id="login">
 				<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />

code/LanBortalWeb/WebContent/map/create.xhtml

@@ -15,6 +15,7 @@
 					<h:outputText value="#{i18n['map.name']}" />
 					<h:inputText value="#{mapManageView.mapname}" />
 					<h:commandButton id="createrole" value="#{i18n['map.create']}" action="#{mapManageView.createMap}" />
+					<h:commandButton id="createTileMap" value="#{i18n['map.createTileMap']}" action="#{mapManageView.createTileMap}" />
 				</h:panelGrid>
 			</h:form>
 

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

@@ -40,7 +40,6 @@
 				<h:link value="#{i18n['user.firstNames']}" includeViewParams="true">
 					<f:param name="sort" value="firstnames" />
 					<f:param name="page" value="0" />
-
 				</h:link>
 			</f:facet>
 			<h:outputText value="#{user.firstnames}" />

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

@@ -16,3 +16,4 @@ display: none;
 .hoverable {
 
 }
+

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

@@ -17,3 +17,36 @@ height: 150px;
 .hoverable {
 
 }
+
+.hidden {
+	display: none;
+	
+}
+#webcamcontainer {
+	
+}
+
+#shopItems {}
+
+.shopItem {
+	position: relative;
+	float:left;
+	width: 64px;
+	height: 64px;
+	background: gold;
+	border: 1px solid black;
+	margin: 2px;
+}
+
+.shopItem:hover {
+	background: goldenrod;
+	
+}
+
+.shopItem a {
+	display: block;
+	width: 100%;
+	height: 100%;
+	color: black;
+	text-decoration: none;
+}

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

@@ -133,13 +133,14 @@ table tbody td {
 border: none;
 padding: 5px;
 padding-left: 1em;
+vertical-align: top;
 }
 
 label {
 
 	}
 
-input {
+/* input {
 border: 1px solid #ccc;
 padding: 3px 6px;
 border-radius: 6px;
@@ -165,3 +166,5 @@ border-radius: 8px;
 border: 1px solid black;
 background: lightblue;
 }
+
+*/

code/LanBortalWeb/WebContent/shop/shopToUser.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:p="http://primefaces.org/ui"
-	xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+<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:p="http://primefaces.org/ui" 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">
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
-			<f:event type="preRenderView"
-				listener="#{productShopView.initShopView}" />
+			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
 		</f:metadata>
 
 		<ui:define name="title">
@@ -27,7 +20,31 @@
 
 			<h:form id="shoppingcartform">
 				<h:panelGrid columns="2">
-					<h:panelGrid columns="2">
+
+					<h:panelGroup>
+						<div id="shopItems">
+							<ui:repeat value="#{productShopView.shoppingcart}" var="cart">
+								<div class="shopItem">
+									<h:commandLink action="#{productShopView.addOne}" value="#{cart.product.name}">
+										<f:ajax render="@form" />
+									</h:commandLink>
+								</div>
+							</ui:repeat>
+						</div>
+
+					</h:panelGroup>
+
+					<h:panelGroup>
+					
+					<h:dataGrid >
+					
+					
+					</h:dataGrid>
+						<h:outputLabel value="#{i18n['shop.readBarcode']}" />
+						<h:inputText id="barcode" value="#{productShopView.barcode}" />
+						<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['productShopView.readBarcode']}">
+							<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
+						</h:commandButton>
 
 						<h:outputLabel value="#{i18n['shop.accountBalance']}" />
 						<h:outputText value="#{productShopView.accountBalance}">
@@ -44,29 +61,36 @@
 							<f:ajax render="@form" event="valueChange" />
 							<f:convertNumber />
 						</h:inputText>
-					</h:panelGrid>
-					<h:panelGroup>
-						<h:outputLabel value="#{i18n['shop.readBarcode']}" />
-						<h:inputText id="barcode" value="#{productShopView.barcode}" />
-						<h:commandButton action="#{productShopView.readBarcode}"
-							onclick="blip(); return true;"
-							value="#{i18n['productShopView.readBarcode']}">
-							<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
-						</h:commandButton>
-
 					</h:panelGroup>
 
 
+
+
 				</h:panelGrid>
+				
+				
 				<h:outputText value="#{i18n['product.shopInstant']}" />
 				<h:selectBooleanCheckbox value="#{productShopView.payInstant}">
 					<f:ajax render="@form" execute="@form" />
 				</h:selectBooleanCheckbox>
 
-				<products:shop
-					commitaction="#{productShopView.commitShoppingCart()}"
-					items="#{productShopView.shoppingcart}"
-					commitValue="#{i18n['productshop.commit']}" />
+				<h:outputScript library="primefaces" name="jquery/jquery.js" />
+				<div style="margin-top: 5px;">
+					<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-top" value="#{cc.attrs.commitValue}" />
+				</div>
+
+
+
+				<div>
+					<h:outputText value="#{i18n['productshop.total']} " />
+					<h:outputText value="#{productShopView.totalPrice}">
+						<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+					</h:outputText>
+				</div>
+
+				<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
+
+
 			</h:form>
 			<script>
 				var blipSnd = new Audio(
@@ -74,7 +98,8 @@
 
 				$(function() {
 					$("#shoppingcartform\\:barcode").focus();
-				})
+
+				});
 
 				function blip() {
 					blipSnd.play();

code/LanBortalWeb/WebContent/useradmin/edit.xhtml

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