Skip to content

Linnea Samila / Moya

Go to a project
Commit 28ae8c9d by Petri Järvisalo
Options

Merge branch 'master' of codecrew.fi:bortal 

Conflicts:
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java
2 parents 55dbaf86 c09c5938
Inline Side-by-side
Showing with 420 additions and 1138 deletions
.gitignore
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
*.class *.class
.DS_Store .DS_Store
/code/LanBortal/EarContent/lib/LanBortalDatabase.jar /code/LanBortal/EarContent/lib/LanBortalDatabase.jar
/code/LanBortalDatabase/src/fi/insomnia/bortal/model/*_.java
*~ *~
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MailMessageBean.java
...@@ -25,10 +25,10 @@ import fi.insomnia.bortal.util.MailMessage; ...@@ -25,10 +25,10 @@ import fi.insomnia.bortal.util.MailMessage;
* Message-Driven Bean implementation class for: MailMessageBean * Message-Driven Bean implementation class for: MailMessageBean
* *
*/ */
@MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/mailque") @MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/bortalMailQueue")
public class MailMessageBean implements MessageListener { public class MailMessageBean implements MessageListener {
@Resource(name = "mail/lanbortal") @Resource(name = "mail/bortal")
private Session mailSession; private Session mailSession;
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory
.getLogger(MailMessageBean.class); .getLogger(MailMessageBean.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UtilBean.java
...@@ -53,9 +53,9 @@ public class UtilBean implements UtilBeanLocal { ...@@ -53,9 +53,9 @@ public class UtilBean implements UtilBeanLocal {
public UtilBean() { public UtilBean() {
} }
@Resource(name = "jmsQueue", mappedName = "jms/mailque") @Resource(name = "jmsQueue", mappedName = "jms/bortalMailQueue")
private Queue mailQueue; private Queue mailQueue;
@Resource(name = "connFactory", mappedName = "jms/mailconnectionfactory") @Resource(name = "connFactory", mappedName = "jms/mailConnectionFactory")
private QueueConnectionFactory mailQuefactory; private QueueConnectionFactory mailQuefactory;
@EJB @EJB
private UserFacade userfacade; private UserFacade userfacade;
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/clientutils/BortalLocalContextHolder.java
...@@ -3,6 +3,9 @@ package fi.insomnia.bortal.clientutils; ...@@ -3,6 +3,9 @@ package fi.insomnia.bortal.clientutils;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -15,6 +18,8 @@ public class BortalLocalContextHolder { ...@@ -15,6 +18,8 @@ public class BortalLocalContextHolder {
private String hostname; private String hostname;
private boolean ssl = false; private boolean ssl = false;
private Integer hostnameId; private Integer hostnameId;
private LoginContext loginContext;
private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>(); private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>();
...@@ -30,6 +35,7 @@ public class BortalLocalContextHolder { ...@@ -30,6 +35,7 @@ public class BortalLocalContextHolder {
super(); super();
this.hostname = old.hostname; this.hostname = old.hostname;
this.ssl = old.ssl; this.ssl = old.ssl;
this.loginContext = old.loginContext;
} }
public static void setHostname(String hostname) { public static void setHostname(String hostname) {
...@@ -73,7 +79,6 @@ public class BortalLocalContextHolder { ...@@ -73,7 +79,6 @@ public class BortalLocalContextHolder {
public static void setPermission(IAppPermission permission, Boolean value) { public static void setPermission(IAppPermission permission, Boolean value) {
getThread().rightcache.put(permission, value); getThread().rightcache.put(permission, value);
} }
public static BortalLocalContextHolder getInstance() { public static BortalLocalContextHolder getInstance() {
...@@ -111,4 +116,31 @@ public class BortalLocalContextHolder { ...@@ -111,4 +116,31 @@ public class BortalLocalContextHolder {
} }
THREAD_WITH_CONTEXT.set(new BortalLocalContextHolder(contextHolder)); THREAD_WITH_CONTEXT.set(new BortalLocalContextHolder(contextHolder));
} }
public void setLoginContext(LoginContext loginContext) {
this.loginContext = loginContext;
}
public LoginContext getLoginContext() {
return loginContext;
}
public boolean executeLogin() {
try {
this.loginContext.login();
System.err.println("execute login");
return true;
} catch (LoginException e) {
return false;
}
}
public void executeLogout() {
try {
this.loginContext.logout();
System.err.println("execute logout");
} catch(Exception e) {
}
}
} }
\ No newline at end of file
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java deleted 100644 → 0
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-06T14:32:34.709+0300")
@StaticMetamodel(AccountEvent.class)
public class AccountEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<AccountEvent, Boolean> cash;
public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
public static volatile SingularAttribute<AccountEvent, Product> product;
public static volatile SingularAttribute<AccountEvent, EventUser> user;
public static volatile SingularAttribute<AccountEvent, EventUser> seller;
public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
public static volatile SingularAttribute<AccountEvent, Bill> bill;
public static volatile SingularAttribute<AccountEvent, String> description;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java deleted 100644 → 0
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-06T14:32:34.771+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 deleted 100644 → 0
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-06T14:32:34.752+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 deleted 100644 → 0
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-06T14:32:34.785+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 deleted 100644 → 0
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-06T14:32:34.831+0300")
@StaticMetamodel(BillLine.class)
public class BillLine_ extends GenericEntity_ {
public static volatile SingularAttribute<BillLine, Bill> bill;
public static volatile SingularAttribute<BillLine, String> name;
public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
public static volatile SingularAttribute<BillLine, String> unitName;
public static volatile SingularAttribute<BillLine, BigDecimal> vat;
public static volatile SingularAttribute<BillLine, Product> lineProduct;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java deleted 100644 → 0
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-06T14:32:34.803+0300")
@StaticMetamodel(Bill.class)
public class Bill_ extends GenericEntity_ {
public static volatile SingularAttribute<Bill, LanEvent> event;
public static volatile SingularAttribute<Bill, Date> paidDate;
public static volatile SingularAttribute<Bill, Integer> billNumber;
public static volatile SingularAttribute<Bill, String> addr1;
public static volatile SingularAttribute<Bill, String> addr2;
public static volatile SingularAttribute<Bill, String> addr3;
public static volatile SingularAttribute<Bill, String> addr4;
public static volatile SingularAttribute<Bill, String> addr5;
public static volatile SingularAttribute<Bill, Calendar> sentDate;
public static volatile SingularAttribute<Bill, Integer> paymentTime;
public static volatile SingularAttribute<Bill, String> noticetime;
public static volatile SingularAttribute<Bill, String> theirReference;
public static volatile SingularAttribute<Bill, String> ourReference;
public static volatile SingularAttribute<Bill, String> deliveryTerms;
public static volatile SingularAttribute<Bill, Integer> delayIntrest;
public static volatile SingularAttribute<Bill, String> notes;
public static volatile ListAttribute<Bill, BillLine> billLines;
public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
public static volatile SingularAttribute<Bill, EventUser> user;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java deleted 100644 → 0
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-06T14:32:34.842+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 deleted 100644 → 0
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-06T14:32:34.916+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 deleted 100644 → 0
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-06T14:32:34.933+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 deleted 100644 → 0
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-06T14:32:34.896+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 deleted 100644 → 0
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-06T14:32:34.873+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 deleted 100644 → 0
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-06T14:32:34.966+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 deleted 100644 → 0
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-06T14:32:34.950+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 deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T14:32:34.985+0300")
@StaticMetamodel(EntityEquals.class)
public class EntityEquals_ {
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java deleted 100644 → 0
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-06T14:32:35.002+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 deleted 100644 → 0
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-06T14:32:35.013+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 deleted 100644 → 0
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-06T14:32:35.034+0300")
@StaticMetamodel(EventUser.class)
public class EventUser_ extends GenericEntity_ {
public static volatile SingularAttribute<EventUser, User> user;
public static volatile SingularAttribute<EventUser, LanEvent> event;
public static volatile ListAttribute<EventUser, Vote> votes;
public static volatile ListAttribute<EventUser, UserNote> notes;
public static volatile ListAttribute<EventUser, Role> roles;
public static volatile ListAttribute<EventUser, CompoEntryParticipant> compoEntryParticipants;
public static volatile ListAttribute<EventUser, CompoEntry> compoEntries;
public static volatile ListAttribute<EventUser, PlaceGroup> placeGroups;
public static volatile ListAttribute<EventUser, GroupMembership> groupMemberships;
public static volatile ListAttribute<EventUser, Place> currentPlaces;
public static volatile ListAttribute<EventUser, PrintedCard> printedCards;
public static volatile ListAttribute<EventUser, AccountEvent> accountEvents;
public static volatile ListAttribute<EventUser, Bill> bills;
public static volatile ListAttribute<EventUser, AccountEvent> soldItems;
public static volatile ListAttribute<EventUser, PollAnswer> pollAnswers;
public static volatile SingularAttribute<EventUser, EventUser> creator;
public static volatile SingularAttribute<EventUser, Date> eventuserCreated;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java deleted 100644 → 0
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-06T14:32:35.056+0300")
@StaticMetamodel(FoodWaveTemplate.class)
public class FoodWaveTemplate_ extends GenericEntity_ {
public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
public static volatile SingularAttribute<FoodWaveTemplate, String> name;
public static volatile SingularAttribute<FoodWaveTemplate, String> description;
public static volatile ListAttribute<FoodWaveTemplate, Product> products;
public static volatile ListAttribute<FoodWaveTemplate, FoodWave> foodwaves;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java deleted 100644 → 0
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-06T14:32:35.046+0300")
@StaticMetamodel(FoodWave.class)
public class FoodWave_ extends GenericEntity_ {
public static volatile SingularAttribute<FoodWave, String> name;
public static volatile SingularAttribute<FoodWave, String> description;
public static volatile SingularAttribute<FoodWave, Calendar> time;
public static volatile SingularAttribute<FoodWave, Boolean> closed;
public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java deleted 100644 → 0
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-06T14:32:35.065+0300")
@StaticMetamodel(GenericEntity.class)
public class GenericEntity_ extends EntityEquals_ {
public static volatile SingularAttribute<GenericEntity, Integer> id;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java deleted 100644 → 0
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-06T14:32:35.078+0300")
@StaticMetamodel(GroupMembership.class)
public class GroupMembership_ extends GenericEntity_ {
public static volatile SingularAttribute<GroupMembership, String> inviteToken;
public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
public static volatile SingularAttribute<GroupMembership, String> inviteName;
public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
public static volatile SingularAttribute<GroupMembership, EventUser> user;
public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java deleted 100644 → 0
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-06T14:32:35.115+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 deleted 100644 → 0
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-06T14:32:15.127+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 deleted 100644 → 0
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-06T14:32:35.127+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 deleted 100644 → 0
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-06T14:32:35.088+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 deleted 100644 → 0
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-06T14:32:35.138+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 deleted 100644 → 0
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-06T14:32:35.159+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 deleted 100644 → 0
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-06T14:32:35.154+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 deleted 100644 → 0
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-06T14:32:35.179+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 deleted 100644 → 0
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-06T14:32:35.174+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 deleted 100644 → 0
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-06T14:32:35.198+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 deleted 100644 → 0
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-06T14:32:35.193+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 deleted 100644 → 0
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-06T14:32:35.209+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 deleted 100644 → 0
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-06T14:32:35.220+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 deleted 100644 → 0
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-06T14:32:35.246+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 deleted 100644 → 0
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-06T14:32:35.232+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 deleted 100644 → 0
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-06T14:32:35.270+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 deleted 100644 → 0
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-06T14:32:35.275+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 deleted 100644 → 0
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-06T14:32:35.259+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 deleted 100644 → 0
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-06T14:32:35.292+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 deleted 100644 → 0
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-06T14:32:35.300+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 deleted 100644 → 0
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-06T14:32:35.323+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 deleted 100644 → 0
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-10-06T14:32:35.312+0300")
@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, BigDecimal> price;
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, 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 deleted 100644 → 0
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-06T14:32:35.350+0300")
@StaticMetamodel(ReaderEvent.class)
public class ReaderEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<ReaderEvent, Calendar> time;
public static volatile SingularAttribute<ReaderEvent, Calendar> updatetime;
public static volatile SingularAttribute<ReaderEvent, String> value;
public static volatile SingularAttribute<ReaderEvent, String> notes;
public static volatile SingularAttribute<ReaderEvent, Integer> gamePoint;
public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
public static volatile SingularAttribute<ReaderEvent, Reader> reader;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.model.salespoint.SalesEntity;
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-06T14:32:35.338+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, 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 deleted 100644 → 0
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-06T14:32:35.359+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 deleted 100644 → 0
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-06T14:32:35.400+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 deleted 100644 → 0
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-06T14:32:35.422+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 deleted 100644 → 0
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-06T14:32:35.435+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 deleted 100644 → 0
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-06T14:32:35.412+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 deleted 100644 → 0
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-06T14:32:35.446+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
>>>>>>>>>>>>>>>>>>>> File 1
package fi.insomnia.bortal.model.salespoint; package fi.insomnia.bortal.model.salespoint;
import fi.insomnia.bortal.model.GenericEntity_; import fi.insomnia.bortal.model.GenericEntity_;
...@@ -16,3 +17,42 @@ public class SalesEntity_ extends GenericEntity_ { ...@@ -16,3 +17,42 @@ public class SalesEntity_ extends GenericEntity_ {
public static volatile SingularAttribute<SalesEntity, Reader> reader; public static volatile SingularAttribute<SalesEntity, Reader> reader;
public static volatile SingularAttribute<SalesEntity, Salespoint> point; public static volatile SingularAttribute<SalesEntity, Salespoint> point;
} }
>>>>>>>>>>>>>>>>>>>> File 2
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-06T13:36:55.176+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;
}
>>>>>>>>>>>>>>>>>>>> File 3
package fi.insomnia.bortal.model.salespoint;
import fi.insomnia.bortal.model.GenericEntity_;
import fi.insomnia.bortal.model.Reader;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:42:26.959+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
>>>>>>>>>>>>>>>>>>>> File 1
package fi.insomnia.bortal.model.salespoint; package fi.insomnia.bortal.model.salespoint;
import fi.insomnia.bortal.model.GenericEntity_; import fi.insomnia.bortal.model.GenericEntity_;
...@@ -15,3 +16,40 @@ public class Salespoint_ extends GenericEntity_ { ...@@ -15,3 +16,40 @@ public class Salespoint_ extends GenericEntity_ {
public static volatile SingularAttribute<Salespoint, String> description; public static volatile SingularAttribute<Salespoint, String> description;
public static volatile ListAttribute<Salespoint, SalesEntity> entities; public static volatile ListAttribute<Salespoint, SalesEntity> entities;
} }
>>>>>>>>>>>>>>>>>>>> File 2
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-06T13:36:55.186+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;
}
>>>>>>>>>>>>>>>>>>>> File 3
package fi.insomnia.bortal.model.salespoint;
import fi.insomnia.bortal.model.GenericEntity_;
import fi.insomnia.bortal.model.LanEvent;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:42:26.986+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/foodadmin/edit.xhtml
...@@ -6,29 +6,31 @@ ...@@ -6,29 +6,31 @@
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList()}" /> <f:event type="preRenderView" listener="#{foodWaveView.initEditTemplate()}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
<h1>#{i18n['foodwave.template.list.title']}</h1> <h1>#{i18n['foodwave.template.edit.title']}</h1>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:form>
<h:panelGrid columns="3">
<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
<h:inputText id="name" value="#{foodWaveView.template.name}" />
<h:message for="name" />
<h:dataTable var="templ" value="#{foodWaveView.templates}"> </h:panelGrid>
<h:column> <h:inputTextarea value="#{foodWaveView.template.description}" />
<h:outputText value="#{templ.name}" /> <h:commanButton action="#{foodWaveView.saveTemplate()}" value="#{i18n['foowavetemplate.save']}" />
</h:column> <h:commandButton action="#{foodWaveView.createFoodwave()}" value="#{i18n['foodwavetemplate.createFoodwave']}" />
<h:column> </h:form>
<h:link outcome="/foodadmin/editTemplate"> <ui:fragment >
<f:param value="#{templ.id}"/>
</h:link>
</h:column>
</h:dataTable>
</ui:define>
</ui:fragment>
</ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
</html> </html>
\ No newline at end of file
code/LanBortalWeb/WebContent/foodadmin/list.xhtml
...@@ -6,26 +6,29 @@ ...@@ -6,26 +6,29 @@
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList()}" /> <f:event type="preRenderView" listener="#{foodWaveView.initTemplateList()}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
<h1>#{i18n['foodwave.template.list.title']}</h1> <h1>#{i18n['foodwave.template.list.title']}</h1>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:dataTable var="templ" value="#{foodWaveView.templates}"> <h:dataTable var="templ" value="#{foodWaveView.templates}">
<h:column> <h:column>
<h:outputText value="#{templ.name}" /> <f:facet name="header">
</h:column> <h:outputText value="#{i18n['foodwaveTemplate.name']}" />
<h:column> </f:facet>
<h:link outcome="/foodadmin/editTemplate"> <h:outputText value="#{templ.name}" />
<f:param value="#{templ.id}"/> </h:column>
</h:link> <h:column>
</h:column> <h:link outcome="/foodadmin/editTemplate">
</h:dataTable> <f:param value="#{templ.id}" />
</h:link>
</h:column>
</h:dataTable>
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/place/edit.xhtml
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</h:dataTable> </h:dataTable>
</h:form> </h:form>
<h:form rendered="#{!empty placeView.place.group and not placeView.place.group.places.empty"> <h:form rendered="#{!empty placeView.place.group and !empty placeView.place.group.places}">
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputLabel value="#{i18n['placegroup.name']}:" /> <h:outputLabel value="#{i18n['placegroup.name']}:" />
<h:inputText value="#{placeView.place.group.name}" /> <h:inputText value="#{placeView.place.group.name}" />
......
code/LanBortalWeb/WebContent/resources/cditools/role/edit.xhtml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<h:outputText value="#{i18n['nasty.user']}" /> <h:outputText value="#{i18n['nasty.user']}" />
</f:facet> </f:facet>
<ui:include src="form.xhtml" /> <ui:include src="form.xhtml" />
<h:commandButton rendered="#{roleView.canWriteRoles()}" id="saverole" value="#{i18n['roleView.save']}" action="#{roleView.save}" /> <h:commandButton rendered="#{roleView.canWriteRoles}" id="saverole" value="#{i18n['roleView.save']}" action="#{roleView.save}" />
</h:form> </h:form>
</p> </p>
......
code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</h:column> </h:column>
<h:column> <h:column>
<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?user.id=#{user.id}')">#{i18n['user.edit']}</button> <button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{user.id}')">#{i18n['user.edit']}</button>
</h:column> </h:column>
<!-- <h:column> <!-- <h:column>
......
code/LanBortalWeb/WebContent/user/create.xhtml
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
<ui:define name="content"> <ui:define name="content">
<users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" /> <users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java
...@@ -24,8 +24,7 @@ import fi.insomnia.bortal.model.User; ...@@ -24,8 +24,7 @@ import fi.insomnia.bortal.model.User;
*/ */
public class HostnameFilter implements Filter { public class HostnameFilter implements Filter {
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory.getLogger(HostnameFilter.class);
.getLogger(HostnameFilter.class);
private boolean developmentMode = false; private boolean developmentMode = false;
private static final String HTTP_HOSTNAME_ID = "hostname_session_id"; private static final String HTTP_HOSTNAME_ID = "hostname_session_id";
......
code/LanBortalWeb/src/fi/insomnia/bortal/cmdline/Hello.java 0 → 100755
package fi.insomnia.bortal.cmdline;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import javax.ejb.EJB;
import fi.insomnia.bortal.beans.PermissionBeanLocal;
public class Hello implements ICommandlineCommand {
private PermissionBeanLocal permBean;
public Hello(PermissionBeanLocal permBean) {
this.permBean = permBean;
}
public int execute(String[] argv, InputStreamReader stdin, OutputStreamWriter stdout, OutputStreamWriter stderr) {
try {
if(argv.length != 2) {
stderr.write("usage: "+argv[0]+" <name>\r\n");
stderr.flush();
return 1;
} else {
String currentUser = permBean.getPrincipal();
if(currentUser.equals(argv[1])) {
stdout.write("hello, "+argv[1]+"\r\n");
} else {
stdout.write("you lie, "+currentUser+"!\r\n");
}
stdout.flush();
return 0;
}
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
return -1;
}
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/cmdline/ICommandlineCommand.java 0 → 100755
package fi.insomnia.bortal.cmdline;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
public interface ICommandlineCommand {
public int execute(String[] argv, InputStreamReader stdin, OutputStreamWriter stdout, OutputStreamWriter errstream);
}
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/BortalCommand.java
...@@ -6,6 +6,10 @@ import java.io.InputStreamReader; ...@@ -6,6 +6,10 @@ import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.HashMap;
import javax.annotation.PostConstruct;
import javax.security.auth.login.LoginException;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
import org.apache.sshd.server.Environment; import org.apache.sshd.server.Environment;
...@@ -14,20 +18,29 @@ import org.slf4j.Logger; ...@@ -14,20 +18,29 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder; import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.cmdline.Hello;
import fi.insomnia.bortal.cmdline.ICommandlineCommand;
public class BortalCommand implements Command, Runnable { public class BortalCommand implements Command, Runnable {
private static Logger logger = LoggerFactory.getLogger(BortalCommand.class); private static Logger logger = LoggerFactory.getLogger(BortalCommand.class);
private OutputStream errstream; private OutputStreamWriter errstream;
private ExitCallback exitCallback; private ExitCallback exitCallback;
private InputStreamReader instream; private InputStreamReader instream;
private OutputStreamWriter outstream; private OutputStreamWriter outstream;
private BortalLocalContextHolder contextHolder; private BortalLocalContextHolder contextHolder;
private Charset UTF8 = Charset.forName("UTF-8"); private Charset UTF8 = Charset.forName("UTF-8");
private HashMap<String, ICommandlineCommand> commandMap = new HashMap<String, ICommandlineCommand>();
public BortalCommand(BortalLocalContextHolder context) { public BortalCommand(BortalLocalContextHolder context) {
contextHolder = context; contextHolder = context;
} }
public BortalCommand addCommandlineCommand(String name, ICommandlineCommand c) {
this.commandMap.put(name, c);
return this;
}
@Override @Override
public void setInputStream(InputStream in) { public void setInputStream(InputStream in) {
...@@ -42,7 +55,7 @@ public class BortalCommand implements Command, Runnable { ...@@ -42,7 +55,7 @@ public class BortalCommand implements Command, Runnable {
@Override @Override
public void setErrorStream(OutputStream err) { public void setErrorStream(OutputStream err) {
errstream = err; errstream = new OutputStreamWriter(err, UTF8);
} }
@Override @Override
...@@ -59,16 +72,20 @@ public class BortalCommand implements Command, Runnable { ...@@ -59,16 +72,20 @@ public class BortalCommand implements Command, Runnable {
@Override @Override
public void destroy() { public void destroy() {
logger.info("destroying ssh command"); logger.info("destroying ssh command");
} }
@Override @Override
public void run() { public void run() {
BortalLocalContextHolder.copy(contextHolder); BortalLocalContextHolder.copy(contextHolder);
BortalLocalContextHolder.getInstance().executeLogin();
try { try {
logger.info("Created new bortalCommane"); logger.info("Created new bortalCommane");
outstream.write("Hello you..."); outstream.write("Hello you...");
StringBuilder cmdBuilder = new StringBuilder(); StringBuilder cmdBuilder = new StringBuilder();
// prime 0 return value
int returnValue = 0;
while (true) { while (true) {
if (!instream.ready()) { if (!instream.ready()) {
...@@ -78,9 +95,12 @@ public class BortalCommand implements Command, Runnable { ...@@ -78,9 +95,12 @@ public class BortalCommand implements Command, Runnable {
if (inchar == '\n' || inchar == '\r') if (inchar == '\n' || inchar == '\r')
{ {
outstream.write("\r\n# "); outstream.write("\r\n");
outstream.flush();
returnValue = parseCommand(cmdBuilder.toString());
outstream.write("[" + returnValue + "] " + BortalLocalContextHolder.getInstance().getLoginContext().getSubject().getPrincipals().iterator().next().getName() + " # ");
outstream.flush(); outstream.flush();
parseCommand(cmdBuilder.toString());
cmdBuilder = new StringBuilder(); cmdBuilder = new StringBuilder();
...@@ -99,14 +119,33 @@ public class BortalCommand implements Command, Runnable { ...@@ -99,14 +119,33 @@ public class BortalCommand implements Command, Runnable {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
BortalLocalContextHolder.getInstance().executeLogout();
exitCallback.onExit(3); exitCallback.onExit(3);
} }
private void parseCommand(String string) { private int parseCommand(String args) {
if (string != null && !string.isEmpty()) String[] argv = null;
{ if(args != null) {
logger.info("received command {}", string); if(args.length() == 0) return 0;
argv = args.split(" ");
}
if(argv != null && argv.length > 0) {
logger.info("received command {}", argv[0]);
ICommandlineCommand cmd;
if((cmd = this.commandMap.get(argv[0])) != null) {
return cmd.execute(argv,this.instream, this.outstream, this.errstream);
} else {
try {
this.errstream.write("unknown command\r\n");
this.errstream.flush();
} catch(IOException ioe) {}
return -1;
}
} else {
return 0;
} }
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/SshServlet.java
...@@ -22,7 +22,9 @@ import org.slf4j.Logger; ...@@ -22,7 +22,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder; import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.cmdline.Hello;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
/** /**
...@@ -33,12 +35,16 @@ public class SshServlet extends HttpServlet { ...@@ -33,12 +35,16 @@ public class SshServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(SshServlet.class); private static final Logger logger = LoggerFactory.getLogger(SshServlet.class);
private Map<Integer, SshServer> servers = new HashMap<Integer, SshServer>(); private Map<Integer, SshServer> servers = new HashMap<Integer, SshServer>();
// Timeout 30 min // Timeout 30 min
private static final String TIMEOUT = new Integer(1000 * 60 * 30).toString(); private static final String TIMEOUT = new Integer(1000 * 60 * 30).toString();
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
@EJB
private PermissionBeanLocal permBean;
/** /**
* @see HttpServlet#HttpServlet() * @see HttpServlet#HttpServlet()
*/ */
...@@ -58,8 +64,12 @@ public class SshServlet extends HttpServlet { ...@@ -58,8 +64,12 @@ public class SshServlet extends HttpServlet {
@Override @Override
public Command create() { public Command create() {
logger.info("creating new bortal command"); logger.info("creating new bortal command");
BortalCommand bc = new BortalCommand(context);
bc
.addCommandlineCommand("hello", new Hello(permBean))
.addCommandlineCommand("hallo", new Hello(permBean));
return new BortalCommand(context); return bc;
} }
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserCardServlet.java
...@@ -17,6 +17,14 @@ import javax.servlet.http.HttpServletResponse; ...@@ -17,6 +17,14 @@ import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.pdfjet.Box;
import com.pdfjet.CoreFont;
import com.pdfjet.Image;
import com.pdfjet.ImageType;
import com.pdfjet.PDF;
import com.pdfjet.Page;
import com.pdfjet.TextLine;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal; import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.PermissionBeanLocal; import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
...@@ -51,7 +59,8 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -51,7 +59,8 @@ public class UserCardServlet extends GenericImageServlet {
@EJB @EJB
private transient CardTemplateBeanLocal cardbean; private transient CardTemplateBeanLocal cardbean;
private static final Logger logger = LoggerFactory.getLogger(UserCardServlet.class); private static final Logger logger = LoggerFactory
.getLogger(UserCardServlet.class);
@Override @Override
protected ImageMover getImagedata() { protected ImageMover getImagedata() {
...@@ -63,37 +72,40 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -63,37 +72,40 @@ public class UserCardServlet extends GenericImageServlet {
if (card != null) { if (card != null) {
if (!permbean.isCurrentUser(card.getUser()) if (!permbean.isCurrentUser(card.getUser())
&& !permbean.hasPermission(UserPermission.MODIFY) && !permbean.hasPermission(UserPermission.MODIFY)
&& !lhMatcher.matcher(request.getLocalAddr()).matches()) && !lhMatcher.matcher(request.getLocalAddr()).matches()) {
{
ret.setResponse(HttpServletResponse.SC_FORBIDDEN); ret.setResponse(HttpServletResponse.SC_FORBIDDEN);
} } else {
else
{
try { try {
ret.setData(mkCard(card)); ret.setData(mkCard(card));
ret.setImagetype("image/jpeg"); // ret.setImagetype("image/jpeg");
ret.setImagetype("application/pdf");
} catch (IOException e) { } catch (IOException e) {
ret.setResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); ret.setResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} catch (Exception e) {
ret.setResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
e.printStackTrace();
} }
} }
} else } else {
{
ret.setResponse(HttpServletResponse.SC_NOT_FOUND); ret.setResponse(HttpServletResponse.SC_NOT_FOUND);
} }
return ret; return ret;
} }
private byte[] mkCard(PrintedCard card) throws IOException { private byte[] mkCardJpeg(PrintedCard card) throws IOException {
EventUser user = card.getUser(); EventUser user = card.getUser();
BufferedImage face = ImageIO.read(new ByteArrayInputStream(user.getUser().getCurrentImage().getImageData())); BufferedImage face = ImageIO.read(new ByteArrayInputStream(user
.getUser().getCurrentImage().getImageData()));
BufferedImage base = ImageIO.read(new ByteArrayInputStream(card.getTemplate().getImage())); BufferedImage base = ImageIO.read(new ByteArrayInputStream(card
.getTemplate().getImage()));
BufferedImage outimage = new BufferedImage(base.getWidth(), base.getHeight(), BufferedImage.TYPE_INT_RGB); BufferedImage outimage = new BufferedImage(base.getWidth(),
base.getHeight(), BufferedImage.TYPE_INT_RGB);
Graphics2D g = outimage.createGraphics(); Graphics2D g = outimage.createGraphics();
// g.drawImage(org, AffineTransform.getScaleInstance(0.31, 0.31), null); // g.drawImage(org, AffineTransform.getScaleInstance(0.31, 0.31), null);
...@@ -113,7 +125,8 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -113,7 +125,8 @@ public class UserCardServlet extends GenericImageServlet {
g.setFont(new Font("Century gothic", Font.BOLD, 45)); g.setFont(new Font("Century gothic", Font.BOLD, 45));
StringBuilder wholeName = new StringBuilder(); StringBuilder wholeName = new StringBuilder();
wholeName.append(user.getUser().getFirstnames()).append(" ").append(user.getUser().getLastname()); wholeName.append(user.getUser().getFirstnames()).append(" ")
.append(user.getUser().getLastname());
// g.setFont(new Font("Arial", Font.BOLD, 35)); // g.setFont(new Font("Arial", Font.BOLD, 35));
// g.drawString(name, 595 - // g.drawString(name, 595 -
...@@ -125,10 +138,13 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -125,10 +138,13 @@ public class UserCardServlet extends GenericImageServlet {
g.drawString(wholeName.toString(), 60, 865); g.drawString(wholeName.toString(), 60, 865);
g.drawString(card.getTemplate().getName(), 60, 915); g.drawString(card.getTemplate().getName(), 60, 915);
String barcodeString = String.valueOf(user.getUser().getCreated().getTime().getTime()); String barcodeString = String.valueOf(user.getUser().getCreated()
.getTime().getTime());
barcodeString = barcodeString.substring(barcodeString.length() - 12); barcodeString = barcodeString.substring(barcodeString.length() - 12);
BufferedImage image = ImageIO.read(BarcodeUtils.getBarcodeEAN(barcodeString)); BufferedImage image = ImageIO.read(BarcodeUtils
g.drawImage(image, 0, base.getHeight() - 120, base.getWidth(), 120, null); .getBarcodeEAN(barcodeString));
g.drawImage(image, 0, base.getHeight() - 120, base.getWidth(), 120,
null);
g.dispose(); g.dispose();
...@@ -137,4 +153,102 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -137,4 +153,102 @@ public class UserCardServlet extends GenericImageServlet {
ImageIO.write(outimage, "jpeg", ostr); ImageIO.write(outimage, "jpeg", ostr);
return ostr.toByteArray(); return ostr.toByteArray();
} }
// 300 dpi, 1016 px pituus, 648 px leveys,
// 85,5 mm x 54,0 mm
private byte[] mkCard(PrintedCard card) throws Exception {
EventUser user = card.getUser();
BufferedImage cardBackground = ImageIO.read(new ByteArrayInputStream(
card.getTemplate().getImage()));
BufferedImage faceBufferedImage = ImageIO
.read(new ByteArrayInputStream(user.getUser().getCurrentImage()
.getImageData()));
// double[] pageSize = new double[] { cardBackground.getWidth(),
// cardBackground.getHeight() };
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PDF pdf = new PDF(outputStream);
pdf.setTitle("CARD");
double pagex = 155.52; // 54,0 mm
double pagey = 243.84; // 85,5 mm
Page page = new Page(pdf, new double[] { pagex, pagey });
// Render background image
Image templateImage = new Image(pdf,
convertBufferedImageToPng(cardBackground), ImageType.PNG);
templateImage.setPosition(0, 0);
templateImage.scaleBy(0.245);
templateImage.drawOn(page);
// Render face image
Image faceImage = new Image(pdf,
convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
faceImage.setPosition(15.5, 70.0);
faceImage.scaleBy(0.32);
faceImage.drawOn(page);
// Render texts
// Big font for nick
com.pdfjet.Font nickFont = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
nickFont.setSize(16.0);
// User nick text
TextLine nickTextLine = new TextLine(nickFont);
nickTextLine.setText(user.getUser().getNick());
nickTextLine.setPosition(19.0, 193.0);
nickTextLine.setColor(new double[] {1.0, 1.0, 1.0});
nickTextLine.drawOn(page);
// Smaller font
com.pdfjet.Font font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
font.setSize(10.0);
// Full name text
String wholeName = user.getUser().getFirstnames() + " "
+ user.getUser().getLastname();
TextLine wholeNameText = new TextLine(font);
wholeNameText.setText(wholeName);
wholeNameText.setPosition(17.0, 212.0);
wholeNameText.setColor(new double[] {1.0, 1.0, 1.0});
wholeNameText.drawOn(page);
// Role text
TextLine roleTextLine = new TextLine(font);
roleTextLine.setText(card.getTemplate().getName());
roleTextLine.setPosition(17.0, 223.0);
roleTextLine.setColor(new double[] {1.0, 1.0, 1.0});
roleTextLine.drawOn(page);
// Barcode
String barcodeString = String.valueOf(user.getUser().getCreated()
.getTime().getTime());
barcodeString = barcodeString.substring(barcodeString.length() - 12);
BufferedImage barCodeBufferedImage = ImageIO.read(BarcodeUtils
.getBarcodeEAN(barcodeString));
Image barCodeImage = new Image(pdf,
convertBufferedImageToPng(barCodeBufferedImage), ImageType.PNG);
barCodeImage.setPosition(0.0, 243.5);
barCodeImage.scaleBy(0.7);
barCodeImage.drawOn(page);
// Write out the pdf
pdf.flush();
outputStream.close();
return outputStream.toByteArray();
}
private ByteArrayInputStream convertBufferedImageToPng(BufferedImage img)
throws IOException {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
ImageIO.write(img, "png", outStream);
outStream.close();
return new ByteArrayInputStream(outStream.toByteArray());
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java
...@@ -24,14 +24,24 @@ public class FoodWaveView extends GenericCDIView { ...@@ -24,14 +24,24 @@ public class FoodWaveView extends GenericCDIView {
{ {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS)) if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS))
{ {
templates = new ListDataModel<FoodWaveTemplate>(foodwaveBean.getTemplates()); setTemplates(new ListDataModel<FoodWaveTemplate>(foodwaveBean.getTemplates()));
super.beginConversation();
}
}
public void initEditTemplate()
{
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
{
super.beginConversation(); super.beginConversation();
} }
} }
public void initCreateTemplate() public void initCreateTemplate()
{ {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && getTemplate() == null) if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
{ {
setTemplate(new FoodWaveTemplate()); setTemplate(new FoodWaveTemplate());
super.beginConversation(); super.beginConversation();
...@@ -40,7 +50,7 @@ public class FoodWaveView extends GenericCDIView { ...@@ -40,7 +50,7 @@ public class FoodWaveView extends GenericCDIView {
public String editTemplate() public String editTemplate()
{ {
setTemplate(templates.getRowData()); setTemplate(getTemplates().getRowData());
return "/foodadmin/editTemplate"; return "/foodadmin/editTemplate";
} }
...@@ -58,4 +68,12 @@ public class FoodWaveView extends GenericCDIView { ...@@ -58,4 +68,12 @@ public class FoodWaveView extends GenericCDIView {
this.template = template; this.template = template;
} }
public ListDataModel<FoodWaveTemplate> getTemplates() {
return templates;
}
public void setTemplates(ListDataModel<FoodWaveTemplate> templates) {
this.templates = templates;
}
} }
glassfishin_asennus.txt deleted 100644 → 0
bortal realmin lisääminen glassfishiin.
1. Lisää code/LanBortalAuthModule.jar tiedosto hakemistoon glassfish/glassfish/domains/domain1/lib/
2. Lisää postgres JDBC library glassfish/glassfish/lib/ hakemistoon
3. lisää tiedostoon glassfish/glassfish/domains/domain1/config/login.conf tiedostoon:
bortalRealm {
fi.insomnia.bortal.BortalLoginModule required;
};
############
Huom! Lue komennot läpi ja muokkaa muuttujat sopiviksi!
############
4. suorita seuraavat komennot hakemistossa glassfish/glassfish/bin/
# ./asadmin create-auth-realm --classname fi.insomnia.bortal.BortalRealm --property jaas-context=bortalRealm omniarealm
#
# ./asadmin create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGConnectionPoolDataSource --restype javax.sql.ConnectionPoolDataSource --ping true --property URL=jdbc\\:postgresql\\:omnia:DatabaseName=omnia:Password=abcdef123:User=omnia OmniaPool
5. Lisää JDBC resource jdbc/bortal connection poolille Omniapossu wepikälistä.
./asadmin create-jdbc-resource --connectionpoolid OmniaPool jdbc/bortal
6. Debug-tulosteet fi namespacesta saa näkyviin seuraavasti:
# echo fi.level=FINEST >> glassfish/domains/domain1/config/logging.properties
7. Lisää mailipalvelin.
./asadmin --interactive=false create-javamail-resource --mailhost=localhost --mailuser=bortal --fromaddress=info@insomnia.fi --enabled=true --description="Bortal" --storeprotocol=imap --storeprotocolclass=com.sun.mail.imap.IMAPStore --transprotocol smtp --transprotocolclass com.sun.mail.smtp.SMTPTransport --property mail.smtp.port=25 mail/lanbortal
8. Ainakin linuxissa pitää javalle antaa lisäkomentona:
# ./asadmin create-jvm-options -Djava.awt.headless=true
9. Lisää JMS connection factory ( Resources -> JMS Resources -> Connection Factory )
Pool name: jms/mailconnectionfactory
Resource type: javax.jms.QueueConnectionFactory
./asadmin create-jms-resource --restype javax.jms.QueueConnectionFactory jms/mailconnectionfactory
10. Lisää JMS Destination Resource ( Resources -> JMS Resources -> Destination Resources )
### JOKO ###
JNDI Name: jms/mailque
Physical destinatino name: mailque
Resource type: javax.jms.Queue
### TAI ###
./asadmin create-jms-resource --restype javax.jms.Queue --property Name=mailque jms/mailque
11. (OPTIONAL) Jos haluat JK-connectorin käyttöön apachen kanssa:
Configurations -> Server-config -> Network Config -> http-listner1 -> JK Listener ON
12. Glassfish Default Principal to Role Mapping
HUOM! 403 asioista, ellei tätä ole ruksittu:
Configurations -> server-config -> Security -> Default Principal To Role Mapping -> Enabled
13. Käynnistä glassfish uudelleen että kaikki asetukset tulevat voimaan...
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!