Merge branch 'devel' into gameCodes

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-10-27T16:07:46.034+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, BigDecimal> deliveredCount;
+	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

+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-24T19:52:46.826+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-10-24T19:52:46.819+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-10-24T19:52:46.830+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/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-10-26T02:39:28.679+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;
+	public static volatile SingularAttribute<BillLine, FoodWave> foodwave;
+}

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-10-24T19:52:46.834+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/CardBarcode_.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-11-18T00:45:55.945+0200")
+@StaticMetamodel(CardBarcode.class)
+public class CardBarcode_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CardBarcode, PrintedCard> printedCard;
+}

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-10-24T19:52:46.843+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-10-24T19:52:46.856+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-10-24T19:52:46.860+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-10-24T19:52:46.852+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-10-24T19:52:46.847+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-10-24T19:52:46.868+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-10-24T19:52:46.864+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-10-24T19:52:46.872+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-10-24T19:52:46.875+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-10-24T19:52:46.880+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-10-24T19:52:46.885+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/Feedback_.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-11-01T13:46:40.118+0200")
+@StaticMetamodel(Feedback.class)
+public class Feedback_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Feedback, EventUser> sender;
+	public static volatile SingularAttribute<Feedback, LanEvent> event;
+	public static volatile SingularAttribute<Feedback, Calendar> timestamp;
+	public static volatile SingularAttribute<Feedback, String> message;
+}

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-11-01T13:46:29.082+0200")
+@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;
+	public static volatile SingularAttribute<FoodWaveTemplate, Integer> maximumFoods;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.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-11-18T00:45:52.230+0200")
+@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, Date> time;
+	public static volatile SingularAttribute<FoodWave, Integer> maximumFoods;
+	public static volatile SingularAttribute<FoodWave, Boolean> closed;
+	public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
+	public static volatile ListAttribute<FoodWave, BillLine> billLines;
+	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-10-24T19:52:46.897+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-10-24T19:52:46.901+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/InventoryEvent_.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-11-18T00:45:52.284+0200")
+@StaticMetamodel(InventoryEvent.class)
+public class InventoryEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<InventoryEvent, Date> created;
+	public static volatile SingularAttribute<InventoryEvent, User> user;
+	public static volatile SingularAttribute<InventoryEvent, Product> product;
+	public static volatile SingularAttribute<InventoryEvent, String> info;
+	public static volatile SingularAttribute<InventoryEvent, BigDecimal> quantity;
+}

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-10-24T19:52:46.910+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-10-24T19:52:46.914+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-10-24T19:52:46.918+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-10-24T19:52:46.905+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-10-24T19:52:46.923+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-10-24T19:52:46.930+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-10-24T19:52:46.927+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-10-25T01:54:09.095+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-10-24T19:52:46.934+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-10-24T19:52:46.947+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-10-24T19:52:46.943+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-10-24T19:52:46.952+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-10-24T19:52:46.956+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-10-24T19:52:46.964+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-10-24T19:52:46.960+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-10-24T19:52:46.973+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-10-24T19:52:46.976+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-10-24T19:52:46.968+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-10-24T19:52:46.980+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-10-24T19:52:46.985+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/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-10-24T19:52:46.995+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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-18T00:45:52.346+0200")
+@StaticMetamodel(Product.class)
+public class Product_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Product, LanEvent> event;
+	public static volatile SingularAttribute<Product, String> color;
+	public static volatile SingularAttribute<Product, String> name;
+	public static volatile SingularAttribute<Product, String> description;
+	public static volatile SingularAttribute<Product, BigDecimal> price;
+	public static volatile SingularAttribute<Product, BigDecimal> buyInPrice;
+	public static volatile SingularAttribute<Product, Integer> sort;
+	public static volatile SingularAttribute<Product, String> barcode;
+	public static volatile SetAttribute<Product, ProductFlag> productFlags;
+	public static volatile SingularAttribute<Product, Role> provides;
+	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, InventoryEvent> inventoryEvents;
+	public static volatile ListAttribute<Product, Discount> discounts;
+	public static volatile SingularAttribute<Product, BigDecimal> vat;
+	public static volatile SingularAttribute<Product, String> unitName;
+	public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.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-11-01T13:46:40.201+0200")
+@StaticMetamodel(ReaderEvent.class)
+public class ReaderEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ReaderEvent, Date> time;
+	public static volatile SingularAttribute<ReaderEvent, Date> 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

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.model.salespoint.SalesEntity;
+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-24T19:52:46.999+0300")
+@StaticMetamodel(Reader.class)
+public class Reader_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Reader, ReaderType> type;
+	public static volatile SingularAttribute<Reader, LanEvent> event;
+	public static volatile SingularAttribute<Reader, Integer> gamepoints;
+	public static volatile SingularAttribute<Reader, Integer> maxEvents;
+	public static volatile SingularAttribute<Reader, SalesEntity> salesEntity;
+	public static volatile SingularAttribute<Reader, Product> automaticProduct;
+	public static volatile SingularAttribute<Reader, BigDecimal> automaticProductCount;
+	public static volatile SingularAttribute<Reader, String> identification;
+	public static volatile SingularAttribute<Reader, String> description;
+	public static volatile SingularAttribute<Reader, Location> location;
+	public static volatile SingularAttribute<Reader, EventMap> eventMap;
+	public static volatile SingularAttribute<Reader, Integer> mapX;
+	public static volatile SingularAttribute<Reader, Integer> mapY;
+	public static volatile ListAttribute<Reader, ReaderEvent> events;
+}

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-10-24T19:52:47.008+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-24T19:52:47.021+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-10-24T19:52:47.031+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-10-24T19:52:47.035+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-10-24T19:52:47.025+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-10-24T19:52:47.039+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-10-24T19:52:47.012+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-10-24T19:52:47.017+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/LanBortalWeb/WebContent/useradmin/export.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:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:p="http://primefaces.org/ui" xmlns:f="http://java.sun.com/jsf/core">
+<h:body>
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{placeGroupView.}" />
+		</f:metadata>
+Etunimi;Sukunimi;Nick;Osoite;Kaupunki;Email;Puhelin;Konepaikat<br/>
+	<ui:repeat var="usr" value="#{userSearchView.eventUserResults}">#{usr.firstnames};#{usr.lastname};#{usr.nick};#{usr.address};#{usr.postalTown};#{usr.email};#{usr.phone};<ui:repeat var="places" value="#{usr.currentPlaces}">#{#places.name},</ui:repeat><br/></ui:repeat>
+	</h:body>
+</html>
\ No newline at end of file

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -66,7 +66,7 @@ public class MenuBean implements MenuBeanLocal {
 		initializeOldMenu();
 		initializeOldMenu();
 	}
 	}
 
 
-	private synchronized void initializeMenu() {
+	private synchronized void initializeMenu_skynett() {
 
 
 		int menusort = 100;
 		int menusort = 100;
 		logger.info("Initializing menu");
 		logger.info("Initializing menu");
@@ -228,6 +228,166 @@ public class MenuBean implements MenuBeanLocal {
 
 
 	}
 	}
 
 
+	private synchronized void initializeMenu() {
+
+		int menusort = 100;
+		logger.info("Initializing new default menu");
+		LanEvent ev = eventbean.getCurrentEvent();
+
+		MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
+
+		usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
+		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/logout"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/logoutResponse"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetPassword"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false);
+		
+		MenuNavigation userEvent = usermenu.addPage(null, null);
+		userEvent.setKey("topnavi.userevent");
+		userEvent.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
+		userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
+		userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.ANYUSER);
+		userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER);
+		
+		MenuNavigation userkauppa = usermenu.addPage(null, null);
+		userkauppa.setKey("topnavi.usershop");
+		userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);		
+
+		MenuNavigation usercompetitions = usermenu.addPage(null, null);
+		usercompetitions.setKey("topnavi.competitions");
+
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);		
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false);
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false);
+
+		/* MenuNavigation createuser = usermenu.addPage(null, null);
+		createuser.setKey("topnavi.createuser");
+		createuser.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW); */
+
+		navifacade.create(usermenu);
+
+		MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
+		MenuNavigation adminuser = adminmenu.addPage(null, null);
+		adminuser.setKey("topnavi.usermgmt");
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/place/adminInsertToken"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/foodwaveshop"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/foodwaveProducts"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/showTakePicture"), UserPermission.VIEW_ALL).setVisible(false);
+
+		MenuNavigation adminroles = adminuser.addPage(null, null);
+		adminroles.setKey("subnavi.roles");
+		adminroles.addPage(menuitemfacade.findOrCreate("/role/list"), UserPermission.READ_ROLES);
+		adminroles.addPage(menuitemfacade.findOrCreate("/role/create"), UserPermission.WRITE_ROLES);
+		adminroles.addPage(menuitemfacade.findOrCreate("/role/edit"), null).setVisible(false);
+
+		MenuNavigation adminshop = adminmenu.addPage(null, null);
+		adminshop.setKey("topnavi.adminshop");
+		MenuNavigation adminShopProducts = adminshop.addPage(null, null);
+		adminShopProducts.setKey("subnavi.products");
+		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
+		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
+
+		MenuNavigation adminShopReaders = adminshop.addPage(null, null);
+		adminShopReaders.setKey("subnavi.readers");
+		adminShopReaders.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS);
+		adminShopReaders.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS);
+
+		MenuNavigation adminShopBilling = adminshop.addPage(null, null);
+		adminShopBilling.setKey("subnavi.billing");
+		adminShopBilling.addPage(menuitemfacade.findOrCreate("/bill/billSummary"), BillPermission.READ_ALL);
+		adminShopBilling.addPage(menuitemfacade.findOrCreate("/bill/listAll"), BillPermission.WRITE_ALL);
+
+		MenuNavigation adminevent = adminmenu.addPage(null, null);
+		adminevent.setKey("topnavi.event");
+		MenuNavigation adminEventCards = adminevent.addPage(null, null);
+		adminEventCards.setKey("subnavi.cards");
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/listCardTemplates"), UserPermission.READ_ROLES);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"), UserPermission.WRITE_ROLES);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false);
+
+		navifacade.create(adminmenu);
+
+		MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
+		// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
+		// UserPermission.ANYUSER);
+		navifacade.create(shopmenu);
+
+		/*
+		 * MenuNavigation profileTopmenu = new MenuNavigation(ev,
+		 * "topnavi.profile", menusort = +10);
+		 * profileTopmenu.addPage(menuitemfacade
+		 * .findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
+		 * profileTopmenu
+		 * .addPage(menuitemfacade.findOrCreate("/useradmin/list"),
+		 * UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
+		 * profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"),
+		 * UserPermission.VIEW_SELF);
+		 * profileTopmenu.addPage(menuitemfacade.findOrCreate
+		 * ("/user/changePassword"), UserPermission.VIEW_SELF);
+		 */
+
+		// MenuNavigation usermgmt = profileTopmenu.addPage(null, null);
+		// usermgmt.setKey("topnavi.user.mgmt");
+		// usermgmt.addPage(menuitemfacade.findOrCreate("/role/create"),
+		// UserPermission.WRITE_ROLES);
+		// usermgmt.addPage(menuitemfacade.findOrCreate("/role/list"),
+		// UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
+		// usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/list"),
+		// UserPermission.READ_ORGROLES);
+		// usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/create"),
+		// UserPermission.WRITE_ORGROLES);
+		// usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/listCardTemplates"),
+		// UserPermission.READ_ROLES);
+		// usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"),
+		// UserPermission.WRITE_ROLES);
+		//
+		// navifacade.create(profileTopmenu);
+		//
+		// MenuNavigation miscTopmenu = new MenuNavigation(ev, "topnavi.misc",
+		// menusort = +10);
+		//
+		// miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/list"),
+		// ContentPermission.MANAGE_PAGES);
+		// miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/create"),
+		// ContentPermission.MANAGE_PAGES);
+		// miscTopmenu.addPage(menuitemfacade.findOrCreate("/utils/flushCache"),
+		// ContentPermission.MANAGE_PAGES);
+		//
+		// navifacade.create(miscTopmenu);
+
+		// frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"),
+		// UserPermission.CREATE_NEW);
+		// frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/sendResetMail"),
+		// UserPermission.LOGIN);
+		// frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/invite"),
+		// UserPermission.INVITE_USERS);
+
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+
+	}
+
 	private synchronized void initializeOldMenu() {
 	private synchronized void initializeOldMenu() {
 
 
 		LanEvent ev = eventbean.getCurrentEvent();
 		LanEvent ev = eventbean.getCurrentEvent();

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -159,14 +159,16 @@ public class UserBean implements UserBeanLocal {
 		// currentEventuser, currentEventuserRoles);
 		// currentEventuser, currentEventuserRoles);
 		// return currentEventuserRoles;
 		// return currentEventuserRoles;
 		// }
 		// }
+		LanEvent event = eventBean.getCurrentEvent();
+
 		Set<Role> checkedRoles = new HashSet<Role>();
 		Set<Role> checkedRoles = new HashSet<Role>();
+		addRecursive(checkedRoles, event.getDefaultRole());
 		if (u != null)
 		if (u != null)
 		{
 		{
 			addRecursive(checkedRoles, rolefacade.findForUser(u));
 			addRecursive(checkedRoles, rolefacade.findForUser(u));
 
 
 			if (permbean.isLoggedIn()) {
 			if (permbean.isLoggedIn()) {
 
 
-				LanEvent event = eventBean.getCurrentEvent();
 				// add roles from events default role.
 				// add roles from events default role.
 				addRecursive(checkedRoles, event.getDefaultRole());
 				addRecursive(checkedRoles, event.getDefaultRole());
 
 

code/MoyaDatabase/.settings/org.eclipse.jpt.core.prefs

 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jpt.core.discoverAnnotatedClasses=true
 org.eclipse.jpt.core.discoverAnnotatedClasses=true
 org.eclipse.jpt.core.platform=eclipselink2_3
 org.eclipse.jpt.core.platform=eclipselink2_3
+org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
 org.eclipse.jpt.jpa.core.metamodelSourceFolderName=src
 org.eclipse.jpt.jpa.core.metamodelSourceFolderName=src

code/MoyaDatabase/src/fi/codecrew/moya/model/LanEventPropertyKey.java

@@ -2,16 +2,18 @@ package fi.codecrew.moya.model;
 
 
 public enum LanEventPropertyKey {
 public enum LanEventPropertyKey {
     EVENT_LOGO(Type.DATA, null),
     EVENT_LOGO(Type.DATA, null),
-    INVITEMAIL_SUBJECT(Type.TEXT, "Invitation to Stream demoparty"),
-    INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to Stream demoparty by {1}.\n\nYou can register to stream demparty intranet at: {0}\n\nAfter registering to the intranet you can buy a ticket to Stream demoparty reduced price and invite your friends to join the party with you. More information can be found in the intranet. Remember also to visit our website at http://www.streamparty.org and join us at #streamparty in IRCNet. If you have any questions about this mail, registering to intranet, or anything else regarding Stream demoparty, please send us email to info@streamparty.org\n\n-- \nStream organizing\ninfo@streamparty.org"),
-    PORTAL_EMAIL_ADDRESS(Type.TEXT, "intra@streamparty.org"),
-    PORTAL_EMAIL_NAME(Type.TEXT, "Streamparty intranet"),
-    ADMIN_MAIL(Type.TEXT, "intra@streamparty.org"),
+    INVITEMAIL_SUBJECT(Type.TEXT, "Invitation to Moya Online Youth Accumulator"),
+    INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to an event by {1}.\n\nYou can register to intranet at: {0}\n\nAfter registering to the intranet you can buy a ticket to Stream demoparty reduced price and invite your friends to join the party with you. More information can be found in the intranet. Remember also to visit our website at http://www.streamparty.org and join us at #streamparty in IRCNet. If you have any questions about this mail, registering to intranet, or anything else regarding Stream demoparty, please send us email to info@streamparty.org\n\n-- \nStream organizing\ninfo@streamparty.org"),
+    PORTAL_EMAIL_ADDRESS(Type.TEXT, "moya@codecrew.fi"),
+    PORTAL_EMAIL_NAME(Type.TEXT, "Moya Online Youth Accumulator"),
+    ADMIN_MAIL(Type.TEXT, "moya@codecrew.fi"),
     EVENT_LAYOUT(Type.TEXT, "template1"),
     EVENT_LAYOUT(Type.TEXT, "template1"),
     SHOP_DEFAULT_CASH(Type.BOOL, null),
     SHOP_DEFAULT_CASH(Type.BOOL, null),
     PLACECODE_FROM_USER(Type.BOOL, null),
     PLACECODE_FROM_USER(Type.BOOL, null),
     PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null),
     PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null),
-    ;
+    CHECK_BILL_STATS_PERMISSION(Type.BOOL, null),
+    GATHER_OTHER_BILL_INFO(Type.BOOL, null), ;
+
     private enum Type {
     private enum Type {
         TEXT, DATE, DATA, BOOL
         TEXT, DATE, DATA, BOOL
     };
     };
@@ -39,7 +41,7 @@ public enum LanEventPropertyKey {
     {
     {
         this.type = t;
         this.type = t;
         defaultvalue = def;
         defaultvalue = def;
-    }   
+    }
 
 
     public String getDefaultvalue() {
     public String getDefaultvalue() {
         return defaultvalue;
         return defaultvalue;

code/MoyaWeb/.project

@@ -21,6 +21,11 @@
 			</arguments>
 			</arguments>
 		</buildCommand>
 		</buildCommand>
 		<buildCommand>
 		<buildCommand>
+			<name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			<arguments>
 			</arguments>
 			</arguments>
@@ -32,5 +37,7 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+		<nature>org.jboss.tools.jsf.jsfnature</nature>
 	</natures>
 	</natures>
 </projectDescription>
 </projectDescription>

code/MoyaWeb/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//WebContent/resources/templates/template1/css/style.css=UTF-8

code/MoyaWeb/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1

code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml

+<root>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>

code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -8,4 +8,5 @@
   <installed facet="sun.facet" version="9"/>
   <installed facet="sun.facet" version="9"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.7"/>
   <installed facet="java" version="1.7"/>
+  <installed facet="jst.jsf" version="2.1"/>
 </faceted-project>
 </faceted-project>

code/MoyaWeb/WebContent/actionlog/messagelist.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
 			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/actionlog/taskview.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="id" value="#{taskModificationView.id}"></f:viewParam>
 			<f:viewParam name="id" value="#{taskModificationView.id}"></f:viewParam>
 			<f:event type="preRenderView" listener="#{taskModificationView.initView}" />
 			<f:event type="preRenderView" listener="#{taskModificationView.initView}" />

code/MoyaWeb/WebContent/admin/adduser/update.xhtml

@@ -8,6 +8,7 @@
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
+			<f:event type="preRenderView" listener="#{userView.setCaptureForwardUrl('/admin/adduser/capturesuccess')}" />
 		</f:metadata>
 		</f:metadata>
 
 
 		<ui:define name="topbar">
 		<ui:define name="topbar">

code/MoyaWeb/WebContent/admin/port/index.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:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
+
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{barcodeView.initView}" />
+		</f:metadata>
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{readerListDataView.initView}" />
+		<f:event type="preRenderView" listener="#{readerList.initReaderList}" />
+		
+		</f:metadata>
+		<ui:define name="content">
+		<h:form>
+				<h:inputText name="barcode" value="#{barcodeView.barcode}" />
+				<h:commandButton action="#{barcodeView.readPortBarcode}" value="#{i18n['barcodeReader.readBarcode']}"/>
+		</h:form>
+		</ui:define>
+
+		<ui:define name="sidebar">
+		
+			
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/auth/login.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 	<title></title>
 </h:head>
 </h:head>
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/auth/loginError.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/cditools/login" 
 xmlns:login="http://java.sun.com/jsf/composite/cditools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 		<ui:define name="content">
 			<h1>#{i18n['loginerror.header']}</h1>
 			<h1>#{i18n['loginerror.header']}</h1>
 
 

code/MoyaWeb/WebContent/auth/loginSuccessRedirect.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 	<title></title>
 </h:head>
 </h:head>
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/auth/logout.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 >
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogout}" />
 			<f:event type="preRenderView" listener="#{authView.executeLogout}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/auth/logoutResponse.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 >
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 
 		<ui:define name="content">
 		<ui:define name="content">
 			<h:outputText value="#{i18n['login.logoutmessage']}" />
 			<h:outputText value="#{i18n['login.logoutmessage']}" />

code/MoyaWeb/WebContent/auth/passwordChanged.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 		<ui:define name="content">
 			<h1>#{i18n['passwordChanged.header']}</h1>
 			<h1>#{i18n['passwordChanged.header']}</h1>
 
 

code/MoyaWeb/WebContent/auth/resetmailSent.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 		<ui:define name="content">
 			<h1>#{i18n['resetmailSent.header']}</h1>
 			<h1>#{i18n['resetmailSent.header']}</h1>
 
 

code/MoyaWeb/WebContent/auth/userSessionList.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 >
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userSessionView.initView}" />
 			<f:event type="preRenderView" listener="#{userSessionView.initView}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/bill/billSummary.xhtml

@@ -4,7 +4,7 @@
 <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:bills="http://java.sun.com/jsf/composite/tools/bills"
 <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:bills="http://java.sun.com/jsf/composite/tools/bills"
 	xmlns:f="http://java.sun.com/jsf/core">
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{billListView.initSummaryView}" />
 			<f:event type="preRenderView" listener="#{billListView.initSummaryView}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/bill/edit.xhtml

@@ -3,7 +3,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://primefaces.org/ui"  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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://primefaces.org/ui"  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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />

code/MoyaWeb/WebContent/bill/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 >
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{billListView.initUsersBills}" />
 			<f:event type="preRenderView" listener="#{billListView.initUsersBills}" />

code/MoyaWeb/WebContent/bill/listAll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 >
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{billListView.initAllBills}" />
 			<f:event type="preRenderView" listener="#{billListView.initAllBills}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/bill/showBill.xhtml

@@ -6,7 +6,7 @@
 
 
 <h:body>
 <h:body>
 
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />

code/MoyaWeb/WebContent/card/massprint.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:p="http://primefaces.org/ui">
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{cardMassPrintView.initView}" />
 			<f:event type="preRenderView" listener="#{cardMassPrintView.initView}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/checkout/cancel.xhtml

@@ -5,7 +5,7 @@
 <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: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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/delayed.xhtml

@@ -5,7 +5,7 @@
 <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: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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/reject.xhtml

@@ -5,7 +5,7 @@
 <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: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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/return.xhtml

@@ -5,7 +5,7 @@
 <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: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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/eventorg/create.xhtml

@@ -4,7 +4,7 @@
 <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"
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{eventorgView.initCreate}" />
 			<f:event type="preRenderView" listener="#{eventorgView.initCreate}" />

code/MoyaWeb/WebContent/eventorg/edit.xhtml

@@ -4,7 +4,7 @@
 <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"
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.edit" />
 		<ui:param name="thispage" value="page.eventorg.edit" />
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="id" value="#{eventorgView.orgId}" />
 			<f:viewParam name="id" value="#{eventorgView.orgId}" />

code/MoyaWeb/WebContent/eventorg/editEvent.xhtml

@@ -4,7 +4,7 @@
 <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:p="http://primefaces.org/ui"
 <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:p="http://primefaces.org/ui"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="eventid" value="#{eventorgView.eventid}" />
 			<f:viewParam name="eventid" value="#{eventorgView.eventid}" />
 			<f:event type="preRenderView" listener="#{eventorgView.initEditEvent}" />
 			<f:event type="preRenderView" listener="#{eventorgView.initEditEvent}" />

code/MoyaWeb/WebContent/eventorg/list.xhtml

@@ -4,7 +4,7 @@
 <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"
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{eventorgView.initListView}" />
 			<f:event type="preRenderView" listener="#{eventorgView.initListView}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/feedback/index.xhtml

@@ -4,7 +4,7 @@
 <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"
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{feedbackView.initFeedback}" />
 			<f:event type="preRenderView" listener="#{feedbackView.initFeedback}" />

code/MoyaWeb/WebContent/food/foodShop.xhtml

@@ -4,7 +4,7 @@
 <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"
 <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">
 	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>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/food/shop.xhtml

@@ -4,7 +4,7 @@
 <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"
 <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/food" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:products="http://java.sun.com/jsf/composite/cditools/food" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
  			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/foodadmin/createTemplate.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 <h:body>
 	<ui:composition
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView"
 			<f:event type="preRenderView"
 				listener="#{foodWaveView.initCreateTemplate()}" />
 				listener="#{foodWaveView.initCreateTemplate()}" />

code/MoyaWeb/WebContent/foodadmin/editTemplate.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 <h:body>
 	<ui:composition
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodadmin/listTemplates.xhtml

@@ -10,7 +10,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 <h:body>
 	<ui:composition
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -3,7 +3,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
     "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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveManagerList}" />
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveManagerList}" />
 		</f:metadata>
 		</f:metadata>

code/MoyaWeb/WebContent/foodmanager/listOrders.xhtml

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" />
 			<f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" />
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodWaveOrderList}" />
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodWaveOrderList}" />