Skip to content

Max Mecklin / Moya

Go to a project
Commit bc1828ec by Tuomas Riihimäki
Options

Hups.. vois välillä commitoida

1 parent 0f3efc5f
Inline Side-by-side
Showing with 2588 additions and 1255 deletions
code/KagAuthModule.jar 0 → 100644
No preview for this file type
code/LanBortalAuthModule/src/fi/insomnia/bortal/BortalLoginModule.java
...@@ -68,7 +68,8 @@ public class BortalLoginModule extends AppservPasswordLoginModule { ...@@ -68,7 +68,8 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
protected void authenticateUser() throws LoginException { protected void authenticateUser() throws LoginException {
log((new StringBuilder()).append("CustomRealm Auth Info:_username:") log((new StringBuilder()).append("CustomRealm Auth Info:_username:")
.append(_username).append(";_password:").append(_passwd) .append(_username)
//.append(";_password:").append(_passwd)
.append(";_currentrealm:").append(_currentRealm).toString()); .append(";_currentrealm:").append(_currentRealm).toString());
// Check if the given realm is SampleRealm // Check if the given realm is SampleRealm
......
code/LanBortalAuthModule/src/fi/insomnia/bortal/BortalRealm.java
...@@ -74,7 +74,7 @@ public class BortalRealm extends AppservRealm { ...@@ -74,7 +74,7 @@ public class BortalRealm extends AppservRealm {
public void init(Properties properties) public void init(Properties properties)
throws BadRealmException, NoSuchRealmException { throws BadRealmException, NoSuchRealmException {
super.init(properties); super.init(properties);
log("Init SampleRealm"); log("Init BortalRealm");
String propJaasContext = properties.getProperty(JAAS_CONTEXT_PARAM); String propJaasContext = properties.getProperty(JAAS_CONTEXT_PARAM);
if (propJaasContext != null) { if (propJaasContext != null) {
......
code/LanBortalAuthModuleClient/.classpath
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)">
<attributes>
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalAuthModuleClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/AccountEventBean.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.facade.AccountEventFacade;
import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.EventPk;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
/**
* Session Bean implementation class AccountEventBean
*/
@Stateless
public class AccountEventBean implements AccountEventBeanLocal {
@EJB
private AccountEventFacade accountfacade;
@EJB
private UserBeanLocal userbean;
@EJB
private SecurityBeanLocal sessionbean;
@EJB
private EventBeanLocal eventBean;
public AccountEventBean() {
super();
}
@Override
public AccountEvent merge(AccountEvent account) {
userbean.fatalPermission(Permission.ACCOUNT_MANAGEMENT, RolePermission.WRITE, "Error mergin account event", account);
return accountfacade.merge(account);
}
@Override
public void delete(AccountEvent account) {
userbean.fatalPermission(Permission.ACCOUNT_MANAGEMENT, RolePermission.WRITE, "Error deleting account event: ", account);
AccountEvent acco = accountfacade.find(account.getId());
sessionbean.logMessage(SecurityLogType.accountEvent, userbean.getCurrentUser(), "Deleting AccountEvent '", acco.getProduct().getName(), "' count: '", acco.getQuantity().toString(), "' unitprice: '", acco.getUnitPrice().toString(), "' accouser: '", acco.getUser().getLogin(), "'");
acco.getProduct().getAccountEvents().remove(acco);
if (acco.getBill() != null) {
acco.getBill().setAccountEvent(null);
}
acco.getUser().getAccountEvents().remove(acco);
accountfacade.remove(acco);
}
@Override
public AccountEvent find(EventPk id) {
return accountfacade.find(id);
}
@Override
public List<Role> getRolesFromAccountEvents(User u) {
return accountfacade.findProvidedRoles(eventBean.getCurrentEvent(), u);
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BarcodeBean.java
...@@ -6,12 +6,15 @@ import java.io.ByteArrayOutputStream; ...@@ -6,12 +6,15 @@ import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date; import java.util.Date;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.jbarcode.JBarcode; import org.jbarcode.JBarcode;
import org.jbarcode.JBarcodeFactory; import org.jbarcode.JBarcodeFactory;
import org.krysalis.barcode4j.BarcodeDimension;
import org.krysalis.barcode4j.BarcodeGenerator; import org.krysalis.barcode4j.BarcodeGenerator;
import org.krysalis.barcode4j.impl.code128.Code128Bean; import org.krysalis.barcode4j.impl.code128.Code128Bean;
import org.krysalis.barcode4j.impl.datamatrix.DataMatrixBean; import org.krysalis.barcode4j.impl.datamatrix.DataMatrixBean;
...@@ -26,6 +29,24 @@ import com.pdfjet.Page; ...@@ -26,6 +29,24 @@ import com.pdfjet.Page;
public class BarcodeBean { public class BarcodeBean {
public static InputStream getBarcode(String message) throws IOException {
// BarcodeGenerator bean = new DataMatrixBean();
BarcodeGenerator bean = new Code128Bean();
ByteArrayOutputStream out = new ByteArrayOutputStream();
// System.out.println("created: " + (new Date().getTime() - start));
BitmapCanvasProvider canvas = new BitmapCanvasProvider(
out, "image/png", 150, BufferedImage.TYPE_BYTE_BINARY, false, 0);
canvas.establishDimensions(new BarcodeDimension(200, 15));
bean.generateBarcode(canvas, message);
canvas.finish();
ByteArrayInputStream istream = new ByteArrayInputStream(out.toByteArray());
return istream;
}
public void barcode4j() throws FileNotFoundException, Exception { public void barcode4j() throws FileNotFoundException, Exception {
long start = new Date().getTime(); long start = new Date().getTime();
...@@ -40,10 +61,10 @@ public class BarcodeBean { ...@@ -40,10 +61,10 @@ public class BarcodeBean {
BitmapCanvasProvider canvas = new BitmapCanvasProvider( BitmapCanvasProvider canvas = new BitmapCanvasProvider(
out, "image/png", 150, BufferedImage.TYPE_BYTE_BINARY, false, 0); out, "image/png", 150, BufferedImage.TYPE_BYTE_BINARY, false, 0);
bean.generateBarcode(canvas, "Foobar Rairai"); bean.generateBarcode(canvas, "Foobar Rairai");
canvas.finish(); canvas.finish();
ByteArrayInputStream istream = new ByteArrayInputStream(out.toByteArray()); ByteArrayInputStream istream = new ByteArrayInputStream(out.toByteArray());
Image img = new Image(pdf, istream, ImageType.PNG); Image img = new Image(pdf, istream, ImageType.PNG);
...@@ -57,7 +78,7 @@ public class BarcodeBean { ...@@ -57,7 +78,7 @@ public class BarcodeBean {
} }
public String asdasd() throws FileNotFoundException, Exception { public String asdasd() throws FileNotFoundException, Exception {
long start = new Date().getTime(); long start = new Date().getTime();
JBarcode code = JBarcodeFactory.getInstance().createCode128(); JBarcode code = JBarcodeFactory.getInstance().createCode128();
System.out.println("pre CreateCode: " + (new Date().getTime() - start)); System.out.println("pre CreateCode: " + (new Date().getTime() - start));
...@@ -80,7 +101,6 @@ public class BarcodeBean { ...@@ -80,7 +101,6 @@ public class BarcodeBean {
Page page = new Page(pdf, A4.PORTRAIT); Page page = new Page(pdf, A4.PORTRAIT);
Image img = new Image(pdf, istream, ImageType.JPEG); Image img = new Image(pdf, istream, ImageType.JPEG);
img.drawOn(page); img.drawOn(page);
System.out.println("post draw: " + (new Date().getTime() - start)); System.out.println("post draw: " + (new Date().getTime() - start));
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardTemplateBean.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.facade.CardTemplateFacade;
import fi.insomnia.bortal.facade.PrintedCardFacade;
import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.util.MailMessage;
/**
* Session Bean implementation class CardTemplateBean
*/
@Stateless
public class CardTemplateBean implements CardTemplateBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(CardTemplateBean.class);
/**
* Default constructor.
*/
public CardTemplateBean() {
// TODO Auto-generated constructor stub
}
@EJB
private CardTemplateFacade cdFacade;
@EJB
private EventBeanLocal eventBean;
@EJB
private UserBeanLocal userbean;
@EJB
private PrintedCardFacade printedcardfacade;
@EJB
private UtilBeanLocal mailbean;
@EJB
private PlaceGroupBeanLocal pgbean;
public List<CardTemplate> findAll() {
userbean.fatalPermission(Permission.USER_MANAGEMENT, RolePermission.WRITE);
return cdFacade.findAll(eventBean.getCurrentEvent());
}
@Override
public void create(CardTemplate card) {
userbean.fatalPermission(Permission.USER_MANAGEMENT, RolePermission.WRITE);
cdFacade.create(card);
}
@Override
public CardTemplate findById(Integer id) {
userbean.fatalPermission(Permission.USER_MANAGEMENT, RolePermission.READ);
LanEvent ev = eventBean.getCurrentEvent();
return cdFacade.find(ev.getId(), id);
}
public void checkAllUsersCardRights() {
for (User u : userbean.getUsers()) {
checkPrintedCard(u);
}
}
public void checkPrintedCard(User user) {
LanEvent currEvent = eventBean.getCurrentEvent();
List<PrintedCard> myCards = printedcardfacade.findForUser(currEvent, user);
PrintedCard biggestCard = null;
PrintedCard smallestCard = null;
for (PrintedCard card : myCards) {
if (card.getEnabled()) {
if (biggestCard == null || biggestCard.getTemplate().getPower() < card.getTemplate().getPower()) {
biggestCard = card;
}
if (smallestCard == null || smallestCard.getTemplate().getPower() > card.getTemplate().getPower()) {
smallestCard = card;
}
}
}
CardTemplate roleCard = getUsersCardtype(user);
int existingPower = -999;
int newPower = -999;
if (roleCard != null) {
newPower = roleCard.getPower();
}
if (biggestCard != null) {
existingPower = biggestCard.getTemplate().getPower();
}
if (existingPower < newPower) {
if (biggestCard != null) {
biggestCard.setEnabled(false);
printedcardfacade.merge(biggestCard);
}
PrintedCard pc = new PrintedCard(currEvent);
pc.setTemplate(roleCard);
pc.setUser(user);
// user.getPrintedCards().add(pc);
printedcardfacade.create(pc);
logger.debug("User {} has too little power old role {} New role {}", new Object[] { user.getLogin(), existingPower, newPower });
} else if (existingPower > newPower) {
MailMessage msg = new MailMessage();
User admin = eventBean.getCurrentEvent().getOrganiser().getAdmin();
String adminmail = admin.getEmail();
msg.setFromAddress(adminmail);
msg.setFromName("Lippukauppa");
msg.setTo(admin);
msg.setSubject("User " + user.getLogin() + " has too powerful card!");
msg.setMessage("User ", user.getLogin(), "has too powerful card!\nCurrent power ", existingPower, ". Should be ", newPower, "\n\n-- \nLippukauppa");
mailbean.sendMail(msg);
logger.debug("User {} has too much power old role {} New role {}", new Object[] { user.getLogin(), existingPower, newPower });
} else {
logger.debug("User {} has power {} and roles has power {}", new Object[] { user.getLogin(), existingPower, newPower });
}
}
public CardTemplate getUsersCardtype(User user) {
List<Role> roles = userbean.findUsersRoles(user);
CardTemplate greatestTemplate = null;
for (Role listrole : roles) {
if (greatestTemplate == null || (listrole.getCardTemplate() != null && greatestTemplate.getPower() < listrole.getCardTemplate().getPower())) {
greatestTemplate = listrole.getCardTemplate();
}
}
return greatestTemplate;
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventBean.java
...@@ -82,6 +82,7 @@ public class EventBean implements EventBeanLocal { ...@@ -82,6 +82,7 @@ public class EventBean implements EventBeanLocal {
} }
public LanEvent getCurrentEvent() { public LanEvent getCurrentEvent() {
LanEvent ret = getEventByHostname(BortalLocalContextHolder.getHostname()); LanEvent ret = getEventByHostname(BortalLocalContextHolder.getHostname());
return ret; return ret;
...@@ -89,9 +90,8 @@ public class EventBean implements EventBeanLocal { ...@@ -89,9 +90,8 @@ public class EventBean implements EventBeanLocal {
@Override @Override
public LanEvent mergeChanges(LanEvent event) { public LanEvent mergeChanges(LanEvent event) {
//TODO: Hmm.. // TODO: Hmm..
if(!userBean.isCurrentUser(event.getOrganiser().getAdmin()) && !userBean.getCurrentUser().isSuperadmin()) if (!userBean.isCurrentUser(event.getOrganiser().getAdmin()) && !userBean.getCurrentUser().isSuperadmin()) {
{
throw new PermissionDeniedException(secubean, userBean.getCurrentUser(), "User tried to merge event: " + event + " without being admin of that group"); throw new PermissionDeniedException(secubean, userBean.getCurrentUser(), "User tried to merge event: " + event + " without being admin of that group");
} }
return eventFacade.merge(event); return eventFacade.merge(event);
...@@ -99,7 +99,7 @@ public class EventBean implements EventBeanLocal { ...@@ -99,7 +99,7 @@ public class EventBean implements EventBeanLocal {
@Override @Override
public void create(LanEvent event) { public void create(LanEvent event) {
//TODO: Hmm.. // TODO: Hmm..
if (!userBean.isCurrentUser(event.getOrganiser().getAdmin()) && !userBean.getCurrentUser().isSuperadmin()) { if (!userBean.isCurrentUser(event.getOrganiser().getAdmin()) && !userBean.getCurrentUser().isSuperadmin()) {
throw new PermissionDeniedException(secubean, userBean.getCurrentUser(), "User tried to create a new event for organiser " + event.getOrganiser() + " without being admin of that group"); throw new PermissionDeniedException(secubean, userBean.getCurrentUser(), "User tried to create a new event for organiser " + event.getOrganiser() + " without being admin of that group");
...@@ -108,9 +108,8 @@ public class EventBean implements EventBeanLocal { ...@@ -108,9 +108,8 @@ public class EventBean implements EventBeanLocal {
} }
public String flushCache() public String flushCache() {
{ return eventFacade.flushCache();
return eventFacade.flushCache();
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/JaasBean.java
...@@ -46,10 +46,10 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote { ...@@ -46,10 +46,10 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote {
if (user.checkPassword(password)) { if (user.checkPassword(password)) {
ret = user; ret = user;
} else { } else {
secubean.logMessage(SecurityLogType.permissionDenied, user, "Login failed: wrong password! "); secubean.logMessage(SecurityLogType.permissionDenied, user, "Login failed: wrong password for username ", username);
} }
} else { } else {
secubean.logMessage(SecurityLogType.permissionDenied, "Login failed: Username not found: " + username); secubean.logMessage(SecurityLogType.permissionDenied, null, "Login failed: Username not found: ", username);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MailMessageBean.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.io.UnsupportedEncodingException;
import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.ObjectMessage;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMessage.RecipientType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.util.MailMessage;
/**
* Message-Driven Bean implementation class for: MailMessageBean
*
*/
@MessageDriven(
activationConfig = { @ActivationConfigProperty(
propertyName = "destinationType", propertyValue = "javax.jms.Queue"
) },
mappedName = "jms/mailque")
public class MailMessageBean implements MessageListener {
@Resource(name = "mail/lanbortal")
private Session mailSession;
private static final Logger logger = LoggerFactory.getLogger(MailMessageBean.class);
/**
* Default constructor.
*/
public MailMessageBean() {
// TODO Auto-generated constructor stub
}
/**
* @see MessageListener#onMessage(Message)
*/
public void onMessage(Message message) {
MailMessage mailmsg = null;
try {
mailmsg = (MailMessage) ((ObjectMessage) message).getObject();
logger.debug("Got message {}", mailmsg.getToName());
MimeMessage msg = new MimeMessage(mailSession);
msg.setSubject(mailmsg.getSubject());
msg.setFrom(mailmsg.getFrom());
msg.setRecipient(RecipientType.TO, mailmsg.getTo());
msg.setText(mailmsg.getMessage(), mailmsg.getCharset());
Transport.send(msg);
} catch (JMSException e) {
logger.debug("Error receiving jms for {}", mailmsg, e);
} catch (MessagingException e) {
logger.debug("Unsupported encoding exception while sending mail to {}", mailmsg, e);
} catch (UnsupportedEncodingException e) {
logger.debug("Unsupported encoding exception while sending mail to {}", mailmsg, e);
}
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceBean.java
...@@ -23,6 +23,7 @@ import fi.insomnia.bortal.facade.GroupMembershipFacade; ...@@ -23,6 +23,7 @@ import fi.insomnia.bortal.facade.GroupMembershipFacade;
import fi.insomnia.bortal.facade.PlaceFacade; import fi.insomnia.bortal.facade.PlaceFacade;
import fi.insomnia.bortal.facade.PlaceGroupFacade; import fi.insomnia.bortal.facade.PlaceGroupFacade;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.EventPk;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
...@@ -239,4 +240,27 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -239,4 +240,27 @@ public class PlaceBean implements PlaceBeanLocal {
} }
@Override
public Place find(EventPk id) {
userbean.fatalPermission(Permission.MAP, RolePermission.READ, "error reading place ", id);
return placeFacade.find(id);
}
@Override
public void checkMemberships() {
List<Place> all = placeFacade.findAll(eventBean.getCurrentEvent());
for (Place p : all) {
if (p.getGroup() != null && p.getPlaceReserver() == null) {
LanEvent event = eventBean.getCurrentEvent();
String token = gmemfacade.createInviteToken(event);
GroupMembership gm = new GroupMembership(event, p.getGroup(), p, token);
p.getGroup().getMembers().add(gm);
p.setPlaceReserver(gm);
}
}
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceGroupBean.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
...@@ -10,6 +12,18 @@ import javax.ejb.Stateless; ...@@ -10,6 +12,18 @@ import javax.ejb.Stateless;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.pdfjet.A4;
import com.pdfjet.Box;
import com.pdfjet.CoreFont;
import com.pdfjet.Font;
import com.pdfjet.Image;
import com.pdfjet.ImageType;
import com.pdfjet.JPEGImage;
import com.pdfjet.PDF;
import com.pdfjet.PNGImage;
import com.pdfjet.Page;
import com.pdfjet.TextLine;
import fi.insomnia.bortal.enums.Permission; import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission; import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.exceptions.PermissionDeniedException; import fi.insomnia.bortal.exceptions.PermissionDeniedException;
...@@ -27,6 +41,7 @@ import fi.insomnia.bortal.model.User; ...@@ -27,6 +41,7 @@ import fi.insomnia.bortal.model.User;
public class PlaceGroupBean implements PlaceGroupBeanLocal { public class PlaceGroupBean implements PlaceGroupBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(PlaceGroupBean.class); private static final Logger logger = LoggerFactory.getLogger(PlaceGroupBean.class);
private static final int YSTART = 30;
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
...@@ -61,14 +76,23 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -61,14 +76,23 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
// } // }
@Override @Override
public List<GroupMembership> getMemberships(User user) { public List<GroupMembership> getMembershipsAndCreations(User user) {
userbean.fatalNotLoggedIn(); userbean.fatalNotLoggedIn();
List<GroupMembership> ret = gmemfacade.find(eventbean.getCurrentEvent(), user); List<GroupMembership> ret = gmemfacade.findMemberOrCreator(eventbean.getCurrentEvent(), user);
return ret; return ret;
} }
@Override
public List<GroupMembership> getMemberships(User user)
{
userbean.fatalNotLoggedIn();
List<GroupMembership> ret = gmemfacade.findMemberships(eventbean.getCurrentEvent(), user);
return ret;
}
@Override @Override
public boolean associateToToken(User user, String token) { public boolean associateToToken(User user, String token) {
token = token.trim();
userbean.fatalNotLoggedIn(); userbean.fatalNotLoggedIn();
GroupMembership mem = gmemfacade.findByToken(token); GroupMembership mem = gmemfacade.findByToken(token);
boolean ret = false; boolean ret = false;
...@@ -84,6 +108,62 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -84,6 +108,62 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
} }
@Override @Override
public void getGroupMembershipPdf(List<GroupMembership> memberships, OutputStream ostream) {
try {
PDF pdf = new PDF(ostream);
Font font = new Font(pdf, CoreFont.TIMES_ROMAN);
Font bigfont = new Font(pdf, CoreFont.TIMES_ROMAN);
bigfont.setSize(15);
Page page = new Page(pdf, A4.PORTRAIT);
int y = YSTART;
for (GroupMembership membership : memberships) {
if (y > 750) {
page = new Page(pdf, A4.PORTRAIT);
y = YSTART;
}
//
// PNGImage jpeg = new
// PNGImage(BarcodeBean.getBarcode(membership.getInviteToken()));
// logger.debug("Jpeg: " + jpeg.getWidth() + " h. " +
// jpeg.getHeight());
Image image = new Image(pdf, BarcodeBean.getBarcode(membership.getInviteToken()), ImageType.PNG);
image.scaleBy(0.8);
image.setPosition(50, y);
image.drawOn(page);
TextLine name = new TextLine(bigfont, membership.getPlaceReservation().getName());
name.setPosition(300, y + 10);
name.drawOn(page);
TextLine reserverLabel = new TextLine(font, "Varaaja: ");
reserverLabel.setPosition(300, y + 30);
reserverLabel.drawOn(page);
TextLine reserver = new TextLine(font, new StringBuilder(membership.getPlaceGroup().getCreator().getWholeName()).append(" (").append(membership.getPlaceGroup().getCreator().getNick()).append(")").toString());
reserver.setPosition(310, y + 45);
reserver.drawOn(page);
TextLine assoclabel = new TextLine(font, "Yhdistetty käyttäjään: ");
assoclabel.setPosition(300, y + 65);
assoclabel.drawOn(page);
TextLine assoc = new TextLine(font, ((membership.getUser() == null) ? "-----" : new StringBuilder(membership.getUser().getWholeName()).append(" (").append(membership.getUser().getNick()).append(")").toString()));
assoc.setPosition(310, y + 80);
assoc.drawOn(page);
y += 130;
}
pdf.flush();
} catch (Exception e) {
logger.info("Error getting printing group memberships", e);
}
}
@Override
public void releaseAndGenerateToken(GroupMembership gmem) { public void releaseAndGenerateToken(GroupMembership gmem) {
if (!userbean.getCurrentUser().equals(gmem.getPlaceGroup().getCreator()) || if (!userbean.getCurrentUser().equals(gmem.getPlaceGroup().getCreator()) ||
!userbean.hasCurrentUserPermission(Permission.MAP, RolePermission.WRITE)) { !userbean.hasCurrentUserPermission(Permission.MAP, RolePermission.WRITE)) {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductBean.java
...@@ -126,17 +126,17 @@ public class ProductBean implements ProductBeanLocal { ...@@ -126,17 +126,17 @@ public class ProductBean implements ProductBeanLocal {
AccountEvent ret = new AccountEvent(eventBean.getCurrentEvent(), user, product, unitPrice, quantity, Calendar.getInstance()); AccountEvent ret = new AccountEvent(eventBean.getCurrentEvent(), user, product, unitPrice, quantity, Calendar.getInstance());
ret.setDelivered(Calendar.getInstance()); ret.setDelivered(Calendar.getInstance());
ret.setSeller(userbean.getCurrentUser()); ret.setSeller(userbean.getCurrentUser());
// user.getAccountEvents().add(ret); // user.getAccountEvents().add(ret);
accounteventfacade.create(ret); accounteventfacade.create(ret);
LanEvent event = eventBean.getCurrentEvent(); LanEvent event = eventBean.getCurrentEvent();
// List<DiscountInstance> discountsArray = ret.getDiscountInstances(); // List<DiscountInstance> discountsArray = ret.getDiscountInstances();
for (Discount d : discounts) { for (Discount d : discounts) {
DiscountInstance discInst = new DiscountInstance(event, ret, d); DiscountInstance discInst = new DiscountInstance(event, ret, d);
// discountsArray.add(discInst); // discountsArray.add(discInst);
discountinstancefacade.create(discInst); discountinstancefacade.create(discInst);
} }
// userbean.mergeChanges(user); // userbean.mergeChanges(user);
accounteventfacade.evict(ret); accounteventfacade.evict(ret);
userFacade.evict(user); userFacade.evict(user);
...@@ -150,4 +150,6 @@ public class ProductBean implements ProductBeanLocal { ...@@ -150,4 +150,6 @@ public class ProductBean implements ProductBeanLocal {
public Product findById(int id) { public Product findById(int id) {
return productFacade.find(eventBean.getCurrentEvent().getId(), id); return productFacade.find(eventBean.getCurrentEvent().getId(), id);
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ReaderBean.java 0 → 100644
package fi.insomnia.bortal.beans;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import fi.insomnia.bortal.facade.ReaderFacade;
import fi.insomnia.bortal.model.Reader;
/**
* Session Bean implementation class ReaderBean
*/
@Stateless
public class ReaderBean implements ReaderBeanLocal {
@EJB
private ReaderFacade readerfacade;
@EJB
private EventBeanLocal eventbean;
@Override
public boolean checkTag(String ident, String tag, String hash) {
Reader reader = readerfacade.findByIdent(eventbean.getCurrentEvent(), ident);
boolean ret = false;
if(reader != null)
{
}
return ret;
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/SecurityBean.java
...@@ -35,55 +35,68 @@ public class SecurityBean implements SecurityBeanLocal { ...@@ -35,55 +35,68 @@ public class SecurityBean implements SecurityBeanLocal {
@Resource @Resource
UserTransaction utx; UserTransaction utx;
@Override // @Override
public LogEntry logPermissionDenied(User user, Exception exception) { // public LogEntry logPermissionDenied(User user, Exception exception) {
LogEntry entry = null; // LogEntry entry = null;
//
entry = logMessage(SecurityLogType.permissionDenied, user, exception.getMessage()); // entry = logMessage(SecurityLogType.permissionDenied, user,
logger.debug(entry.toString(), exception); // exception.getMessage());
// logger.debug(entry.toString(), exception);
return entry; //
// return entry;
} //
// }
public LogEntry logException(User user, Exception exception) { //
// public LogEntry logException(User user, Exception exception) {
LogEntry entry = logMessage(SecurityLogType.unknownException, user, exception.getMessage()); //
logger.debug(entry.toString(), exception); // LogEntry entry = logMessage(SecurityLogType.unknownException, user,
return entry; // exception.getMessage());
} // logger.debug(entry.toString(), exception);
// return entry;
public LogEntry logMessage(User user, String description) { // }
LogEntry entry = logMessage(SecurityLogType.genericMessage, user, description); //
// public LogEntry logMessage(User user, String... description) {
return entry; //
} // LogEntry entry = logMessage(SecurityLogType.genericMessage, user,
// toString(description));
public LogEntry logMessage(String description) { //
LogEntry entry = logMessage(SecurityLogType.genericMessage, description); // return entry;
return entry; // }
//
} // private static final String toString(String... desc) {
// StringBuilder msg = new StringBuilder();
public LogEntry logMessage(SecurityLogType type, String description) { // for (String msgpart : desc) {
return logMessage(type, null, description); // msg.append(msgpart);
} // }
// return msg.toString();
// }
//
public LogEntry logMessage(SecurityLogType paramType, User user, String description) { // public LogEntry logMessage(String... description) {
// LogEntry entry = logMessage(SecurityLogType.genericMessage,
// toString(description));
// return entry;
//
// }
// public LogEntry logPermissionDenied(User currentuser, String... message)
// {
// return logMessage(SecurityLogType.permissionDenied, currentuser,
// toString(message));
// }
public LogEntry logMessage(SecurityLogType paramType, User user, String... description) {
LogEntry entry = null; LogEntry entry = null;
try { try {
String desc = toString(description);
utx.begin(); utx.begin();
LogEntryType type = typeFacade.findOrCreate(paramType); LogEntryType type = typeFacade.findOrCreate(paramType);
entry = new LogEntry(Calendar.getInstance()); entry = new LogEntry(Calendar.getInstance());
entry.setType(type); entry.setType(type);
entry.setDescription(description); entry.setDescription(desc);
entry.setUser(user); entry.setUser(user);
entryFacade.create(entry); entryFacade.create(entry);
if (DEBUG) { if (DEBUG) {
logger.debug("SECURITY DEBUG: Type: \"{}\" user \"{}\", description \"{}\"", new String[] { paramType.name(), (user == null) ? "null" : user.getLogin(), description }); logger.debug("SECURITY DEBUG: Type: \"{}\" user \"{}\", description \"{}\"", new String[] { paramType.name(), (user == null) ? "null" : user.getLogin(), desc });
} }
utx.commit(); utx.commit();
} catch (Exception e) { } catch (Exception e) {
...@@ -92,16 +105,11 @@ public class SecurityBean implements SecurityBeanLocal { ...@@ -92,16 +105,11 @@ public class SecurityBean implements SecurityBeanLocal {
return entry; return entry;
} }
public LogEntry logPermissionDenied(User currentuser, String message) { private static final String toString(String... desc) {
return logMessage(SecurityLogType.permissionDenied, currentuser, message);
}
@Override
public LogEntry logMessage(User currentUser, String... message) {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
for (String msgpart : message) { for (String msgpart : desc) {
msg.append(msgpart); msg.append(msgpart);
} }
return logMessage(currentUser, msg.toString()); return msg.toString();
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java
...@@ -33,7 +33,6 @@ import fi.insomnia.bortal.model.EventMap; ...@@ -33,7 +33,6 @@ import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.BortalLocalContextHolder;
import fi.insomnia.bortal.utilities.apachecodec.binary.Base64; import fi.insomnia.bortal.utilities.apachecodec.binary.Base64;
/** /**
...@@ -73,14 +72,14 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -73,14 +72,14 @@ public class TestDataBean implements TestDataBeanLocal {
} }
public void writeMap( byte[] bytes) { public void writeMap(byte[] bytes) {
EventMap map = new EventMap(eventBean.getCurrentEvent()); EventMap map = new EventMap(eventBean.getCurrentEvent());
map.setName("test" + bytes); map.setName("test" + bytes);
// StringBuilder sb = new StringBuilder(); // StringBuilder sb = new StringBuilder();
// for (int i = 0; i < bytes; ++i) { // for (int i = 0; i < bytes; ++i) {
// //
// sb.append((char) (33 + i % 92)); // sb.append((char) (33 + i % 92));
// } // }
map.setMapData(bytes); map.setMapData(bytes);
eventMapFacade.create(map); eventMapFacade.create(map);
} }
...@@ -149,7 +148,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -149,7 +148,7 @@ public class TestDataBean implements TestDataBeanLocal {
return u; return u;
} }
public Bill createBill( User u) { public Bill createBill(User u) {
Bill b = new Bill(eventBean.getCurrentEvent()); Bill b = new Bill(eventBean.getCurrentEvent());
b.setUser(u); b.setUser(u);
b.setAddr1("Kalle Kävijä"); b.setAddr1("Kalle Kävijä");
...@@ -238,7 +237,6 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -238,7 +237,6 @@ public class TestDataBean implements TestDataBeanLocal {
return null; return null;
} }
public void generateTestPlaces(EventMap map) { public void generateTestPlaces(EventMap map) {
logger.info("Adding places to map {}, event {}", map); logger.info("Adding places to map {}, event {}", map);
...@@ -293,8 +291,4 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -293,8 +291,4 @@ public class TestDataBean implements TestDataBeanLocal {
q.executeUpdate(); q.executeUpdate();
} }
public void contextTest() {
logger.debug("Hostname: {}",BortalLocalContextHolder.getHostname());
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -22,13 +22,18 @@ import org.slf4j.LoggerFactory; ...@@ -22,13 +22,18 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.enums.Permission; import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission; import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.exceptions.PermissionDeniedException; import fi.insomnia.bortal.exceptions.PermissionDeniedException;
import fi.insomnia.bortal.facade.RoleFacade; import fi.insomnia.bortal.facade.GroupMembershipFacade;
import fi.insomnia.bortal.facade.PlaceGroupFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.facade.UserImageFacade; import fi.insomnia.bortal.facade.UserImageFacade;
import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.RoleRight; import fi.insomnia.bortal.model.RoleRight;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.UserImage; import fi.insomnia.bortal.model.UserImage;
import fi.insomnia.bortal.util.MailMessage;
import fi.insomnia.bortal.utilities.BeanContextHolder;
import fi.insomnia.bortal.utilities.BortalLocalContextHolder; import fi.insomnia.bortal.utilities.BortalLocalContextHolder;
import fi.insomnia.bortal.utilities.I18n; import fi.insomnia.bortal.utilities.I18n;
...@@ -58,15 +63,22 @@ public class UserBean implements UserBeanLocal { ...@@ -58,15 +63,22 @@ public class UserBean implements UserBeanLocal {
@EJB @EJB
private EventBeanLocal eventBean; private EventBeanLocal eventBean;
@EJB
private RoleFacade rolefacade;
@EJB @EJB
private UserImageFacade userimagefacade; private UserImageFacade userimagefacade;
@EJB
private ProductBeanLocal productBean;
@EJB @EJB
private UtilBeanLocal utilbean; private UtilBeanLocal utilbean;
@EJB
private CardTemplateBeanLocal ctbean;
@EJB
private PlaceGroupBeanLocal pgbean;
@EJB
private AccountEventBeanLocal acbean;
@EJB
private GroupMembershipFacade groupMembershipFacade;
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -87,7 +99,9 @@ public class UserBean implements UserBeanLocal { ...@@ -87,7 +99,9 @@ public class UserBean implements UserBeanLocal {
fatalPermission(Permission.USER_MANAGEMENT, RolePermission.WRITE); fatalPermission(Permission.USER_MANAGEMENT, RolePermission.WRITE);
} }
ctbean.checkPrintedCard(user);
User ret = userFacade.merge(user); User ret = userFacade.merge(user);
userFacade.evict(ret); userFacade.evict(ret);
return ret; return ret;
} }
...@@ -126,7 +140,7 @@ public class UserBean implements UserBeanLocal { ...@@ -126,7 +140,7 @@ public class UserBean implements UserBeanLocal {
defaultUser.setLogin(DEFAULT_USER_LOGIN); defaultUser.setLogin(DEFAULT_USER_LOGIN);
defaultUser.setNick(DEFAULT_USER_LOGIN); defaultUser.setNick(DEFAULT_USER_LOGIN);
userFacade.create(defaultUser); userFacade.create(defaultUser);
defaultUser.setSuperadmin(true); defaultUser.setSuperadmin(true);
} }
return defaultUser; return defaultUser;
...@@ -138,52 +152,84 @@ public class UserBean implements UserBeanLocal { ...@@ -138,52 +152,84 @@ public class UserBean implements UserBeanLocal {
Calendar start = Calendar.getInstance(); Calendar start = Calendar.getInstance();
Boolean ret = BortalLocalContextHolder.hasPermission(target, permission); Boolean ret = BortalLocalContextHolder.hasPermission(target, permission);
// Boolean ret = BortalLocalContextHolder.hasPermission(target,
// permission);
if (ret == null) { if (ret == null) {
ret = false; for (Role role : this.findUsersRoles(user)) {
if (role == null) {
continue;
}
for (RoleRight rr : role.getRoleRights()) {
BortalLocalContextHolder.setPermission(rr);
Set<Role> checkedRoles = new HashSet<Role>(); ret = BortalLocalContextHolder.hasPermission(target, permission);
List<Role> defaultrole = new ArrayList<Role>(); if (ret != null) {
defaultrole.add(eventBean.getCurrentEvent().getDefaultRole()); break;
ret = getRights(defaultrole, target, permission, checkedRoles); }
if (!ret) { }
List<Role> rolelist = rolefacade.findForUser(user, eventBean.getCurrentEvent()); if (ret != null) {
ret = getRights(rolelist, target, permission, checkedRoles); break;
}
} }
BortalLocalContextHolder.setPermission(target, permission, ret);
} }
// TODO: FIX THIS!! really bad idea.... // TODO: FIX THIS!! really bad idea....
if (user.isSuperadmin()) { if (user.isSuperadmin()) {
return true; return true;
} }
if (ret == null) {
ret = false;
BortalLocalContextHolder.setPermission(target, permission, ret);
}
return ret; return ret;
}
private boolean getRights(Collection<Role> roles, Permission expectedRight, RolePermission permission, Set<Role> checkedRoles) { }
if (roles == null || roles.isEmpty()) { @Override
return false; public List<Role> findUsersRoles(User u) {
User currusr = getCurrentUser();
if (!currusr.equals(u)) {
fatalNotLoggedIn();
} }
for (Role role : roles) {
Set<Role> checkedRoles = new HashSet<Role>();
if (role == null) { addRecursive(checkedRoles, u.getRoles());
continue;
} if (isLoggedIn()) {
logger.debug("Checking role permission {}", role.getName()); LanEvent event = eventBean.getCurrentEvent();
for (RoleRight rr : role.getRoleRights()) {
BortalLocalContextHolder.setPermission(rr); addRecursive(checkedRoles, event.getDefaultRole());
Boolean hasright = BortalLocalContextHolder.hasPermission(expectedRight, permission);
if (hasright != null) { addRecursive(checkedRoles, acbean.getRolesFromAccountEvents(u));
return hasright;
} for (GroupMembership member : groupMembershipFacade.findMemberships(event, u)) {
addRecursive(checkedRoles, member.getPlaceReservation().getProvidesRole());
} }
} }
return new ArrayList<Role>(checkedRoles);
}
private void addRecursive(Set<Role> checkedRoles, Collection<Role> roles) {
for (Role r : roles) {
addRecursive(checkedRoles, r);
}
}
checkedRoles.addAll(roles); private void addRecursive(Set<Role> checkedRoles, Role role) {
return getRights(rolefacade.findAllParentsExcluding(roles, checkedRoles), expectedRight, permission, checkedRoles); if (role == null || checkedRoles.contains(role)) {
return;
}
checkedRoles.add(role);
for (Role r : role.getParents()) {
addRecursive(checkedRoles, r);
}
} }
...@@ -196,21 +242,20 @@ public class UserBean implements UserBeanLocal { ...@@ -196,21 +242,20 @@ public class UserBean implements UserBeanLocal {
public void fatalPermission(Permission target, RolePermission permission, Object... failmessage) { public void fatalPermission(Permission target, RolePermission permission, Object... failmessage) {
boolean ret = hasPermission(target, permission); boolean ret = hasPermission(target, permission);
if (!ret) { if (!ret) {
String message = null; StringBuilder message = new StringBuilder("Target: ").append(target).append(" permission: ").append(permission);
if (failmessage == null || failmessage.length == 0) { if (failmessage == null || failmessage.length == 0) {
message = new StringBuilder("SessionHandler mbean permission exception: Target: ") message.append(" MSG: SessionHandler mbean permission exception: Target: ")
.append(target.toString()) .append(target)
.append(", Permission: ") .append(", Permission: ")
.append(permission.toString()) .append(permission);
.toString();
} else { } else {
StringBuilder msgbuilder = new StringBuilder();
for (Object part : failmessage) { for (Object part : failmessage) {
msgbuilder.append(part.toString()); message.append(part == null ? "NULL" : part.toString());
} }
message = msgbuilder.toString();
} }
throw new PermissionDeniedException(secubean, getCurrentUser(), message); // throw new SecurityException("Foobar");
throw new PermissionDeniedException(secubean, getCurrentUser(), message.toString());
} }
} }
...@@ -226,7 +271,7 @@ public class UserBean implements UserBeanLocal { ...@@ -226,7 +271,7 @@ public class UserBean implements UserBeanLocal {
fatalNotLoggedIn(); fatalNotLoggedIn();
User user = getCurrentUser(); User user = getCurrentUser();
if (getCurrentUser().getId() != userid) { if (!getCurrentUser().getId().equals(userid)) {
fatalPermission(Permission.USER_MANAGEMENT, RolePermission.EXECUTE, "usert tried to save picture to userid " + userid + " without sufficient permissions!"); fatalPermission(Permission.USER_MANAGEMENT, RolePermission.EXECUTE, "usert tried to save picture to userid " + userid + " without sufficient permissions!");
user = userFacade.find(userid); user = userFacade.find(userid);
} }
...@@ -303,7 +348,12 @@ public class UserBean implements UserBeanLocal { ...@@ -303,7 +348,12 @@ public class UserBean implements UserBeanLocal {
if (hash == null || hash.length() < 20 || user == null || user.getEmail() == null || user.getEmail().length() <= 5) { if (hash == null || hash.length() < 20 || user == null || user.getEmail() == null || user.getEmail().length() <= 5) {
return false; return false;
} }
utilbean.sendMail(user, I18n.get("passwordreset.mailSubject"), I18n.get("passwordreset.mailBody", mailpath)); MailMessage msg = new MailMessage();
msg.setTo(user);
msg.setSubject(I18n.get("passwordreset.mailSubject"));
msg.setMessage(I18n.get("passwordreset.mailBody", mailpath));
utilbean.sendMail(msg);
user.setConfirmHash(hash); user.setConfirmHash(hash);
userFacade.merge(user); userFacade.merge(user);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UtilBean.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.io.UnsupportedEncodingException; import java.util.Date;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.ejb.Local; import javax.ejb.Local;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.mail.Message; import javax.jms.JMSException;
import javax.mail.MessagingException; import javax.jms.ObjectMessage;
import javax.mail.Session; import javax.jms.Queue;
import javax.mail.Transport; import javax.jms.QueueConnection;
import javax.mail.internet.InternetAddress; import javax.jms.QueueConnectionFactory;
import javax.mail.internet.MimeMessage; import javax.jms.Session;
import javax.mail.internet.MimeMessage.RecipientType;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory; import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
...@@ -20,8 +19,7 @@ import javax.persistence.PersistenceUnit; ...@@ -20,8 +19,7 @@ import javax.persistence.PersistenceUnit;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.util.MailMessage;
import fi.insomnia.bortal.utilities.I18n;
/** /**
* Session Bean implementation class UtilBean * Session Bean implementation class UtilBean
...@@ -32,15 +30,13 @@ public class UtilBean implements UtilBeanLocal { ...@@ -32,15 +30,13 @@ public class UtilBean implements UtilBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(UtilBean.class); private static final Logger logger = LoggerFactory.getLogger(UtilBean.class);
@Resource(name = "mail/lanbortal")
private Session mailSession;
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
@PersistenceUnit @PersistenceUnit
private EntityManagerFactory emf; private EntityManagerFactory emf;
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -48,24 +44,26 @@ public class UtilBean implements UtilBeanLocal { ...@@ -48,24 +44,26 @@ public class UtilBean implements UtilBeanLocal {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
@Resource(name = "jmsQueue", mappedName = "jms/mailque")
private Queue mailQueue;
@Resource(name = "connFactory", mappedName = "jms/mailconnectionfactory")
private QueueConnectionFactory mailQuefactory;
@Override @Override
public boolean sendMail(User user, String subject, String message) { public boolean sendMail(MailMessage message) {
boolean ret = true; Date d = new Date();
Message msg = new MimeMessage(mailSession);
try { try {
msg.setSubject(subject); QueueConnection conn = mailQuefactory.createQueueConnection();
msg.setFrom(new InternetAddress("info@insomnia.fi", "Insomnia lippukauppa")); Session session = conn.createSession(false, 1);
msg.setRecipient(RecipientType.TO, new InternetAddress(user.getEmail(), ObjectMessage objmessage = session.createObjectMessage(message);
user.getFirstnames() + " " + user.getLastname()));
msg.setText(message); session.createProducer(mailQueue).send(objmessage);
Transport.send(msg); conn.close();
} catch (MessagingException me) { } catch (JMSException e) {
logger.info("Error sending email!", me); logger.debug("Got exception sending mail", e);
ret = false;
} catch (UnsupportedEncodingException uee) {
logger.info("Error sending email!", uee);
ret = false;
} }
return ret; logger.debug("Message time {}",new Date().getTime() - d.getTime());
return true;
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/AccountEventFacade.java
package fi.insomnia.bortal.facade; package fi.insomnia.bortal.facade;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -16,6 +23,7 @@ public class AccountEventFacade extends EventChildGenericFacade<AccountEvent> { ...@@ -16,6 +23,7 @@ public class AccountEventFacade extends EventChildGenericFacade<AccountEvent> {
@EJB @EJB
private UserFacade userfacade; private UserFacade userfacade;
public AccountEventFacade() { public AccountEventFacade() {
super(AccountEvent.class); super(AccountEvent.class);
} }
...@@ -24,12 +32,16 @@ public class AccountEventFacade extends EventChildGenericFacade<AccountEvent> { ...@@ -24,12 +32,16 @@ public class AccountEventFacade extends EventChildGenericFacade<AccountEvent> {
return em; return em;
} }
@Override @Override
public void create(AccountEvent event) public void create(AccountEvent event) {
{
super.create(event); super.create(event);
userfacade.evict(event.getUser()); userfacade.evict(event.getUser());
} }
public List<Role> findProvidedRoles(LanEvent event, User u) {
TypedQuery<Role> q = em.createQuery("select distinct ac.product.provides from AccountEvent ac where ac.id.eventId = :eventid and ac.user = :user and ac.product.provides is not null", Role.class);
q.setParameter("eventid", event.getId());
q.setParameter("user", u);
return q.getResultList();
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventChildGenericFacade.java
...@@ -26,8 +26,7 @@ public abstract class EventChildGenericFacade<T extends EventChildInterface> { ...@@ -26,8 +26,7 @@ public abstract class EventChildGenericFacade<T extends EventChildInterface> {
public T find(Integer eventId, Integer id) { public T find(Integer eventId, Integer id) {
EventPk pk = new EventPk(eventId); EventPk pk = new EventPk(eventId, id);
pk.setId(id);
return find(pk); return find(pk);
} }
...@@ -94,7 +93,6 @@ public abstract class EventChildGenericFacade<T extends EventChildInterface> { ...@@ -94,7 +93,6 @@ public abstract class EventChildGenericFacade<T extends EventChildInterface> {
return q.getResultList(); return q.getResultList();
} }
protected static <K> K getSingleNullableResult(TypedQuery<K> q) { protected static <K> K getSingleNullableResult(TypedQuery<K> q) {
K ret = null; K ret = null;
try { try {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventFacade.java
...@@ -33,9 +33,10 @@ public class EventFacade extends GenericFacade<Integer, LanEvent> { ...@@ -33,9 +33,10 @@ public class EventFacade extends GenericFacade<Integer, LanEvent> {
} }
public LanEvent findByName(String name) { public LanEvent findByName(String name) {
TypedQuery<LanEvent> q = em.createNamedQuery("LanEvent.findByName", LanEvent.class); // TypedQuery<LanEvent> q = em.createNamedQuery("LanEvent.findByName", LanEvent.class);
q.setParameter("name", name); // q.setParameter("name", name);
return getSingleNullableResult(q); // return getSingleNullableResult(q);
return this.find(1);
} }
public String flushCache() { public String flushCache() {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GroupMembershipFacade.java
...@@ -52,10 +52,17 @@ public class GroupMembershipFacade extends EventChildGenericFacade<GroupMembersh ...@@ -52,10 +52,17 @@ public class GroupMembershipFacade extends EventChildGenericFacade<GroupMembersh
return getSingleNullableResult(q); return getSingleNullableResult(q);
} }
public List<GroupMembership> find(LanEvent event, User user) { public List<GroupMembership> findMemberOrCreator(LanEvent event, User user) {
TypedQuery<GroupMembership> p = em.createQuery("select gm from GroupMembership gm where gm.id.eventId = :eventid and (gm.placeGroup.creator = :user or gm.user = :user) order by gm.placeReservation.name",GroupMembership.class); TypedQuery<GroupMembership> p = em.createQuery("select gm from GroupMembership gm where gm.id.eventId = :eventid and (gm.placeGroup.creator = :user or gm.user = :user) order by gm.placeReservation.name",GroupMembership.class);
p.setParameter("eventid", event.getId()); p.setParameter("eventid", event.getId());
p.setParameter("user", user); p.setParameter("user", user);
return p.getResultList(); return p.getResultList();
} }
public List<GroupMembership> findMemberships(LanEvent event, User user) {
TypedQuery<GroupMembership> p = em.createQuery("select gm from GroupMembership gm where gm.id.eventId = :eventid and gm.user = :user",GroupMembership.class);
p.setParameter("eventid", event.getId());
p.setParameter("user", user);
return p.getResultList();
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PrintedCardFacade.java
package fi.insomnia.bortal.facade; package fi.insomnia.bortal.facade;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -21,4 +28,19 @@ public class PrintedCardFacade extends EventChildGenericFacade<PrintedCard> { ...@@ -21,4 +28,19 @@ public class PrintedCardFacade extends EventChildGenericFacade<PrintedCard> {
return em; return em;
} }
public List<PrintedCard> findForUser(LanEvent event, User user) {
ArrayList<PrintedCard> retlist = new ArrayList<PrintedCard>();
for (PrintedCard pc : user.getPrintedCards()) {
if (pc.getId().getEventId().equals(event.getId())) {
retlist.add(pc);
}
}
// TypedQuery<PrintedCard> q =
// em.createQuery("SELECT pc from PrintedCard pc where pc.id.eventId = :eventid and pc.user = :user",
// PrintedCard.class);
// q.setParameter("eventid", event.getId());
// q.setParameter("user", user);
// return q.getResultList();
return retlist;
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ProductFacade.java
...@@ -11,6 +11,8 @@ import javax.persistence.TypedQuery; ...@@ -11,6 +11,8 @@ import javax.persistence.TypedQuery;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -50,5 +52,4 @@ public class ProductFacade extends EventChildGenericFacade<Product> { ...@@ -50,5 +52,4 @@ public class ProductFacade extends EventChildGenericFacade<Product> {
return q.getResultList(); return q.getResultList();
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ReaderFacade.java
...@@ -4,6 +4,9 @@ import javax.ejb.LocalBean; ...@@ -4,6 +4,9 @@ import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Reader; import fi.insomnia.bortal.model.Reader;
@Stateless @Stateless
...@@ -21,4 +24,11 @@ public class ReaderFacade extends EventChildGenericFacade<Reader> { ...@@ -21,4 +24,11 @@ public class ReaderFacade extends EventChildGenericFacade<Reader> {
return em; return em;
} }
public Reader findByIdent(LanEvent event, String reader) {
TypedQuery<Reader> q = em.createQuery("select r from Reader r where r.id.eventId = :eventid and r.identification = :ident", Reader.class);
q.setParameter("eventid", event.getId());
q.setParameter("ident", reader);
return getSingleNullableResult(q);
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/RoleFacade.java
...@@ -44,19 +44,7 @@ public class RoleFacade extends EventChildGenericFacade<Role> { ...@@ -44,19 +44,7 @@ public class RoleFacade extends EventChildGenericFacade<Role> {
return q.getResultList(); return q.getResultList();
} }
public Collection<Role> findAllParentsExcluding(Collection<Role> roles, Collection<Role> excludedResults) {
Set<Role> ret = new HashSet<Role>();
for (Role r : roles) {
if (r != null) {
ret.addAll(r.getParents());
}
}
ret.removeAll(excludedResults);
return ret;
}
public Role createRole(LanEvent event, String rolename) { public Role createRole(LanEvent event, String rolename) {
Role ret = new Role(event); Role ret = new Role(event);
ret.setName(rolename); ret.setName(rolename);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java
...@@ -18,6 +18,7 @@ import fi.insomnia.bortal.model.User; ...@@ -18,6 +18,7 @@ import fi.insomnia.bortal.model.User;
public class UserFacade extends GenericFacade<Integer, User> { public class UserFacade extends GenericFacade<Integer, User> {
private static final Logger logger = LoggerFactory.getLogger(UserFacade.class); private static final Logger logger = LoggerFactory.getLogger(UserFacade.class);
public enum UserField { public enum UserField {
id, nick, login, firstname, lastname id, nick, login, firstname, lastname
} }
...@@ -39,9 +40,9 @@ public class UserFacade extends GenericFacade<Integer, User> { ...@@ -39,9 +40,9 @@ public class UserFacade extends GenericFacade<Integer, User> {
return getSingleNullableResult(q); return getSingleNullableResult(q);
} }
public List<User> search(String name, String[] strings) { public List<User> search(String name, String[] fields) {
// TODO Auto-generated method stub throw new RuntimeException("NOT IMPLEMENTED!!!");
return null; //TODO: Implement search
} }
} }
code/LanBortalBeansClient/.classpath
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
<classpathentry kind="src" path="ejbModule"/> <classpathentry kind="src" path="ejbModule"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanBortalAuthModuleClient"/> <classpathentry combineaccessrules="false" kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)">
<attributes>
<attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<classpathentry kind="output" path="ejbModule"/> <classpathentry kind="output" path="ejbModule"/>
</classpath> </classpath>
code/LanBortalBeansClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/LanBortalBeansClient/ejbModule/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Class-Path: lib/LanBortalDatabase.jar Class-Path: lib/LanBortalDatabase.jar
lib/granite.jar
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/AccountEventBeanLocal.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.Local;
import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.EventPk;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
@Local
public interface AccountEventBeanLocal {
AccountEvent merge(AccountEvent account);
void delete(AccountEvent account);
AccountEvent find(EventPk id);
List<Role> getRolesFromAccountEvents(User u);
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/CardTemplateBeanLocal.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.Local;
import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.User;
@Local
public interface CardTemplateBeanLocal {
List<CardTemplate> findAll();
void create(CardTemplate card);
CardTemplate findById(Integer id);
void checkPrintedCard(User user);
void checkAllUsersCardRights();
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceBeanLocal.java
...@@ -11,6 +11,7 @@ import javax.ejb.Local; ...@@ -11,6 +11,7 @@ import javax.ejb.Local;
import fi.insomnia.bortal.exceptions.BortalCatchableException; import fi.insomnia.bortal.exceptions.BortalCatchableException;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.EventPk;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -41,4 +42,8 @@ public interface PlaceBeanLocal { ...@@ -41,4 +42,8 @@ public interface PlaceBeanLocal {
int setBuyable(EventMap map, String buyableLike, boolean b); int setBuyable(EventMap map, String buyableLike, boolean b);
Place find(EventPk id);
void checkMemberships();
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceGroupBeanLocal.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.io.OutputStream;
import java.util.List; import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
...@@ -14,10 +15,16 @@ public interface PlaceGroupBeanLocal { ...@@ -14,10 +15,16 @@ public interface PlaceGroupBeanLocal {
// GroupMembership createGroupMembership(PlaceGroup pg, Place p); // GroupMembership createGroupMembership(PlaceGroup pg, Place p);
List<GroupMembership> getMemberships(User user); // List<GroupMembership> getMemberships(User user);
boolean associateToToken(User user, String token); boolean associateToToken(User user, String token);
void releaseAndGenerateToken(GroupMembership gmem); void releaseAndGenerateToken(GroupMembership gmem);
void getGroupMembershipPdf(List<GroupMembership> memberships, OutputStream ostream);
List<GroupMembership> getMembershipsAndCreations(User user);
List<GroupMembership> getMemberships(User user);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ReaderBeanLocal.java 0 → 100644
package fi.insomnia.bortal.beans;
import javax.ejb.Local;
@Local
public interface ReaderBeanLocal {
boolean checkTag(String reader, String tag, String hash);
}
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/SecurityBeanLocal.java
...@@ -8,20 +8,20 @@ import fi.insomnia.bortal.model.User; ...@@ -8,20 +8,20 @@ import fi.insomnia.bortal.model.User;
@Local @Local
public interface SecurityBeanLocal { public interface SecurityBeanLocal {
LogEntry logPermissionDenied(User user, Exception exception); LogEntry logMessage(SecurityLogType paramType, User user, String... description);
LogEntry logException(User user, Exception exception); // LogEntry logPermissionDenied(User user, Exception exception);
//
LogEntry logMessage(User user, String description); // LogEntry logException(User user, Exception exception);
//
LogEntry logMessage(SecurityLogType type, User user, String description); // LogEntry logMessage(User user, String... description);
//
LogEntry logMessage(String description); // LogEntry logMessage(SecurityLogType type, User user, String... description);
//
LogEntry logMessage(SecurityLogType type, String description); // LogEntry logMessage(String... description);
//
LogEntry logPermissionDenied(User currentuser, String message); // LogEntry logMessage(SecurityLogType type, String... description);
//
LogEntry logMessage(User currentUser, String...message); // LogEntry logPermissionDenied(User currentuser, String... message);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/SecurityLogType.java
...@@ -3,5 +3,6 @@ package fi.insomnia.bortal.beans; ...@@ -3,5 +3,6 @@ package fi.insomnia.bortal.beans;
public enum SecurityLogType { public enum SecurityLogType {
permissionDenied, permissionDenied,
unknownException, unknownException,
genericMessage genericMessage,
accountEvent
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java
...@@ -32,5 +32,4 @@ public interface TestDataBeanLocal { ...@@ -32,5 +32,4 @@ public interface TestDataBeanLocal {
void writeMap(byte[] bytes); void writeMap(byte[] bytes);
void flushMaps(); void flushMaps();
void contextTest();
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java
...@@ -8,6 +8,7 @@ import fi.insomnia.bortal.enums.Permission; ...@@ -8,6 +8,7 @@ import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission; import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.UserImage; import fi.insomnia.bortal.model.UserImage;
...@@ -50,4 +51,7 @@ public interface UserBeanLocal { ...@@ -50,4 +51,7 @@ public interface UserBeanLocal {
boolean initPasswordReset(User user, String hash, String mailpath); boolean initPasswordReset(User user, String hash, String mailpath);
List<Role> findUsersRoles(User u);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UtilBeanLocal.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.util.MailMessage;
public interface UtilBeanLocal { public interface UtilBeanLocal {
// boolean sendMail(User user, String subject, String message);
boolean sendMail(User user, String subject, String message); boolean sendMail(MailMessage message);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/exceptions/PermissionDeniedException.java
package fi.insomnia.bortal.exceptions; package fi.insomnia.bortal.exceptions;
import fi.insomnia.bortal.beans.SecurityBeanLocal; import fi.insomnia.bortal.beans.SecurityBeanLocal;
import fi.insomnia.bortal.beans.SecurityLogType;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
public class PermissionDeniedException extends RuntimeException { public class PermissionDeniedException extends RuntimeException {
public PermissionDeniedException(SecurityBeanLocal bean, User user, String message) { public PermissionDeniedException(SecurityBeanLocal bean, User user, String message) {
super(message); super(message);
bean.logMessage(SecurityLogType.permissionDenied, user, this.getMessage());
bean.logPermissionDenied(user, this);
} }
/** /**
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/util/MailMessage.java 0 → 100644
package fi.insomnia.bortal.util;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import javax.mail.internet.InternetAddress;
import fi.insomnia.bortal.model.User;
public class MailMessage implements Serializable {
/**
*
*/
private static final long serialVersionUID = -4769468394850407107L;
private static final String DEFAULT_MAIL_CHARSET = "iso-8859-1";
private String subject;
private String fromName = "Insomnia lippukauppa";
private String fromAddress = "info@insomnia.fi";
private String toName;
private String toAddress;
private String message;
private String charset = DEFAULT_MAIL_CHARSET;
public InternetAddress getTo() throws UnsupportedEncodingException {
return new InternetAddress(toAddress, toName, getCharset());
}
public InternetAddress getFrom() throws UnsupportedEncodingException {
return new InternetAddress(fromAddress, fromName, getCharset());
}
public String getSubject() {
return subject;
}
public void setSubject(String subject) {
this.subject = subject;
}
public String getFromName() {
return fromName;
}
public void setFromName(String fromName) {
this.fromName = fromName;
}
public String getFromAddress() {
return fromAddress;
}
public void setFromAddress(String fromAddress) {
this.fromAddress = fromAddress;
}
public String getToName() {
return toName;
}
public void setToName(String toName) {
this.toName = toName;
}
public String getToAddress() {
return toAddress;
}
public void setToAddress(String toAddress) {
this.toAddress = toAddress;
}
public String getMessage() {
return message;
}
public void setMessage(Object... msgpart) {
StringBuilder msg = new StringBuilder();
for (Object o : msgpart) {
msg.append(o);
}
message = msg.toString();
}
public void setMessage(String message) {
this.message = message;
}
public static String getDefaultMailCharset() {
return DEFAULT_MAIL_CHARSET;
}
public void setCharset(String charset) {
this.charset = charset;
}
public String getCharset() {
return charset;
}
public void setTo(User user) {
setToName(user.getWholeName());
setToAddress(user.getEmail());
}
@Override
public String toString() {
return new StringBuilder("fi.insomnia.bortal.util.MailMessage[to=").append(toAddress).append("]").toString();
}
}
code/LanBortalDatabase/.classpath
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanBortalUtilities"/> <classpathentry combineaccessrules="false" kind="src" path="/LanBortalUtilities"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)">
<attributes>
<attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/LanBortalDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jpt.jpa"/> <fixed facet="jpt.jpa"/>
......
code/LanBortalDatabase/src/META-INF/persistence.xml
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<properties> <properties>
<property name="eclipselink.ddl-generation" value="create-tables"/> <property name="eclipselink.ddl-generation" value="create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="both"/> <property name="eclipselink.ddl-generation.output-mode" value="both"/>
<property name="eclipselink.cache.size.default" value="16384"/>
</properties> </properties>
</persistence-unit> </persistence-unit>
</persistence> </persistence>
code/LanBortalDatabase/src/fi/insomnia/bortal/asdasd.java deleted 100644 → 0
package fi.insomnia.bortal;
import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.Bill;
public class asdasd {
/**
* @param args
*/
public static void main(String[] args) {
AccountEvent a = new AccountEvent();
Bill b = new Bill();
AccountEvent c = new AccountEvent();
System.out.println("A eq b " + a.equals(b));
System.out.println("A eq A " + a.equals(a));
System.out.println("B eq b " + b.equals(b));
System.out.println("B eq A " + b.equals(a));
System.out.println("C eq C " + c.equals(c));
System.out.println("A eq C " + a.equals(c));
System.out.println("C eq A " + c.equals(a));
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/enums/Permission.java
...@@ -17,7 +17,7 @@ public enum Permission { ...@@ -17,7 +17,7 @@ public enum Permission {
// PERMISSION("Description"), // PERMISSION("Description"),
LOGIN("User can see loginbutton(r), create new user(w)"), LOGIN("User can see loginbutton(r), create new user(w)"),
USER_MANAGEMENT("User has right to view all users(r), modify users(w), execute actions for user(x) "), USER_MANAGEMENT("User has right to view all users(r), modify users(w), execute actions for user(x) "),
// TICKET_SALES("User has right to view(r), administer(w) and buy(x)"), ACCOUNT_MANAGEMENT("Manage users account events. view(r), modify(w) and create(x)"),
BILL("View bills(r), Mark paid & modify(w), and create (buy) bills (x)"), BILL("View bills(r), Mark paid & modify(w), and create (buy) bills (x)"),
MAP("view maps(r), Modify(w), reserve places from maps(x)"), MAP("view maps(r), Modify(w), reserve places from maps(x)"),
ROLE_MANAGEMENT("User has right to view(r), modify(w) and assign(x) roles"), ROLE_MANAGEMENT("User has right to view(r), modify(w) and assign(x) roles"),
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
...@@ -37,7 +37,12 @@ import javax.persistence.TemporalType; ...@@ -37,7 +37,12 @@ import javax.persistence.TemporalType;
@NamedQuery(name = "AccountEvent.findByEventTime", query = "SELECT a FROM AccountEvent a WHERE a.eventTime = :eventTime"), @NamedQuery(name = "AccountEvent.findByEventTime", query = "SELECT a FROM AccountEvent a WHERE a.eventTime = :eventTime"),
@NamedQuery(name = "AccountEvent.findByDelivered", query = "SELECT a FROM AccountEvent a WHERE a.delivered = :delivered") }) @NamedQuery(name = "AccountEvent.findByDelivered", query = "SELECT a FROM AccountEvent a WHERE a.delivered = :delivered") })
public class AccountEvent extends GenericEventChild { public class AccountEvent extends GenericEventChild {
private static final long serialVersionUID = 1L;
/**
*
*/
private static final long serialVersionUID = 2588419823225148100L;
/** /**
* What 1 unit of this product costs. * What 1 unit of this product costs.
*/ */
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance.java
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
*/ */
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns; import javax.persistence.JoinColumns;
...@@ -15,9 +11,6 @@ import javax.persistence.ManyToOne; ...@@ -15,9 +11,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
...@@ -25,16 +18,13 @@ import javax.persistence.Version; ...@@ -25,16 +18,13 @@ import javax.persistence.Version;
@Entity @Entity
@Table(name = "discount_instances") @Table(name = "discount_instances")
@NamedQueries({ @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d") }) @NamedQueries({ @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d") })
public class DiscountInstance implements EventChildInterface { public class DiscountInstance extends GenericEventChild {
/** /**
* *
*/ */
private static final long serialVersionUID = 2192672129232748522L; private static final long serialVersionUID = 2192672129232748522L;
@EmbeddedId
private EventPk id;
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "account_event_id", referencedColumnName = "id", nullable = false, updatable = false), @JoinColumn(name = "account_event_id", referencedColumnName = "id", nullable = false, updatable = false),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
...@@ -47,17 +37,13 @@ public class DiscountInstance implements EventChildInterface { ...@@ -47,17 +37,13 @@ public class DiscountInstance implements EventChildInterface {
@ManyToOne(optional = false) @ManyToOne(optional = false)
private Discount discount; private Discount discount;
@Version
@Column(nullable = false)
private int jpaVersionField = 0;
public DiscountInstance() { public DiscountInstance() {
} }
public DiscountInstance(LanEvent event, AccountEvent ac, Discount d) { public DiscountInstance(LanEvent event, AccountEvent ac, Discount d) {
accountEvent = ac; accountEvent = ac;
discount = d; discount = d;
this.id = new EventPk(event); setId(new EventPk(event));
} }
public AccountEvent getAccountEvent() { public AccountEvent getAccountEvent() {
...@@ -76,66 +62,11 @@ public class DiscountInstance implements EventChildInterface { ...@@ -76,66 +62,11 @@ public class DiscountInstance implements EventChildInterface {
this.discount = discountsId; this.discount = discountsId;
} }
@Override
public int hashCode() {
int hash = 0;
hash += (getId() != null ? getId().hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof DiscountInstance)) {
return false;
}
DiscountInstance other = (DiscountInstance) object;
if ((this.getId() == null && other.getId() != null)
|| (this.getId() != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.DiscountInstance[discountsInstancesId=" return "fi.insomnia.bortal.model.DiscountInstance[discountsInstancesId="
+ getId() + "]"; + getId() + "]";
} }
/**
* @return the id
*/
@Override
public EventPk getId() {
return id;
}
/**
* @param id
* the id to set
*/
@Override
public void setId(EventPk id) {
this.id = id;
}
/**
* @return the jpaVersionField
*/
@Override
public int getJpaVersionField() {
return jpaVersionField;
}
/**
* @param jpaVersionField
* the jpaVersionField to set
*/
@Override
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser.java
...@@ -27,7 +27,7 @@ import javax.persistence.Version; ...@@ -27,7 +27,7 @@ import javax.persistence.Version;
*/ */
@Entity @Entity
@Table(name = "event_organiser") @Table(name = "event_organiser")
@NamedQueries( { @NamedQueries({
@NamedQuery(name = "EventOrganiser.findAll", query = "SELECT e FROM EventOrganiser e"), @NamedQuery(name = "EventOrganiser.findAll", query = "SELECT e FROM EventOrganiser e"),
@NamedQuery(name = "EventOrganiser.findByOrganisation", query = "SELECT e FROM EventOrganiser e WHERE e.organisation = :organisation"), @NamedQuery(name = "EventOrganiser.findByOrganisation", query = "SELECT e FROM EventOrganiser e WHERE e.organisation = :organisation"),
@NamedQuery(name = "EventOrganiser.findByBundleCountry", query = "SELECT e FROM EventOrganiser e WHERE e.bundleCountry = :bundleCountry") }) @NamedQuery(name = "EventOrganiser.findByBundleCountry", query = "SELECT e FROM EventOrganiser e WHERE e.bundleCountry = :bundleCountry") })
...@@ -49,7 +49,7 @@ public class EventOrganiser implements ModelInterface { ...@@ -49,7 +49,7 @@ public class EventOrganiser implements ModelInterface {
@OneToMany(cascade = CascadeType.ALL, mappedBy = "organiser") @OneToMany(cascade = CascadeType.ALL, mappedBy = "organiser")
private List<LanEvent> events; private List<LanEvent> events;
@ManyToOne(fetch=FetchType.LAZY) @ManyToOne()
@JoinColumn(name = "admin_user_id", referencedColumnName = "user_id", nullable = false) @JoinColumn(name = "admin_user_id", referencedColumnName = "user_id", nullable = false)
private User admin; private User admin;
...@@ -57,25 +57,23 @@ public class EventOrganiser implements ModelInterface { ...@@ -57,25 +57,23 @@ public class EventOrganiser implements ModelInterface {
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField = 0; private int jpaVersionField = 0;
@Column(nullable = false,name="bill_address1") @Column(nullable = false, name = "bill_address1")
private String billAddress1 = ""; private String billAddress1 = "";
@Column(nullable = false,name="bill_address2") @Column(nullable = false, name = "bill_address2")
private String billAddress2 = ""; private String billAddress2 = "";
@Column(nullable = false,name="bill_address3") @Column(nullable = false, name = "bill_address3")
private String billAddress3 = ""; private String billAddress3 = "";
@Column(nullable = false,name="bill_address4") @Column(nullable = false, name = "bill_address4")
private String billAddress4 = ""; private String billAddress4 = "";
@Column(nullable = false,name="bank_number1") @Column(nullable = false, name = "bank_number1")
private String bankNumber1 = ""; private String bankNumber1 = "";
@Column(nullable = false,name="bank_number2") @Column(nullable = false, name = "bank_number2")
private String bankNumber2 = ""; private String bankNumber2 = "";
@Column(nullable = false,name="bank_name1") @Column(nullable = false, name = "bank_name1")
private String bankName1 = ""; private String bankName1 = "";
@Column(nullable = false,name="bank_name2") @Column(nullable = false, name = "bank_name2")
private String bankName2 = ""; private String bankName2 = "";
public EventOrganiser() { public EventOrganiser() {
} }
...@@ -256,5 +254,5 @@ public class EventOrganiser implements ModelInterface { ...@@ -256,5 +254,5 @@ public class EventOrganiser implements ModelInterface {
public void setBankName2(String bankName2) { public void setBankName2(String bankName2) {
this.bankName2 = bankName2; this.bankName2 = bankName2;
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventPk.java
...@@ -65,7 +65,7 @@ public class EventPk implements Serializable { ...@@ -65,7 +65,7 @@ public class EventPk implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.EventPk[id=" + id + ", eventId=" + getEventId() + "]"; return new StringBuilder("fi.insomnia.bortal.model.EventPk[id=").append(id).append(", eventId=").append(getEventId()).append("]").toString();
} }
public void setEventId(Integer eventId) { public void setEventId(Integer eventId) {
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEventChild.java
...@@ -25,6 +25,14 @@ public class GenericEventChild implements EventChildInterface { ...@@ -25,6 +25,14 @@ public class GenericEventChild implements EventChildInterface {
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField = 0; private int jpaVersionField = 0;
public GenericEventChild(LanEvent event) {
id = new EventPk(event);
}
public GenericEventChild() {
super();
}
@Override @Override
public final boolean equals(Object object) { public final boolean equals(Object object) {
...@@ -33,8 +41,7 @@ public class GenericEventChild implements EventChildInterface { ...@@ -33,8 +41,7 @@ public class GenericEventChild implements EventChildInterface {
return false; return false;
} }
GenericEventChild other = (GenericEventChild) object; GenericEventChild other = (GenericEventChild) object;
if(tempId != null && tempId.equals(other.tempId)) if (tempId != null && tempId.equals(other.tempId)) {
{
return true; return true;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
...@@ -77,6 +77,12 @@ public class Place extends GenericEventChild { ...@@ -77,6 +77,12 @@ public class Place extends GenericEventChild {
@ManyToOne @ManyToOne
private PlaceGroup group; private PlaceGroup group;
@ManyToOne
@JoinColumns({
@JoinColumn(name = "provided_role_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
private Role providesRole;
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "map_id", referencedColumnName = "id", nullable = false, updatable = true, insertable = true), @JoinColumn(name = "map_id", referencedColumnName = "id", nullable = false, updatable = true, insertable = true),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
...@@ -161,7 +167,7 @@ public class Place extends GenericEventChild { ...@@ -161,7 +167,7 @@ public class Place extends GenericEventChild {
} }
public void setGroup(PlaceGroup group) { public void setGroup(PlaceGroup group) {
if (group.getId().getEventId() != getId().getEventId()) { if (group != null && group.getId().getEventId() != getId().getEventId()) {
throw new RuntimeException("Can not set Group from different Event to Place!"); throw new RuntimeException("Can not set Group from different Event to Place!");
} }
this.group = group; this.group = group;
...@@ -251,7 +257,7 @@ public class Place extends GenericEventChild { ...@@ -251,7 +257,7 @@ public class Place extends GenericEventChild {
public boolean isTaken() { public boolean isTaken() {
return (releaseTime != null || getGroup() != null); return (getReleaseTime() != null || getGroup() != null);
} }
/** /**
...@@ -277,8 +283,8 @@ public class Place extends GenericEventChild { ...@@ -277,8 +283,8 @@ public class Place extends GenericEventChild {
} }
setCurrentUser(user); setCurrentUser(user);
releaseTime = Calendar.getInstance(); setReleaseTime(Calendar.getInstance());
releaseTime.add(Calendar.MINUTE, RESERVE_MINUTES); getReleaseTime().add(Calendar.MINUTE, RESERVE_MINUTES);
return true; return true;
} }
...@@ -296,7 +302,7 @@ public class Place extends GenericEventChild { ...@@ -296,7 +302,7 @@ public class Place extends GenericEventChild {
return false; return false;
} }
setCurrentUser(null); setCurrentUser(null);
releaseTime = null; setReleaseTime(null);
return true; return true;
} }
...@@ -313,7 +319,7 @@ public class Place extends GenericEventChild { ...@@ -313,7 +319,7 @@ public class Place extends GenericEventChild {
if (!isBuyable() || getCurrentUser() == null || getGroup() != null || !group.getCreator().equals(getCurrentUser())) { if (!isBuyable() || getCurrentUser() == null || getGroup() != null || !group.getCreator().equals(getCurrentUser())) {
return false; return false;
} }
releaseTime = null; setReleaseTime(null);
setGroup(group); setGroup(group);
// Current user temporarily used at place reservation. When buying // Current user temporarily used at place reservation. When buying
// release field for its original use. // release field for its original use.
...@@ -331,9 +337,9 @@ public class Place extends GenericEventChild { ...@@ -331,9 +337,9 @@ public class Place extends GenericEventChild {
*/ */
public boolean checkReleased() { public boolean checkReleased() {
boolean ret = false; boolean ret = false;
if (getGroup() == null && releaseTime != null && Calendar.getInstance().after(releaseTime)) { if (getGroup() == null && getReleaseTime() != null && Calendar.getInstance().after(getReleaseTime())) {
setCurrentUser(null); setCurrentUser(null);
releaseTime = null; setReleaseTime(null);
ret = true; ret = true;
} }
return ret; return ret;
...@@ -347,4 +353,20 @@ public class Place extends GenericEventChild { ...@@ -347,4 +353,20 @@ public class Place extends GenericEventChild {
return buyable; return buyable;
} }
public void setReleaseTime(Calendar releaseTime) {
this.releaseTime = releaseTime;
}
public Calendar getReleaseTime() {
return releaseTime;
}
public void setProvidesRole(Role providesRole) {
this.providesRole = providesRole;
}
public Role getProvidesRole() {
return providesRole;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
...@@ -17,6 +17,7 @@ import javax.persistence.ManyToOne; ...@@ -17,6 +17,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
...@@ -27,7 +28,7 @@ import javax.persistence.Version; ...@@ -27,7 +28,7 @@ import javax.persistence.Version;
*/ */
@Entity @Entity
@Table(name = "groups") @Table(name = "groups")
@NamedQueries( { @NamedQueries({
@NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"), @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
@NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"), @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
...@@ -72,6 +73,7 @@ public class PlaceGroup implements EventChildInterface { ...@@ -72,6 +73,7 @@ public class PlaceGroup implements EventChildInterface {
private List<GroupMembership> members; private List<GroupMembership> members;
@OneToMany(mappedBy = "group") @OneToMany(mappedBy = "group")
@OrderBy("name")
private List<Place> places; private List<Place> places;
@Version @Version
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java
...@@ -10,7 +10,6 @@ import java.util.List; ...@@ -10,7 +10,6 @@ import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns; import javax.persistence.JoinColumns;
...@@ -21,24 +20,25 @@ import javax.persistence.OneToMany; ...@@ -21,24 +20,25 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Version;
/** /**
* *
*/ */
@Entity @Entity
@Table(name = "printed_cards") @Table(name = "printed_cards")
@NamedQueries( { @NamedQueries({
@NamedQuery(name = "PrintedCard.findAll", query = "SELECT p FROM PrintedCard p"), @NamedQuery(name = "PrintedCard.findAll", query = "SELECT p FROM PrintedCard p"),
@NamedQuery(name = "PrintedCard.findByPrintTime", query = "SELECT p FROM PrintedCard p WHERE p.printTime = :printTime"), @NamedQuery(name = "PrintedCard.findByPrintTime", query = "SELECT p FROM PrintedCard p WHERE p.printTime = :printTime"),
@NamedQuery(name = "PrintedCard.findByBarcode", query = "SELECT p FROM PrintedCard p WHERE p.barcode = :barcode"), @NamedQuery(name = "PrintedCard.findByBarcode", query = "SELECT p FROM PrintedCard p WHERE p.barcode = :barcode"),
@NamedQuery(name = "PrintedCard.findByEnabled", query = "SELECT p FROM PrintedCard p WHERE p.enabled = :enabled"), @NamedQuery(name = "PrintedCard.findByEnabled", query = "SELECT p FROM PrintedCard p WHERE p.enabled = :enabled"),
@NamedQuery(name = "PrintedCard.findByRfidUid", query = "SELECT p FROM PrintedCard p WHERE p.rfidUid = :rfidUid") }) @NamedQuery(name = "PrintedCard.findByRfidUid", query = "SELECT p FROM PrintedCard p WHERE p.rfidUid = :rfidUid") })
public class PrintedCard implements EventChildInterface { public class PrintedCard extends GenericEventChild {
private static final long serialVersionUID = 1L;
@EmbeddedId /**
private EventPk id; *
*/
private static final long serialVersionUID = 8603481931116401027L;
@Column(name = "print_time") @Column(name = "print_time")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
...@@ -48,18 +48,18 @@ public class PrintedCard implements EventChildInterface { ...@@ -48,18 +48,18 @@ public class PrintedCard implements EventChildInterface {
private String barcode; private String barcode;
@Column(name = "card_enabled", nullable = false) @Column(name = "card_enabled", nullable = false)
private boolean enabled; private boolean enabled = true;
@Column(name = "rfid_uid") @Column(name = "rfid_uid")
private String rfidUid; private String rfidUid ;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "printedCard") @OneToMany(cascade = CascadeType.ALL, mappedBy = "printedCard")
private List<ReaderEvent> readerEvents; private List<ReaderEvent> readerEvents;
@Column(name="print_count" ,nullable = false) @Column(name = "print_count", nullable = false)
private int printCount = 0; private int printCount = 0;
@JoinColumns( { @JoinColumns({
@JoinColumn(name = "current_location_id", referencedColumnName = "id"), @JoinColumn(name = "current_location_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne @ManyToOne
...@@ -69,35 +69,20 @@ public class PrintedCard implements EventChildInterface { ...@@ -69,35 +69,20 @@ public class PrintedCard implements EventChildInterface {
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User user; private User user;
@JoinColumns( { @JoinColumns({
@JoinColumn(name = "card_template_id", referencedColumnName = "id", nullable = false, updatable = false), @JoinColumn(name = "card_template_id", referencedColumnName = "id", nullable = false, updatable = false),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private CardTemplate template; private CardTemplate template;
@Version
@Column(nullable = false)
private int jpaVersionField = 0;
public PrintedCard() { public PrintedCard() {
} }
@Override
public EventPk getId() {
return id;
}
@Override
public void setId(EventPk id) {
this.id = id;
}
public PrintedCard(LanEvent event) { public PrintedCard(LanEvent event) {
this.id = new EventPk(event); setId(new EventPk(event));
} }
public PrintedCard(LanEvent event, Calendar printTime, public PrintedCard(LanEvent event, Calendar printTime, boolean cardEnabled) {
boolean cardEnabled) {
this(event); this(event);
this.printTime = printTime; this.printTime = printTime;
this.enabled = cardEnabled; this.enabled = cardEnabled;
...@@ -159,43 +144,13 @@ public class PrintedCard implements EventChildInterface { ...@@ -159,43 +144,13 @@ public class PrintedCard implements EventChildInterface {
this.user = usersId; this.user = usersId;
} }
@Override
public int hashCode() {
int hash = 0;
hash += (id != null ? id.hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof PrintedCard)) {
return false;
}
PrintedCard other = (PrintedCard) object;
if ((this.id == null && other.id != null)
|| (this.id != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.PrintedCard[id=" + id + "]"; return "fi.insomnia.bortal.model.PrintedCard[id=" + getId() + "]";
}
@Override
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
@Override
public int getJpaVersionField() {
return jpaVersionField;
} }
public void setTemplate(CardTemplate template) { public void setTemplate(CardTemplate template) {
this.template = template; this.template = template;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java
...@@ -12,8 +12,10 @@ import javax.persistence.Column; ...@@ -12,8 +12,10 @@ import javax.persistence.Column;
import javax.persistence.EmbeddedId; import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
...@@ -32,13 +34,10 @@ import javax.persistence.Version; ...@@ -32,13 +34,10 @@ import javax.persistence.Version;
@NamedQuery(name = "Product.findByPrice", query = "SELECT p FROM Product p WHERE p.price = :price"), @NamedQuery(name = "Product.findByPrice", query = "SELECT p FROM Product p WHERE p.price = :price"),
@NamedQuery(name = "Product.findBySort", query = "SELECT p FROM Product p WHERE p.sort = :sort"), @NamedQuery(name = "Product.findBySort", query = "SELECT p FROM Product p WHERE p.sort = :sort"),
@NamedQuery(name = "Product.findByBarcode", query = "SELECT p FROM Product p WHERE p.barcode = :barcode") }) @NamedQuery(name = "Product.findByBarcode", query = "SELECT p FROM Product p WHERE p.barcode = :barcode") })
public class Product implements EventChildInterface { public class Product extends GenericEventChild {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId
private EventPk id;
@Column(name = "product_name") @Column(name = "product_name")
private String name; private String name;
...@@ -57,6 +56,12 @@ public class Product implements EventChildInterface { ...@@ -57,6 +56,12 @@ public class Product implements EventChildInterface {
@Column(name = "instant_shop") @Column(name = "instant_shop")
private boolean prepaidInstant = false; private boolean prepaidInstant = false;
@JoinColumns({
@JoinColumn(name = "provided_role_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) })
@ManyToOne
private Role provides;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "product") @OneToMany(cascade = CascadeType.ALL, mappedBy = "product")
private List<Place> places; private List<Place> places;
...@@ -84,19 +89,12 @@ public class Product implements EventChildInterface { ...@@ -84,19 +89,12 @@ public class Product implements EventChildInterface {
uniqueConstraints = { @UniqueConstraint(columnNames = { "product_id", "food_wave_template_id", "event_id" }) }) uniqueConstraints = { @UniqueConstraint(columnNames = { "product_id", "food_wave_template_id", "event_id" }) })
private List<FoodWaveTemplate> foodWaveTemplates; private List<FoodWaveTemplate> foodWaveTemplates;
@Version
@Column(nullable = false)
private int jpaVersionField = 0;
public Product() { public Product() {
} super();
public Product(LanEvent event) {
this.id = new EventPk(event);
} }
public Product(LanEvent event, String name, BigDecimal price) { public Product(LanEvent event, String name, BigDecimal price) {
this(event); super(event);
this.price = price; this.price = price;
this.name = name; this.name = name;
...@@ -151,66 +149,10 @@ public class Product implements EventChildInterface { ...@@ -151,66 +149,10 @@ public class Product implements EventChildInterface {
} }
@Override @Override
public int hashCode() {
int hash = 0;
hash += (getId() != null ? getId().hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Product)) {
return false;
}
Product other = (Product) object;
if ((this.getId() == null && other.getId() != null)
|| (this.getId() != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Product[productsId=" + getId() + "]"; return "fi.insomnia.bortal.model.Product[productsId=" + getId() + "]";
} }
/**
* @return the id
*/
@Override
public EventPk getId() {
return id;
}
/**
* @param id
* the id to set
*/
@Override
public void setId(EventPk id) {
this.id = id;
}
/**
* @return the jpaVersionField
*/
@Override
public int getJpaVersionField() {
return jpaVersionField;
}
/**
* @param jpaVersionField
* the jpaVersionField to set
*/
@Override
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public void setDiscounts(List<Discount> discounts) { public void setDiscounts(List<Discount> discounts) {
this.discounts = discounts; this.discounts = discounts;
} }
...@@ -266,4 +208,12 @@ public class Product implements EventChildInterface { ...@@ -266,4 +208,12 @@ public class Product implements EventChildInterface {
return prepaidInstant; return prepaidInstant;
} }
public void setProvides(Role provides) {
this.provides = provides;
}
public Role getProvides() {
return provides;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java
...@@ -15,23 +15,19 @@ import javax.persistence.NamedQueries; ...@@ -15,23 +15,19 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version; import javax.persistence.Version;
import javax.persistence.UniqueConstraint;
/** /**
* *
*/ */
@Entity @Entity
@Table(name = "readers") @Table(name = "readers", uniqueConstraints = { @UniqueConstraint(columnNames = { "reader_ident", "event_id" }) })
@NamedQueries( { @NamedQueries({
@NamedQuery(name = "Reader.findAll", query = "SELECT r FROM Reader r"), @NamedQuery(name = "Reader.findAll", query = "SELECT r FROM Reader r"),
@NamedQuery(name = "Reader.findByIdentification", query = "SELECT r FROM Reader r WHERE r.identification = :identification"), @NamedQuery(name = "Reader.findByIdentification", query = "SELECT r FROM Reader r WHERE r.identification = :identification"),
@NamedQuery(name = "Reader.findByDescription", query = "SELECT r FROM Reader r WHERE r.description = :description") }) @NamedQuery(name = "Reader.findByDescription", query = "SELECT r FROM Reader r WHERE r.description = :description") })
public class Reader implements EventChildInterface { public class Reader extends GenericEventChild {
private static final long serialVersionUID = 1L;
@EmbeddedId
private EventPk id;
@Column(name = "reader_ident") @Column(name = "reader_ident")
private String identification; private String identification;
...@@ -40,14 +36,14 @@ public class Reader implements EventChildInterface { ...@@ -40,14 +36,14 @@ public class Reader implements EventChildInterface {
@Column(name = "reader_description") @Column(name = "reader_description")
private String description; private String description;
@JoinColumns( { @JoinColumns({
@JoinColumn(name = "location_id", referencedColumnName = "id"), @JoinColumn(name = "location_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) })
@ManyToOne @ManyToOne
private Location location; private Location location;
@ManyToOne @ManyToOne
@JoinColumns( { @JoinColumns({
@JoinColumn(name = "map_id", referencedColumnName = "id"), @JoinColumn(name = "map_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) })
private EventMap eventMap; private EventMap eventMap;
...@@ -61,17 +57,6 @@ public class Reader implements EventChildInterface { ...@@ -61,17 +57,6 @@ public class Reader implements EventChildInterface {
@Column(name = "map_y") @Column(name = "map_y")
private Integer mapY; private Integer mapY;
@Version
@Column(nullable = false)
private int jpaVersionField = 0;
public Reader() {
}
public Reader(LanEvent event) {
this.id = new EventPk(event);
}
public String getIdentification() { public String getIdentification() {
return identification; return identification;
} }
...@@ -97,67 +82,11 @@ public class Reader implements EventChildInterface { ...@@ -97,67 +82,11 @@ public class Reader implements EventChildInterface {
} }
@Override @Override
public int hashCode() {
int hash = 0;
hash += (getId() != null ? getId().hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Reader)) {
return false;
}
Reader other = (Reader) object;
if ((this.getId() == null && other.getId() != null)
|| (this.getId() != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Reader[id=" + getId() + "]"; return "fi.insomnia.bortal.model.Reader[id=" + getId() + "]";
} }
/** /**
* @return the id
*/
@Override
public EventPk getId() {
return id;
}
/**
* @param id
* the id to set
*/
@Override
public void setId(EventPk id) {
this.id = id;
}
/**
* @return the jpaVersionField
*/
@Override
public int getJpaVersionField() {
return jpaVersionField;
}
/**
* @param jpaVersionField
* the jpaVersionField to set
*/
@Override
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
/**
* @return the mapX * @return the mapX
*/ */
public Integer getMapX() { public Integer getMapX() {
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
...@@ -24,18 +24,15 @@ import javax.persistence.Version; ...@@ -24,18 +24,15 @@ import javax.persistence.Version;
*/ */
@Entity @Entity
@Table(name = "reader_events") @Table(name = "reader_events")
@NamedQueries( { @NamedQueries({
@NamedQuery(name = "ReaderEvent.findAll", query = "SELECT r FROM ReaderEvent r"), @NamedQuery(name = "ReaderEvent.findAll", query = "SELECT r FROM ReaderEvent r"),
@NamedQuery(name = "ReaderEvent.findByTime", query = "SELECT r FROM ReaderEvent r WHERE r.time = :time"), @NamedQuery(name = "ReaderEvent.findByTime", query = "SELECT r FROM ReaderEvent r WHERE r.time = :time"),
@NamedQuery(name = "ReaderEvent.findByValue", query = "SELECT r FROM ReaderEvent r WHERE r.value = :value") }) @NamedQuery(name = "ReaderEvent.findByValue", query = "SELECT r FROM ReaderEvent r WHERE r.value = :value") })
public class ReaderEvent implements EventChildInterface { public class ReaderEvent extends GenericEventChild {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId
private EventPk id;
@Column(name = "event_time", nullable = false) @Column(name = "event_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar time; private Calendar time;
...@@ -43,31 +40,23 @@ public class ReaderEvent implements EventChildInterface { ...@@ -43,31 +40,23 @@ public class ReaderEvent implements EventChildInterface {
@Column(name = "value") @Column(name = "value")
private String value; private String value;
@JoinColumns( { @JoinColumns({
@JoinColumn(name = "printed_cards_id", referencedColumnName = "id", nullable = false, updatable = false), @JoinColumn(name = "printed_cards_id", referencedColumnName = "id", nullable = false, updatable = false),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private PrintedCard printedCard; private PrintedCard printedCard;
@JoinColumns( { @JoinColumns({
@JoinColumn(name = "readers_id", referencedColumnName = "id", nullable = false, updatable = false), @JoinColumn(name = "readers_id", referencedColumnName = "id", nullable = false, updatable = false),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private Reader reader; private Reader reader;
@Version
@Column(nullable = false)
private int jpaVersionField = 0;
public ReaderEvent() { public ReaderEvent() {
} }
public ReaderEvent(LanEvent event) {
this.id = new EventPk(event);
}
public ReaderEvent(LanEvent event, Calendar eventTime, PrintedCard card, Reader reader) { public ReaderEvent(LanEvent event, Calendar eventTime, PrintedCard card, Reader reader) {
this(event); super(event);
this.time = eventTime; this.time = eventTime;
this.printedCard = card; this.printedCard = card;
this.reader = reader; this.reader = reader;
...@@ -106,63 +95,8 @@ public class ReaderEvent implements EventChildInterface { ...@@ -106,63 +95,8 @@ public class ReaderEvent implements EventChildInterface {
} }
@Override @Override
public int hashCode() {
int hash = 0;
hash += (getId() != null ? getId().hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof ReaderEvent)) {
return false;
}
ReaderEvent other = (ReaderEvent) object;
if ((this.getId() == null && other.getId() != null)
|| (this.getId() != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.ReaderEvent[id=" + getId() + "]"; return "fi.insomnia.bortal.model.ReaderEvent[id=" + getId() + "]";
} }
/**
* @return the id
*/
@Override
public EventPk getId() {
return id;
}
/**
* @param id
* the id to set
*/
@Override
public void setId(EventPk id) {
this.id = id;
}
/**
* @return the jpaVersionField
*/
@Override
public int getJpaVersionField() {
return jpaVersionField;
}
/**
* @param jpaVersionField
* the jpaVersionField to set
*/
@Override
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java
...@@ -9,7 +9,6 @@ import java.util.List; ...@@ -9,7 +9,6 @@ import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns; import javax.persistence.JoinColumns;
...@@ -21,7 +20,6 @@ import javax.persistence.NamedQuery; ...@@ -21,7 +20,6 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
/** /**
* *
...@@ -34,11 +32,12 @@ import javax.persistence.Version; ...@@ -34,11 +32,12 @@ import javax.persistence.Version;
// @NamedQuery(name="Role.findParentsExcluding", query="select r from // @NamedQuery(name="Role.findParentsExcluding", query="select r from
// Role r, RoleRight rr where :user member of r.users ), // Role r, RoleRight rr where :user member of r.users ),
@NamedQuery(name = "Role.findForUser", query = "SELECT r FROM Role r WHERE :user MEMBER OF r.users and r.event = :event") }) @NamedQuery(name = "Role.findForUser", query = "SELECT r FROM Role r WHERE :user MEMBER OF r.users and r.event = :event") })
public class Role implements EventChildInterface { public class Role extends GenericEventChild {
private static final long serialVersionUID = 1L; /**
@EmbeddedId *
private EventPk id; */
private static final long serialVersionUID = -4602863502464505404L;
@Column(name = "role_name", nullable = false) @Column(name = "role_name", nullable = false)
private String name; private String name;
...@@ -49,6 +48,12 @@ public class Role implements EventChildInterface { ...@@ -49,6 +48,12 @@ public class Role implements EventChildInterface {
@ManyToMany(mappedBy = "parents") @ManyToMany(mappedBy = "parents")
private List<Role> children = new ArrayList<Role>(); private List<Role> children = new ArrayList<Role>();
@OneToMany(mappedBy = "provides")
private List<Product> productsProvide;
@OneToMany(mappedBy = "providesRole")
private List<Place> placesProvide;
@ManyToMany() @ManyToMany()
@JoinTable(name = "role_parents", @JoinTable(name = "role_parents",
inverseJoinColumns = { inverseJoinColumns = {
...@@ -63,7 +68,7 @@ public class Role implements EventChildInterface { ...@@ -63,7 +68,7 @@ public class Role implements EventChildInterface {
private List<RoleRight> roleRights; private List<RoleRight> roleRights;
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "card_template_id", referencedColumnName = "id", updatable = false, insertable = false), @JoinColumn(name = "card_template_id", referencedColumnName = "id"),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) })
@ManyToOne @ManyToOne
private CardTemplate cardTemplate; private CardTemplate cardTemplate;
...@@ -78,15 +83,11 @@ public class Role implements EventChildInterface { ...@@ -78,15 +83,11 @@ public class Role implements EventChildInterface {
@JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false) @JoinColumn(name = "event_id", referencedColumnName = "event_id", updatable = false, insertable = false)
private LanEvent event; private LanEvent event;
@Version
@Column(nullable = false)
private int jpaVersionField = 0;
public Role() { public Role() {
} }
public Role(LanEvent event) { public Role(LanEvent event) {
this.id = new EventPk(event); super(event);
this.event = event; this.event = event;
} }
...@@ -120,66 +121,10 @@ public class Role implements EventChildInterface { ...@@ -120,66 +121,10 @@ public class Role implements EventChildInterface {
} }
@Override @Override
public int hashCode() {
int hash = 0;
hash += (getId() != null ? getId().hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Role)) {
return false;
}
Role other = (Role) object;
if ((this.getId() == null && other.getId() != null)
|| (this.getId() != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Role[id=" + getId() + "]"; return "fi.insomnia.bortal.model.Role[id=" + getId() + "]";
} }
/**
* @return the id
*/
@Override
public EventPk getId() {
return id;
}
/**
* @param id
* the id to set
*/
@Override
public void setId(EventPk id) {
this.id = id;
}
/**
* @return the jpaVersionField
*/
@Override
public int getJpaVersionField() {
return jpaVersionField;
}
/**
* @param jpaVersionField
* the jpaVersionField to set
*/
@Override
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
public void setUsers(List<User> users) { public void setUsers(List<User> users) {
this.users = users; this.users = users;
} }
...@@ -223,4 +168,20 @@ public class Role implements EventChildInterface { ...@@ -223,4 +168,20 @@ public class Role implements EventChildInterface {
public LanEvent getEvent() { public LanEvent getEvent() {
return event; return event;
} }
public void setProductsProvide(List<Product> productsProvide) {
this.productsProvide = productsProvide;
}
public List<Product> getProductsProvide() {
return productsProvide;
}
public void setPlacesProvide(List<Place> placesProvide) {
this.placesProvide = placesProvide;
}
public List<Place> getPlacesProvide() {
return placesProvide;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight.java
...@@ -34,6 +34,7 @@ import fi.insomnia.bortal.enums.Permission; ...@@ -34,6 +34,7 @@ import fi.insomnia.bortal.enums.Permission;
@ObjectTypeConverter(name = "permissionconverter", objectType = Permission.class, dataType = String.class, conversionValues = { @ObjectTypeConverter(name = "permissionconverter", objectType = Permission.class, dataType = String.class, conversionValues = {
@ConversionValue(dataValue = "LOGIN", objectValue = "LOGIN"), @ConversionValue(dataValue = "LOGIN", objectValue = "LOGIN"),
@ConversionValue(dataValue = "USER_MANAGEMENT", objectValue = "USER_MANAGEMENT"), @ConversionValue(dataValue = "USER_MANAGEMENT", objectValue = "USER_MANAGEMENT"),
@ConversionValue(dataValue = "ACCOUNT_MANAGEMENT", objectValue = "ACCOUNT_MANAGEMENT"),
@ConversionValue(dataValue = "MAP", objectValue = "MAP"), @ConversionValue(dataValue = "MAP", objectValue = "MAP"),
@ConversionValue(dataValue = "BILL", objectValue = "BILL"), @ConversionValue(dataValue = "BILL", objectValue = "BILL"),
@ConversionValue(dataValue = "ROLE_MANAGEMENT", objectValue = "ROLE_MANAGEMENT"), @ConversionValue(dataValue = "ROLE_MANAGEMENT", objectValue = "ROLE_MANAGEMENT"),
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
...@@ -86,7 +86,7 @@ public class User implements ModelInterface { ...@@ -86,7 +86,7 @@ public class User implements ModelInterface {
private Calendar birthday; private Calendar birthday;
@NotNull @NotNull
@Size(min = 2, message="{user.nickSizeMessage}") @Size(min = 2, message = "{user.nickSizeMessage}")
@Column(name = "nick") @Column(name = "nick")
private String nick = ""; private String nick = "";
...@@ -141,7 +141,7 @@ public class User implements ModelInterface { ...@@ -141,7 +141,7 @@ public class User implements ModelInterface {
@OneToMany(mappedBy = "user") @OneToMany(mappedBy = "user")
private List<LogEntry> logEntryList; private List<LogEntry> logEntryList;
@OneToMany(mappedBy = "user", fetch = FetchType.LAZY,cascade=CascadeType.ALL) @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@OrderBy @OrderBy
private List<UserImage> userImageList; private List<UserImage> userImageList;
...@@ -213,8 +213,7 @@ public class User implements ModelInterface { ...@@ -213,8 +213,7 @@ public class User implements ModelInterface {
this.votes = votes; this.votes = votes;
} }
public User(Integer usersId, Calendar created, boolean active, String lastname, public User(Integer usersId, Calendar created, boolean active, String lastname, String firstnames) {
String firstnames) {
this.id = usersId; this.id = usersId;
this.created = created; this.created = created;
this.active = active; this.active = active;
...@@ -248,6 +247,10 @@ public class User implements ModelInterface { ...@@ -248,6 +247,10 @@ public class User implements ModelInterface {
this.password = password; this.password = password;
} }
public String getWholeName() {
return new StringBuilder(firstnames).append(" ").append(lastname).toString();
}
public String getLastname() { public String getLastname() {
return lastname; return lastname;
} }
......
code/LanBortalUtilities/.classpath
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="src" path="/LanBortalBeansClient"/> <classpathentry kind="src" path="/LanBortalBeansClient"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)">
<attributes>
<attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/LanBortalUtilities/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.java" version="6.0"/> <installed facet="jst.java" version="6.0"/>
......
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/BeanContextHolder.java 0 → 100644
package fi.insomnia.bortal.utilities;
import java.util.HashMap;
import java.util.Map;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.RoleRight;
public class BeanContextHolder {
private Map<Permission, Map<RolePermission, Boolean>> rightcache = new HashMap<Permission, Map<RolePermission, Boolean>>();
public Boolean hasPermission(Permission target, RolePermission permission) {
Map<RolePermission, Boolean> permmap = rightcache.get(target);
if (permmap == null) {
permmap = new HashMap<RolePermission, Boolean>();
rightcache.put(target, permmap);
}
return permmap.get(permission);
}
public void setPermission(Permission target, RolePermission permission, Boolean ret) {
Map<RolePermission, Boolean> permmap = rightcache.get(target);
if (permmap == null) {
permmap = new HashMap<RolePermission, Boolean>();
rightcache.put(target, permmap);
}
permmap.put(permission, ret);
}
public void setPermission(RoleRight rr) {
if (rr.isExecute()) {
setPermission(rr.getPermission(), RolePermission.EXECUTE, true);
}
if (rr.isWrite()) {
setPermission(rr.getPermission(), RolePermission.WRITE, true);
}
if (rr.isRead()) {
setPermission(rr.getPermission(), RolePermission.READ, true);
}
}
}
\ No newline at end of file
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/BortalLocalContextHolder.java
...@@ -87,4 +87,8 @@ public class BortalLocalContextHolder { ...@@ -87,4 +87,8 @@ public class BortalLocalContextHolder {
} }
} }
public static BortalLocalContextHolder getInstance() {
return getThread();
}
} }
\ No newline at end of file
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/PasswordFunctions.java
...@@ -11,7 +11,6 @@ import fi.insomnia.bortal.utilities.apachecodec.binary.Base64; ...@@ -11,7 +11,6 @@ import fi.insomnia.bortal.utilities.apachecodec.binary.Base64;
public class PasswordFunctions { public class PasswordFunctions {
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory
.getLogger(PasswordFunctions.class); .getLogger(PasswordFunctions.class);
...@@ -81,21 +80,25 @@ public class PasswordFunctions { ...@@ -81,21 +80,25 @@ public class PasswordFunctions {
if (!theSame && UGLY_FIX) { if (!theSame && UGLY_FIX) {
theSame = new UglyFix(newBase64, oldBase64).check(); theSame = new UglyFix(newBase64, oldBase64).check();
} }
return theSame; return theSame;
} }
private static final int SALT_LENGTH = 4; private static final int SALT_LENGTH = 4;
private static final String ALLOWED_RANDOM_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; private static final String ALLOWED_PASSWORD_CHARS = "23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz";
public static String generateRandomString(int length) { public static String generateRandomString(int length) {
return generateRandomString(length, ALLOWED_PASSWORD_CHARS);
}
public static String generateRandomString(int length, String allowedCharacters) {
Random random = new Random(); Random random = new Random();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
int index = random.nextInt(ALLOWED_RANDOM_CHARS.length()); int index = random.nextInt(allowedCharacters.length());
sb.append(ALLOWED_RANDOM_CHARS.charAt(index)); sb.append(allowedCharacters.charAt(index));
} }
return sb.toString(); return sb.toString();
} }
......
code/LanBortalWeb/WebContent/WEB-INF/web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" <display-name>LanBortalWeb</display-name>
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" <session-config>
id="WebApp_ID" version="2.5"> <session-timeout>30</session-timeout>
<display-name>LanBortalWeb</display-name> </session-config>
<context-param>
<session-config> <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<session-timeout>30</session-timeout> <param-value>true</param-value>
</session-config> </context-param>
<context-param> <servlet-mapping>
<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name> <servlet-name>PlaceMap</servlet-name>
<param-value>true</param-value> <url-pattern>/PlaceMap</url-pattern>
</context-param> </servlet-mapping>
<servlet-mapping> <welcome-file-list>
<servlet-name>PlaceMap</servlet-name> <welcome-file>index.html</welcome-file>
<url-pattern>/PlaceMap</url-pattern> <welcome-file>index.jsf</welcome-file>
</servlet-mapping> <welcome-file>index.jsp</welcome-file>
<welcome-file-list> </welcome-file-list>
<welcome-file>index.html</welcome-file> <servlet>
<welcome-file>index.jsf</welcome-file> <servlet-name>Faces Servlet</servlet-name>
<welcome-file>index.jsp</welcome-file> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
</welcome-file-list> </servlet>
<servlet> <servlet>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>UploadServlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <servlet-class>fi.insomnia.bortal.servlet.UploadServlet</servlet-class>
</servlet> </servlet>
<servlet> <servlet-mapping>
<servlet-name>UploadServlet</servlet-name> <servlet-name>UploadServlet</servlet-name>
<servlet-class>fi.insomnia.bortal.servlet.UploadServlet</servlet-class> <url-pattern>/UploadServlet</url-pattern>
</servlet> </servlet-mapping>
<servlet-mapping> <servlet>
<servlet-name>UploadServlet</servlet-name> <servlet-name>UserImageServlet</servlet-name>
<url-pattern>/UploadServlet</url-pattern> <servlet-class>fi.insomnia.bortal.servlet.UserImageServlet</servlet-class>
</servlet-mapping> </servlet>
<servlet> <servlet-mapping>
<servlet-name>UserImageServlet</servlet-name> <servlet-name>UserImageServlet</servlet-name>
<servlet-class>fi.insomnia.bortal.servlet.UserImageServlet</servlet-class> <url-pattern>/Userimage</url-pattern>
</servlet> </servlet-mapping>
<servlet-mapping> <servlet>
<servlet-name>UserImageServlet</servlet-name> <servlet-name>PlaceMap</servlet-name>
<url-pattern>/Userimage</url-pattern> <servlet-class>fi.insomnia.bortal.servlet.PlaceMap</servlet-class>
</servlet-mapping> </servlet>
<servlet-mapping>
<servlet> <servlet-name>Faces Servlet</servlet-name>
<servlet-name>PlaceMap</servlet-name> <url-pattern>*.jsf</url-pattern>
<servlet-class>fi.insomnia.bortal.servlet.PlaceMap</servlet-class> </servlet-mapping>
</servlet> <filter>
<servlet-mapping> <display-name>HostnameFilter</display-name>
<servlet-name>Faces Servlet</servlet-name> <filter-name>HostnameFilter</filter-name>
<url-pattern>*.jsf</url-pattern> <filter-class>fi.insomnia.bortal.HostnameFilter</filter-class>
</servlet-mapping> </filter>
<filter> <filter-mapping>
<display-name>HostnameFilter</display-name> <filter-name>HostnameFilter</filter-name>
<filter-name>HostnameFilter</filter-name> <servlet-name>*</servlet-name>
<filter-class>fi.insomnia.bortal.HostnameFilter</filter-class> </filter-mapping>
</filter> <login-config>
<filter-mapping> <auth-method>FORM</auth-method>
<filter-name>HostnameFilter</filter-name> <realm-name>omniarealm</realm-name>
<servlet-name>*</servlet-name> <form-login-config>
</filter-mapping> <form-login-page>/auth/login.jsf</form-login-page>
<login-config> <form-error-page>/auth/loginError.jsf</form-error-page>
<auth-method>FORM</auth-method> </form-login-config>
<realm-name>omniarealm</realm-name> </login-config>
<form-login-config> <security-role>
<form-login-page>/auth/login.jsf</form-login-page> <role-name>SUPERADMIN</role-name>
<form-error-page>/auth/loginError.jsf</form-error-page> </security-role>
</form-login-config> <security-role>
</login-config> <role-name>USER_BASE</role-name>
<security-role> </security-role>
<role-name>SUPERADMIN</role-name> <security-role>
</security-role> <role-name>ADMIN_BASE</role-name>
<security-role> </security-role>
<role-name>USER_BASE</role-name> <security-role>
</security-role> <role-name>ANONYMOUS</role-name>
<security-role> </security-role>
<role-name>ADMIN_BASE</role-name> <security-role>
</security-role> <role-name>ORGANIZATION_ROOT</role-name>
<security-role> </security-role>
<role-name>ANONYMOUS</role-name> <security-constraint>
</security-role> <web-resource-collection>
<security-role> <web-resource-name>forbidden</web-resource-name>
<role-name>ORGANIZATION_ROOT</role-name> <url-pattern>*.xhtml</url-pattern>
</security-role> <url-pattern>/layout/*</url-pattern>
<security-constraint> <url-pattern>/resources/tools/*</url-pattern>
<web-resource-collection> </web-resource-collection>
<web-resource-name>forbidden</web-resource-name> <auth-constraint>
<url-pattern>*.xhtml</url-pattern> <description>Thou shall not read the sources or use utils directly</description>
<url-pattern>/layout/*</url-pattern> </auth-constraint>
<url-pattern>/resources/tools/*</url-pattern> </security-constraint>
</web-resource-collection> <security-constraint>
<auth-constraint> <display-name>Forbidden resource</display-name>
<description>Thou shall not read the sources or use utils directly</description> <web-resource-collection>
</auth-constraint> <web-resource-name>Forbidden</web-resource-name>
</security-constraint> <url-pattern>*.xhtml</url-pattern>
<url-pattern>/layout/*</url-pattern>
<security-constraint> <url-pattern>/resources/tools/*</url-pattern>
<display-name>Forbidden resource</display-name> </web-resource-collection>
<web-resource-collection> <auth-constraint>
<web-resource-name>Forbidden</web-resource-name> <description>Thou shall not read the sources or use utils directly</description>
<url-pattern>*.xhtml</url-pattern> </auth-constraint>
<url-pattern>/layout/*</url-pattern> </security-constraint>
<url-pattern>/resources/tools/*</url-pattern> <servlet>
</web-resource-collection> <description></description>
<auth-constraint> <display-name>PrintBill</display-name>
<description>Thou shall not read the sources or use utils directly</description> <servlet-name>PrintBill</servlet-name>
</auth-constraint> <servlet-class>fi.insomnia.bortal.servlet.PrintBill</servlet-class>
</security-constraint> </servlet>
<servlet-mapping>
<servlet-name>PrintBill</servlet-name>
<servlet> <url-pattern>/PrintBill</url-pattern>
<description></description> </servlet-mapping>
<display-name>PrintBill</display-name> <error-page>
<servlet-name>PrintBill</servlet-name> <error-code>401</error-code>
<servlet-class>fi.insomnia.bortal.servlet.PrintBill</servlet-class> <location>/permissionDeniedRedirect.jsp</location>
</servlet> </error-page>
<servlet-mapping> <error-page>
<servlet-name>PrintBill</servlet-name> <error-code>403</error-code>
<url-pattern>/PrintBill</url-pattern> <location>/permissionDeniedRedirect.jsp</location>
</servlet-mapping> </error-page>
<error-page> <error-page>
<error-code>401</error-code> <exception-type>fi.insomnia.bortal.exceptions.PermissionDeniedException</exception-type>
<location>/permissionDeniedRedirect.jsp</location> <location>/permissionDeniedRedirect.jsp</location>
</error-page> </error-page>
<error-page> <error-page>
<error-code>403</error-code> <exception-type>import javax.servlet.ServletException</exception-type>
<location>/permissionDeniedRedirect.jsp</location> <location>/permissionDeniedRedirect.jsp</location>
</error-page> </error-page>
<error-page> <persistence-unit-ref>
<exception-type>fi.insomnia.bortal.exceptions.PermissionDeniedException</exception-type> <persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name>
<location>/permissionDeniedRedirect.jsp</location> </persistence-unit-ref>
</error-page> <servlet>
<error-page> <description></description>
<exception-type>import javax.servlet.ServletException</exception-type> <display-name>PlaceGroupPdf</display-name>
<location>/permissionDeniedRedirect.jsp</location> <servlet-name>PlaceGroupPdf</servlet-name>
</error-page> <servlet-class>fi.insomnia.bortal.servlet.PlaceGroupPdf</servlet-class>
</servlet>
<servlet-mapping>
<persistence-unit-ref> <servlet-name>PlaceGroupPdf</servlet-name>
<persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name> <url-pattern>/PlaceGroupPdf</url-pattern>
</persistence-unit-ref> </servlet-mapping>
</web-app> </web-app>
\ No newline at end of file
code/LanBortalWeb/WebContent/account/edit.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:account="http://java.sun.com/jsf/composite/tools/account" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.account.edit" />
<ui:define name="content">
<tools:canWrite target="ACCOUNT_MANAGEMENT">
<h:form id="placeEdit">
<h:inputHidden value="#{accountView.account.id.id}" />
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['accountevent.total']}:" />
<h:outputText value="#{accountView.account.total}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:outputText>
<h:outputLabel value="#{i18n['accountevent.quantity']}:" />
<h:inputText value="#{accountView.account.quantity}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:inputText>
<h:outputLabel value="#{i18n['accountEvent.unitPrice']}:" />
<h:inputText value="#{accountView.account.unitPrice}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:inputText>
<h:outputLabel value="#{i18n['accountevent.eventTime']}:" />
<h:inputText value="#{accountView.account.eventTime.time}">
<f:convertDateTime type="both" timeZone="#{sessionHandler.timezone}" />
</h:inputText>
<h:outputLabel value="#{i18n['accountevent.delivered']}:" />
<h:inputText value="#{accountView.account.delivered.time}">
<f:convertDateTime type="both" timeZone="#{sessionHandler.timezone}" />
</h:inputText>
<h:outputLabel value="#{i18n['accountevent.seller']}:" />
<h:outputText value="#{accountView.account.seller.wholeName}">
</h:outputText>
</h:panelGrid>
<h:commandButton rendered="#{sessionHandler.canWrite('ACCOUNT_MANAGEMENT')}" id="commitbtn"
action="#{accountView.merge()}" value="#{i18n['accountevent.commit']}" />
<br />
<h:commandButton rendered="#{sessionHandler.canWrite('ACCOUNT_MANAGEMENT')}" id="deletebtn"
action="#{accountView.delete()}" value="#{i18n['accountevent.delete']}" />
</h:form>
<h:dataTable border="0" id="discountlist" value="#{accountView.account.discountInstances}" var="discount">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['discount.percentage']}" />
</f:facet>
<h:outputText value="#{discount.discount.percentage}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['discount.code']}" />
</f:facet>
<h:outputText value="#{discount.discount.code}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['discount.details']}" />
</f:facet>
<h:outputText value="#{discount.discount.details}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['discount.shortdesc']}" />
</f:facet>
<h:outputText value="#{discount.discount.shortdesc}" />
</h:column>
</h:dataTable>
</tools:canWrite>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/eventorg/editEvent.xhtml
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
<f:convertDateTime /> <f:convertDateTime />
</h:inputText> </h:inputText>
<h:outputLabel value="#{i18n['event.defaultRole']}:" /> <h:outputLabel value="#{i18n['event.defaultRole']}:" />
<h:selectOneMenu converter="#{eventorgView.roleconverter}" value="#{eventorgView.event.defaultRole}" > <h:selectOneMenu converter="#{eventorgView.roleconverter}" value="#{eventorgView.event.defaultRole}" >
<f:selectItems var="role" itemLabel="#{role.name}" value="#{eventorgView.eventsRolelist}" /> <f:selectItems var="role" itemLabel="#{role.name}" value="#{eventorgView.eventsRolelist}" />
</h:selectOneMenu> </h:selectOneMenu>
<h:commandButton id="commitbtn" action="#{eventorgView.saveEvent()}" value="#{i18n['event.save']}" /> <h:commandButton id="commitbtn" action="#{eventorgView.saveEvent()}" value="#{i18n['event.save']}" />
</h:panelGrid> </h:panelGrid>
</h:form> </h:form>
......
code/LanBortalWeb/WebContent/generateTestData.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html">
xmlns:h="http://java.sun.com/jsf/html"> <h:head>
<h:head> <title>Facelet Title</title>
<title>Facelet Title</title> </h:head>
</h:head> <h:body>
<h:body> <h:form>
<h:form> <!-- todo: remember to remove this :) -->
<!-- todo: remember to remove this :) --> <h:commandButton value="generate the data" action="#{TestDataView.generateData}" />
<h:commandButton value="generate the data" action="#{TestDataView.generateData}" />
<br /> <br />
<br /> <br />
<h:commandButton value="print places debug info" action="#{TestDataView.printPlacesInfo}" /> <h:commandButton value="print places debug info" action="#{TestDataView.printPlacesInfo}" />
<br /> <br />
<h:commandButton value="Generate map tests" action="#{TestDataView.generateMapTests}" /> <h:commandButton value="Generate map tests" action="#{TestDataView.generateMapTests}" />
<br /> <br />
<h:commandButton value="Gen Test map" action="#{TestDataView.generateTestMap}" /> <h:commandButton value="Gen Test map" action="#{TestDataView.generateTestMap}" />
<br /> <br />
<h:commandButton value="Context Test" action="#{TestDataView.contextTest}" /> <h:commandButton value="Context Test" action="#{TestDataView.contextTest}" />
<br /> <br />
<h:commandButton value="Role Test" action="#{TestDataView.roletest}" /> <h:commandButton value="Role Test" action="#{TestDataView.roletest}" />
<br /> <br />
<h:commandButton value="Multipart mailtest" action="#{TestDataView.multiparttest}" />
</h:form> <br />
</h:body> <h:commandButton value="Check Gms" action="#{placeView.checkMemberships()}" />
<br />
<h:commandButton value="Check all cards" action="#{TestDataView.checkCards()}" />
<br />
</h:form>
</h:body>
</html> </html>
code/LanBortalWeb/WebContent/layout/insomnia1/sidebar-admin.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools"
>
<h:body> <h:body>
<ui:composition rendered="#{sessionHandler.loggedIn}" template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition rendered="#{sessionHandler.loggedIn}" template="/layout/insomnia1/sidebartemplate.xhtml">
<ui:param name="rendered" value="true" /> <ui:param name="rendered" value="true" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
<tools:canRead target="ROLE_MANAGEMENT" >
#{i18n['sidebar.roles']}
<ul> <ul>
<li><h:link outcome="/role/create" value="#{i18n['sidebar.role.create']}"/></li> <tools:canRead target="ROLE_MANAGEMENT">
<li><h:link outcome="/role/list" value="#{i18n['sidebar.role.list']}"/></li> <li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.roles']}" />
<ul>
</ul> <li><h:link outcome="/role/create" value="#{i18n['sidebar.role.create']}" /></li>
</tools:canRead> <li><h:link outcome="/role/list" value="#{i18n['sidebar.role.list']}" /></li>
<tools:canRead target="BILL" > <li><h:link outcome="/user/createCardTemplate" value="#{i18n['sidebar.cardTemplate.create']}" /></li>
#{i18n['sidebar.bills']} <li><h:link outcome="/user/listCardTemplates" value="#{i18n['sidebar.cardTemplate.list']}" /></li>
<ul>
<li><h:link outcome="/bill/listAll" value="#{i18n['sidebar.bill.listAll']}"/></li> </ul>
<li><h:link outcome="/bill/billSummary" value="#{i18n['sidebar.bill.summary']}"/></li> </li>
</ul> </tools:canRead>
</tools:canRead> <tools:canRead target="BILL">
<tools:canRead target="USER_MANAGEMENT"> <li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.bills']}" />
#{i18n['sidebar.users']} <ul>
<ul> <li><h:link outcome="/bill/listAll" value="#{i18n['sidebar.bill.listAll']}" /></li>
<li><h:link outcome="/user/create" value="#{i18n['sidebar.user.create']}"/></li> <li><h:link outcome="/bill/billSummary" value="#{i18n['sidebar.bill.summary']}" /></li>
<li><h:link outcome="/user/list" value="#{i18n['sidebar.user.list']}"/></li> </ul>
</ul> </li>
</tools:canRead>
</tools:canRead> <tools:canRead target="USER_MANAGEMENT">
<tools:canRead target="PRODUCT" > <li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.users']}" />
#{i18n['sidebar.products']} <ul>
<ul> <li><h:link outcome="/user/create" value="#{i18n['sidebar.user.create']}" /></li>
<li><h:link outcome="/product/create" value="#{i18n['sidebar.product.create']}"/></li> <li><h:link outcome="/user/list" value="#{i18n['sidebar.user.list']}" /></li>
<li><h:link outcome="/product/list" value="#{i18n['sidebar.product.list']}"/></li> </ul>
</ul> </li>
</tools:canRead> </tools:canRead>
<tools:canRead target="PRODUCT">
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.products']}" />
<ul>
<li><h:link outcome="/product/create" value="#{i18n['sidebar.product.create']}" /></li>
<li><h:link outcome="/product/list" value="#{i18n['sidebar.product.list']}" /></li>
</ul>
</li>
</tools:canRead>
<tools:canRead target="MAP">
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.maps']}" />
<ul>
<li><h:link outcome="/map/list" value="#{i18n['sidebar.map.list']}" /></li>
</ul>
</li>
</tools:canRead>
<tools:canRead target="MAP" >
#{i18n['sidebar.maps']} <li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.other']}" />
<ul> <ul>
<li><h:link outcome="/map/list" value="#{i18n['sidebar.map.list']}"/></li> <li><h:link outcome="/eventorg/list" value="#{i18n['sidebar.eventorg.list']}" /></li>
</ul> </ul>
</tools:canRead> </li>
#{i18n['sidebar.other']}
<ul>
<li><h:link outcome="/eventorg/list" value="#{i18n['sidebar.eventorg.list']}"/></li>
</ul> </ul>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/LanBortalWeb/WebContent/place/edit.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.place.edit" />
<ui:define name="content">
<h1>#{i18n['editplace.header']}</h1>
<h1>edit:</h1>
<h:form id="placeEdit">
<h:inputHidden value="#{placeView.place.id.id}" />
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['place.name']}:" />
<h:inputText value="#{placeView.place.name}" />
<h:outputLabel value="#{i18n['place.mapX']}:" />
<h:inputText value="#{placeView.place.mapX}" />
<h:outputLabel value="#{i18n['place.mapY']}:" />
<h:inputText value="#{placeView.place.mapY}" />
<h:outputLabel value="#{i18n['place.width']}:" />
<h:inputText value="#{placeView.place.width}" />
<h:outputLabel value="#{i18n['place.height']}:" />
<h:inputText value="#{placeView.place.height}" />
<h:outputLabel value="#{i18n['place.releasetime']}:" />
<h:outputText value="#{placeView.place.releaseTime.time}">
<f:convertDateTime pattern="yyyy.MM.dd HH:mm" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
<h:outputLabel value="#{i18n['place.code']}:" />
<h:inputText value="#{placeView.place.code}" />
<h:outputLabel value="#{i18n['place.product']}:" />
<h:outputText value="#{placeView.place.product.name}" />
<h:outputLabel value="#{i18n['place.description']}:" />
<h:inputTextarea value="#{placeView.place.description}" />
</h:panelGrid>
<h:commandButton rendered="#{placeView.place.isTaken() and (empty placeView.place.group)}"
action="#{placeView.releasePlace()}" value="#{i18n['place.release']}" />
<h:commandButton rendered="#{placeView.place.isTaken() and (!empty placeView.place.group)}"
action="#{placeView.removePlaceFromGroup()}" value="#{i18n['place.groupremove']}"
onclick="return confirm('#{i18n['place.groupremove.confirm']}')" />
<h:commandButton id="commitbtn" action="#{placeView.save()}" value="#{i18n['place.commit']}" />
</h:form>
#{placeView.initGroupsPlacelist()}
<h:form rendered="#{!empty placeView.place.group and placeView.place.group.places.size() gt 0}">
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['placegroup.name']}:" />
<h:inputText value="#{placeView.place.group.name}" />
<h:outputLabel value="#{i18n['placegroup.created']}:" />
<h:inputText value="#{placeView.place.group.created.time}">
<f:convertDateTime pattern="yyyy.MM.dd HH:mm" timeZone="#{sessionHandler.timezone}" />
</h:inputText>
<h:outputLabel value="#{i18n['placegroup.edited']}:" />
<h:inputText value="#{placeView.place.group.edited.time}">
<f:convertDateTime pattern="yyyy.MM.dd HH:mm" timeZone="#{sessionHandler.timezone}" />
</h:inputText>
<h:outputLabel value="#{i18n['placegroup.details']}:" />
<h:inputTextarea value="#{placeView.place.group.details}" />
</h:panelGrid>
</h:form>
<h:form rendered="#{!empty placeView.place.group and placeView.place.group.places.size() gt 0}">
<h:dataTable border="0" id="placelist" value="#{placeView.placesGroupPlaces}" var="place">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['place.name']}" />
</f:facet>
<h:outputText value="#{place.name}" />
</h:column>
<h:column>
<h:commandButton action="#{placeView.editPlacegroupPlace()}" value="#{i18n['place.edit']}" />
</h:column>
</h:dataTable>
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/place/editGroup.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.place.edit" />
<ui:define name="content">
<h1>#{i18n['editplacegroup.header']}</h1>
<h:form id="placegroupform">
<h:inputHidden value="#{placeGroupView.group.id.id}" />
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['placegroup.name']}:" />
<h:inputText value="#{placeGroupView.group.name}" />
<h:outputLabel value="#{i18n['placegroup.created']}:" />
<h:inputText value="#{placeGroupView.group.created.time}">
<f:convertDateTime pattern="yyyy.MM.dd HH:mm" timeZone="#{sessionHandler.timezone}" />
</h:inputText>
<h:outputLabel value="#{i18n['placegroup.edited']}:" />
<h:inputText value="#{placeGroupView.group.edited.time}">
<f:convertDateTime pattern="yyyy.MM.dd HH:mm" timeZone="#{sessionHandler.timezone}" />
</h:inputText>
<h:outputLabel value="#{i18n['placegroup.details']}:" />
<h:inputTextarea value="#{placeGroupView.group.details}" />
<h:outputLabel value="#{i18n['placegroup.creator']}:" />
<h:inputTextarea value="#{placeGroupView.group.creator.wholeName}" />
</h:panelGrid>
</h:form>
<h:panelGrid columns="2" columnClasses="placegroupPadding,">
<h:panelGroup>
<h2>#{i18n['placegroup.places']}</h2>
#{placeGroupView.initPlacegroupsPlacelist()}
<h:form id="placelist">
<h:dataTable border="0" id="placelist" value="#{placeGroupView.placelist}" var="place">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['place.name']}" />
</f:facet>
<h:outputText value="#{place.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['place.membership']}" />
</f:facet>
<h:outputText rendered="#{empty place.placeReserver.user}" value="#{place.placeReserver.inviteToken}" />
<h:outputText rendered="#{!empty place.placeReserver.user}"
value="#{place.placeReserver.user.wholeName} (#{place.placeReserver.user.nick})" />
</h:column>
<h:column>
<h:commandButton action="#{placeGroupView.editPlace()}" value="#{i18n['place.edit']}" />
</h:column>
</h:dataTable>
</h:form>
</h:panelGroup>
<h:panelGroup rendered="#{!empty placeGroupView.place}">
<h2>#{i18n['placeGroupView.editplace']}</h2>
<h:form id="placeEdit">
<h:inputHidden value="#{placeGroupView.place.id.id}" />
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['place.name']}:" />
<h:inputText value="#{placeGroupView.place.name}" />
<h:outputLabel value="#{i18n['place.mapX']}:" />
<h:inputText value="#{placeGroupView.place.mapX}" />
<h:outputLabel value="#{i18n['place.mapY']}:" />
<h:inputText value="#{placeGroupView.place.mapY}" />
<h:outputLabel value="#{i18n['place.width']}:" />
<h:inputText value="#{placeGroupView.place.width}" />
<h:outputLabel value="#{i18n['place.height']}:" />
<h:inputText value="#{placeGroupView.place.height}" />
<h:outputLabel value="#{i18n['place.releasetime']}:" />
<h:outputText value="#{placeGroupView.place.releaseTime.time}">
<f:convertDateTime pattern="yyyy.MM.dd HH:mm" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
<h:outputLabel value="#{i18n['place.code']}:" />
<h:inputText value="#{placeGroupView.place.code}" />
<h:outputLabel value="#{i18n['place.product']}:" />
<h:outputText value="#{placeGroupView.place.product.name}" />
<h:outputLabel value="#{i18n['place.description']}:" />
<h:inputTextarea value="#{placeGroupView.place.description}" />
</h:panelGrid>
<h:commandButton rendered="#{placeGroupView.place.isTaken() and (empty placeGroupView.place.group)}"
action="#{placeGroupView.releasePlace()}" value="#{i18n['place.release']}" />
<h:commandButton rendered="#{placeGroupView.place.isTaken() and (!empty placeGroupView.place.group)}"
action="#{placeGroupView.removePlaceFromGroup()}" value="#{i18n['place.groupremove']}"
onclick="return confirm('#{i18n['place.groupremove.confirm']}')" />
<h:commandButton id="commitbtn" action="#{placeGroupView.savePlace()}" value="#{i18n['place.commit']}" />
</h:form>
</h:panelGroup>
</h:panelGrid>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/place/myGroups.xhtml
...@@ -9,41 +9,47 @@ ...@@ -9,41 +9,47 @@
<ui:param name="thispage" value="page.place.mygroups" /> <ui:param name="thispage" value="page.place.mygroups" />
<ui:define name="content"> <ui:define name="content">
#{placeGroupView.editSelf()} #{placeGroupView.editSelf()}
<h1>#{i18n['placegroupview.header']}</h1>
<p>#{i18n['placegroupview.toptext']}</p>
<h:outputText rendered="#{!(placeGroupView.groupMemberships.rowCount gt 0)}"
value="#{i18n['placegroupview.noMemberships']}" />
<h:form rendered="#{placeGroupView.groupMemberships.rowCount gt 0}" id="placelistform">
<p><a href="#{request.contextPath}/PlaceGroupPdf">#{i18n['placegroup.printPdf']}</a></p>
<h:dataTable value="#{placeGroupView.groupMemberships}" var="member">
<h:dataTable value="#{placeGroupView.groupMemberships}" var="member">
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Id" /> <h:outputText value="#{i18n['placegroupview.reservationName']}" />
</f:facet> </f:facet>
<h:outputText value="#{member.id.id}" /> <h:outputText value="#{member.placeReservation.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroupview.token']}" />
</f:facet>
<h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" />
<h:outputText rendered="#{!empty member.user}"
value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroupview.groupCreator']}" />
</f:facet>
<h:outputText
value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
</h:column>
<h:column>
<h:commandButton rendered="#{placeGroupView.canModify(member) and !empty member.user}"
action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
</h:column>
</h:dataTable>
</h:form>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="product" />
</f:facet>
<h:outputText value="#{member.placeReservation.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="token" />
</f:facet>
<h:outputText value="#{member.inviteToken}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="user" />
</f:facet>
<h:outputText value="#{member.user.login}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="creator" />
</f:facet>
<h:outputText value="#{member.placeGroup.creator.login}" />
</h:column>
</h:dataTable>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/LanBortalWeb/WebContent/product/edit.xhtml
x§<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
......
code/LanBortalWeb/WebContent/resources/style/insomnia1/style.css
...@@ -38,17 +38,15 @@ ...@@ -38,17 +38,15 @@
text-decoration: underline; text-decoration: underline;
} }
.placeSelectInfotable tr td .placeSelectInfotable tr td {
{ padding-left: 20px;
padding-left: 20px;
} }
.rightalign .rightalign {
{ text-align: right;
text-align: right;
} }
.placeSelectInfotable tr
{ .placeSelectInfotable tr {
vertical-align: top; vertical-align: top;
} }
...@@ -112,18 +110,18 @@ body { ...@@ -112,18 +110,18 @@ body {
#sidebar a:link { #sidebar a:link {
color: #023952; color: #023952;
text-decoration: none; text-decoration: none;
} }
#sidebar a:active { #sidebar a:active {
color: #023952; color: #023952;
text-decoration: none; text-decoration: none;
} }
#sidebar a:visited { #sidebar a:visited {
color: #023952; color: #023952;
text-decoration: none; text-decoration: none;
} }
#sidebar a:hover { #sidebar a:hover {
color: #023952; color: #023952;
text-decoration: underline; text-decoration: underline;
...@@ -142,7 +140,6 @@ body { ...@@ -142,7 +140,6 @@ body {
margin-right: 3px; margin-right: 3px;
} }
.link { .link {
background-image: url('img/link2.gif'); background-image: url('img/link2.gif');
width: 117px; width: 117px;
...@@ -178,6 +175,25 @@ body { ...@@ -178,6 +175,25 @@ body {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
h1 { h1 {
font-size: 20px; font-size: 20px;
}
#sidebar ul {
padding-left: 10px;
list-style-type: none;
}
#sidebar ul li ul {
list-style-type: circle;
padding-left: 15px;
}
#sidebar .sidebartitle {
font-weight: bold;
}
.placegroupPadding {
padding-right: 50px;
} }
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/tools/map/placeSelect.xhtml
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
<h:outputText class="" value="#{mapView.clickedplace.product.price}"> <h:outputText class="" value="#{mapView.clickedplace.product.price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText> </h:outputText>
<h:commandButton rendered="#{sessionHandler.canWrite('MAP')}" value="#{i18n['place.edit']}" action="#{placeView.editPlace(mapView.clickedplace)}" />
</h:panelGrid> </h:panelGrid>
</h:panelGrid> </h:panelGrid>
......
code/LanBortalWeb/WebContent/resources/tools/role/edit.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:role="http://java.sun.com/jsf/composite/tools/role"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:role="http://java.sun.com/jsf/composite/tools/role">
<composite:interface> <composite:interface>
...@@ -9,20 +12,17 @@ ...@@ -9,20 +12,17 @@
<composite:implementation> <composite:implementation>
<p> <p><h:form id="roleform">
<h:form id="roleform"> <h:inputHidden id="id" value="roleView.role.id.id" />
<h:inputHidden id="id" value="roleView.role.id.id" />
<f:facet name="errorMessage"> <f:facet name="errorMessage">
<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 id="saverole" value="#{i18n['save']}" action="#{roleView.save}" /> <h:commandButton id="saverole" value="#{i18n['save']}" action="#{roleView.save}" />
</h:form> </h:form></p>
</p>
<p><h:form>
<p>
<h:form>
<h:dataTable border="1" id="rights" value="#{roleView.roleRights}" var="rr"> <h:dataTable border="1" id="rights" value="#{roleView.roleRights}" var="rr">
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
...@@ -58,8 +58,7 @@ ...@@ -58,8 +58,7 @@
<h:commandButton id="save" value="#{i18n['role.edit.save']}" action="#{roleView.editRoleRight}" /> <h:commandButton id="save" value="#{i18n['role.edit.save']}" action="#{roleView.editRoleRight}" />
</h:column> </h:column>
</h:dataTable> </h:dataTable>
</h:form> </h:form></p>
</p>
</composite:implementation> </composite:implementation>
......
code/LanBortalWeb/WebContent/resources/tools/role/form.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns="http://www.w3.org/1999/xhtml" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<ui:composition> <ui:composition>
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputText value="#{i18n['role.name']}" /> <h:outputText value="#{i18n['role.name']}" />
<h:inputText value="#{roleView.role.name}" /> <h:inputText value="#{roleView.role.name}" />
<h:outputText value="#{i18n['role.parents']}" /> <h:outputText value="#{i18n['role.parents']}" />
<h:selectManyCheckbox converter="#{sessionHandler.roleConverter}" layout="pageDirection" id ="roleparents" value="#{roleView.role.parents}"> <h:selectManyCheckbox converter="#{sessionHandler.roleConverter}" layout="pageDirection" id="roleparents"
<f:selectItems var="par" itemLabel="#{par.name}" value="#{roleView.possibleParents}" /> value="#{roleView.role.parents}">
</h:selectManyCheckbox> <f:selectItems var="par" itemLabel="#{par.name}" value="#{roleView.possibleParents}" />
</h:panelGrid> </h:selectManyCheckbox>
</ui:composition>
<h:outputLabel value="#{i18n['role.cardtemplate']}" />
<h:selectOneMenu converter="#{cardTemplateConverter}" value="#{roleView.role.cardTemplate}">
<f:selectItems var="role" itemLabel="#{role.name}" value="#{cardView.templatesWithNull}" />
</h:selectOneMenu>
</h:panelGrid>
</ui:composition>
</html> </html>
code/LanBortalWeb/WebContent/role/create.xhtml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<ui:param name="thispage" value="page.role.create" /> <ui:param name="thispage" value="page.role.create" />
<ui:define name="content"> <ui:define name="content">
<tools:fatalPermission target="ROLE_MANAGEMENT" permission="WRITE" /> <tools:fatalPermission target="ROLE_MANAGEMENT" permission="WRITE" />
#{roleView.initCreate()}
<role:create /> <role:create />
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/LanBortalWeb/WebContent/shop/rfidListener.xhtml 0 → 100644
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/insomnia1/template.xhtml">
<ui:param name="thispage" value="page.permissionDenied" />
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="reader" value="#{rfidView.reader}" />
<f:viewParam name="tag" value="#{rfdiView.tag}" />
<f:viewParam name="hash" value="#{rfdiView.hash}" />
</f:metadata>
</ui:define>
<ui:define name="content">
#{rfidView.readTag()}
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/accountEvents.xhtml
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
<ui:param name="thispage" value="page.account.list" /> <ui:param name="thispage" value="page.account.list" />
<ui:define name="content"> <ui:define name="content">
#{userView.editSelf()} #{accountView.editSelf()}
<h:outputLabel value="#{i18n['user.accountBalance']}: " for="accountbalance"/> <h:outputText id="accountbalance" value="#{userView.user.accountBalance}" /> <h:outputLabel value="#{i18n['user.accountBalance']}: " for="accountbalance"/> <h:outputText id="accountbalance" value="#{accountView.user.accountBalance}" />
<account:list accountview="#{userView}"/> <account:list accountview="#{accountView}"/>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/LanBortalWeb/WebContent/user/createCardTemplate.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content">
<h:form id="cardTemplates">
#{cardView.initCard()}
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['cardTemplate.name']}:" />
<h:inputText value="#{cardView.card.name}" />
<h:outputLabel value="#{i18n['cardTemplate.power']}:" />
<h:inputText value="#{cardView.card.power}" size="4" />
</h:panelGrid>
<h:commandButton action="#{cardView.createTemplate()}" value="i18n['cardTemplate.create']" />
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/edit.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:account="http://java.sun.com/jsf/composite/tools/account" xmlns:c="http://java.sun.com/jsp/jstl/core">
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.user.create" /> <ui:param name="thispage" value="page.user.create" />
<ui:define name="content"> <ui:define name="content">
<users:edit commitaction="#{userView.saveUser()}" <users:edit commitaction="#{userView.saveUser()}" commitvalue="#{i18n['user.save']}" />
commitvalue="#{i18n['user.save']}" />
<tools:canRead target="SHOP"> <tools:canRead target="SHOP">
<h2>#{i18n['user.accountEventHeader']}</h2> <h2>#{i18n['user.accountEventHeader']}</h2>
<h:outputText rendered="#{userView.user.accountEvents.size() le 0}" value="#{i18n['user.noAccountevents']}" /> <h:outputText rendered="#{userView.user.accountEvents.size() le 0}" value="#{i18n['user.noAccountevents']}" />
<h:form rendered="#{userView.user.accountEvents.size() gt 0}" id="accountform"> #{accountView.setUser(userView.user)}
<h:dataTable border="0" id="accountevent" <account:list rendered="#{userView.user.accountEvents.size() gt 0}" accountview="#{accountView}" />
value="#{userView.user.accountEvents}" var="event"> </tools:canRead>
<tools:canWrite target="MAP">
<h1>#{i18n['user.placegroups']}</h1>
<h:form id="placegrouplist">
<h:dataTable border="1" id="placegroup" value="#{userView.placegroups}" var="placegroup">
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroup.name']}" />
</f:facet>
<h:outputText value="#{placegroup.name}" />
</h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountevent.productname']}" /> <h:outputText value="#{i18n['placegroup.creator']}" />
</f:facet> </f:facet>
<h:outputText value="#{event.product.name}" /> <h:outputText value="#{placegroup.creator.wholeName}" />
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountevent.quantity']}" /> <h:outputText value="#{i18n['placegroup.created']}" />
</f:facet> </f:facet>
<h:outputText value="#{event.quantity}"> <h:outputText value="#{placegroup.created.time}">
<f:convertNumber /> <f:convertDateTime />
</h:outputText> </h:outputText>
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountevent.unitPrice']}" /> <h:outputText value="#{i18n['placegroup.edited']}" />
</f:facet> </f:facet>
<h:outputText value="#{event.unitPrice}"> <h:outputText value="#{placegroup.edited.time}">
<f:convertNumber /> <f:convertDateTime />
</h:outputText> </h:outputText>
</h:column> </h:column>
<h:column> <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountevent.total']}" /> <h:outputText value="#{i18n['placegroup.details']}" />
</f:facet> </f:facet>
<h:outputText value="#{event.total}"> <h:outputText value="#{placegroup.details}">
<f:convertNumber />
</h:outputText> </h:outputText>
</h:column> </h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroup.places']}" />
</f:facet>
<h:dataTable border="0" id="placegroup" value="#{placegroup.places}" var="place">
<h:column>
<h:outputText value="#{place.name}" />
</h:column>
</h:dataTable>
</h:column>
<h:column>
<h:commandButton id="saverole" action="#{userView.editGroup(placegroup)}" value="#{i18n['placegroup.edit']}" />
</h:column>
</h:dataTable> </h:dataTable>
</h:form> </h:form>
</tools:canRead> </tools:canWrite>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/LanBortalWeb/WebContent/user/listCardTemplates.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content">
<h:form id="cardTemplates">
#{cardView.initCardTemplates()}
<h:dataTable value="#{cardView.cardTemplates}" var="card">
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['cardTemplate.name']}" />
</f:facet>
<h:outputText value="#{card.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['cardTemplate.power']}" />
</f:facet>
<h:outputText value="#{card.power}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['cardTemplate.roles']}" />
</f:facet>
<h:dataTable value="#{card.roles}" var="cardrole" border="0">
<h:column>
<h:outputText value="#{cardrole.name}" />
</h:column>
</h:dataTable>
</h:column>
</h:dataTable>
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java
...@@ -54,7 +54,6 @@ public class HostnameFilter implements Filter { ...@@ -54,7 +54,6 @@ public class HostnameFilter implements Filter {
Subject subj = Subject.getSubject(AccessController.getContext()); Subject subj = Subject.getSubject(AccessController.getContext());
int beginindex = 7; // Let's skip http:// int beginindex = 7; // Let's skip http://
int slashindex = url.indexOf("/", beginindex); int slashindex = url.indexOf("/", beginindex);
// Find the first / from URL after http:// // Find the first / from URL after http://
int colonindex = url.indexOf(":", beginindex); int colonindex = url.indexOf(":", beginindex);
...@@ -69,7 +68,7 @@ public class HostnameFilter implements Filter { ...@@ -69,7 +68,7 @@ public class HostnameFilter implements Filter {
httpRequest.getSession().setAttribute(EventBeanLocal.HTTP_URL_HOSTNAME, hostname); httpRequest.getSession().setAttribute(EventBeanLocal.HTTP_URL_HOSTNAME, hostname);
BortalLocalContextHolder.setHostname( hostname); BortalLocalContextHolder.setHostname(hostname);
} }
// pass the request along the filter chain // pass the request along the filter chain
...@@ -80,8 +79,7 @@ public class HostnameFilter implements Filter { ...@@ -80,8 +79,7 @@ public class HostnameFilter implements Filter {
Throwable cause = t.getCause(); Throwable cause = t.getCause();
while (cause != null) { while (cause != null) {
cause = cause.getCause(); cause = cause.getCause();
if(cause instanceof PermissionDeniedException) if (cause instanceof PermissionDeniedException) {
{
if (response instanceof HttpServletResponse) { if (response instanceof HttpServletResponse) {
HttpServletResponse httpresp = (HttpServletResponse) response; HttpServletResponse httpresp = (HttpServletResponse) response;
...@@ -89,7 +87,7 @@ public class HostnameFilter implements Filter { ...@@ -89,7 +87,7 @@ public class HostnameFilter implements Filter {
httpresp.setStatus(HttpServletResponse.SC_UNAUTHORIZED); httpresp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
httpresp.getWriter().println("Permission denied!!"); httpresp.getWriter().println("Permission denied!!");
logger.debug("Got PermissionDenied wrapped in stuff. Throwing PermissionDenied without stuff.!"); logger.debug("Got PermissionDenied wrapped in stuff. Throwing PermissionDenied without stuff.!");
throw (PermissionDeniedException)cause; throw (PermissionDeniedException) cause;
} }
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
*/ */
package fi.insomnia.bortal.handler; package fi.insomnia.bortal.handler;
import java.util.Locale;
import java.util.TimeZone;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped; import javax.faces.bean.SessionScoped;
...@@ -43,6 +46,10 @@ public class SessionHandler { ...@@ -43,6 +46,10 @@ public class SessionHandler {
public SessionHandler() { public SessionHandler() {
} }
public TimeZone getTimezone() {
return TimeZone.getTimeZone("Europe/Helsinki");
}
public String getLocale() { public String getLocale() {
// TODO: Locale selection code missing // TODO: Locale selection code missing
// return "en_ST_v7"; // return "en_ST_v7";
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/GraniteConfig.java deleted 100644 → 0
package fi.insomnia.bortal.servlet;
//
//import org.granite.config.servlet3.FlexFilter;
//import org.granite.gravity.config.AbstractMessagingDestination;
//import org.granite.gravity.config.servlet3.MessagingDestination;
//import org.granite.messaging.service.annotations.RemoteDestination;
//import org.granite.tide.annotations.TideEnabled;
//import org.granite.tide.ejb.EjbIdentity;
//import org.granite.tide.ejb.EjbServiceFactory;
//
//@FlexFilter(
// tide = true,
// type = "ejb",
// factoryClass = EjbServiceFactory.class,
// ejbLookup = "java:global/LanBortal/LanBortalBeans/{capitalized.component.name}Bean!fi.insomnia.bortal.beans.flash.{capitalized.component.name}BeanLocal",
// entityManagerFactoryJndiName = "java:comp/env/BortalEMF",
// tideInterfaces = { EjbIdentity.class },
// tideAnnotations={TideEnabled.class,RemoteDestination.class}
// )
//public class GraniteConfig {
// @MessagingDestination(noLocal = true, sessionSelector = true)
// AbstractMessagingDestination helloTopic;
//}
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceGroupPdf.java 0 → 100644
package fi.insomnia.bortal.servlet;
import java.io.IOException;
import java.util.List;
import javax.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.model.GroupMembership;
/**
* Servlet implementation class PlaceGroupPdf
*/
public class PlaceGroupPdf extends HttpServlet {
private static final long serialVersionUID = 1L;
@EJB
private PlaceGroupBeanLocal pgbean;
@EJB
private UserBeanLocal userbean;
private static final Logger logger = LoggerFactory.getLogger(PlaceGroupPdf.class);
/**
* @see HttpServlet#HttpServlet()
*/
public PlaceGroupPdf() {
super();
// TODO Auto-generated constructor stub
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
output(request, response);
}
private void output(HttpServletRequest request, HttpServletResponse response) {
try {
response.setContentType("application/pdf");
response.setHeader("Content-Disposition", "filename=Reservations.pdf");
List<GroupMembership> members = pgbean.getMembershipsAndCreations(userbean.getCurrentUser());
ServletOutputStream ostream = response.getOutputStream();
pgbean.getGroupMembershipPdf(members, ostream);
// ByteArrayOutputStream billstream = new ByteArrayOutputStream();
// billentity.getPdfBillStream(bill, billstream);
// response.setContentLength(billstream.size());
ostream.close();
} catch (IOException e) {
logger.debug("Error writing pdf", e);
}
}
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
output(request, response);
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PrintBill.java
...@@ -27,6 +27,7 @@ public class PrintBill extends HttpServlet { ...@@ -27,6 +27,7 @@ public class PrintBill extends HttpServlet {
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
/** /**
* @see HttpServlet#HttpServlet() * @see HttpServlet#HttpServlet()
*/ */
...@@ -45,7 +46,7 @@ public class PrintBill extends HttpServlet { ...@@ -45,7 +46,7 @@ public class PrintBill extends HttpServlet {
private void ouput(HttpServletRequest request, HttpServletResponse response) throws IOException { private void ouput(HttpServletRequest request, HttpServletResponse response) throws IOException {
Integer billid = getIntegerParameter(request, BILL_ID); Integer billid = ServletUtils.getIntegerParameter(request, BILL_ID);
Bill bill = billentity.findById(billid); Bill bill = billentity.findById(billid);
if (bill == null) { if (bill == null) {
return; return;
...@@ -78,13 +79,5 @@ public class PrintBill extends HttpServlet { ...@@ -78,13 +79,5 @@ public class PrintBill extends HttpServlet {
* @param parameter * @param parameter
* @return * @return
*/ */
private static Integer getIntegerParameter(HttpServletRequest request, String parameter) {
try {
String valueString = request.getParameter(parameter);
Integer value = Integer.parseInt(valueString);
return value;
} catch (NumberFormatException nfe) {
}
return null;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/ServletUtils.java 0 → 100644
package fi.insomnia.bortal.servlet;
import javax.servlet.http.HttpServletRequest;
public class ServletUtils {
public static Integer getIntegerParameter(HttpServletRequest request, String parameter) {
try {
String valueString = request.getParameter(parameter);
Integer value = Integer.parseInt(valueString);
return value;
} catch (NumberFormatException nfe) {
}
return null;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UploadServlet.java
...@@ -91,15 +91,12 @@ public class UploadServlet extends HttpServlet { ...@@ -91,15 +91,12 @@ public class UploadServlet extends HttpServlet {
String type = request.getParameter("type"); String type = request.getParameter("type");
if (type.equals("userimage")) { if (type.equals("userimage")) {
userbean.uploadImage(destId, contenttype, imagedata, filename, description); userbean.uploadImage(destId, contenttype, imagedata, filename, description);
} } else if (type.equals("mapimage")) {
else if(type.equals("mapimage"))
{
eventmapbean.sendImage(destId, imagedata); eventmapbean.sendImage(destId, imagedata);
} } else {
else{
retmsg = "FATAL: servlet type not defined!!"; retmsg = "FATAL: servlet type not defined!!";
} }
} catch (FileUploadException e) { } catch (FileUploadException e) {
logger.warn("Error uploading image", e); logger.warn("Error uploading image", e);
retmsg = "Tiedoston tallennuksessa tapahtui virhe!"; retmsg = "Tiedoston tallennuksessa tapahtui virhe!";
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserImageServlet.java
...@@ -69,9 +69,11 @@ public class UserImageServlet extends HttpServlet { ...@@ -69,9 +69,11 @@ public class UserImageServlet extends HttpServlet {
UserImage image = userbean.findUserImage(imageid); UserImage image = userbean.findUserImage(imageid);
if (image == null) { if (image == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND); response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().append("Not Found");
} else {
response.setContentType(image.getMimeType());
response.getOutputStream().write(image.getImageData());
} }
response.setContentType(image.getMimeType());
response.getOutputStream().write(image.getImageData());
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/view/AccountView.java
...@@ -5,15 +5,66 @@ import javax.faces.bean.ManagedBean; ...@@ -5,15 +5,66 @@ import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped; import javax.faces.bean.SessionScoped;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import fi.insomnia.bortal.beans.AccountEventBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.User;
@ManagedBean(name = "accountView") @ManagedBean(name = "accountView")
@SessionScoped @SessionScoped
public class AccountView { public class AccountView {
// private AccountEventBeanLocal acbean;
@EJB @EJB
private UserBeanLocal userbean; private UserBeanLocal userbean;
@EJB
private AccountEventBeanLocal accobean;
private User user;
private ListDataModel<AccountEvent> accountlist;
private AccountEvent account;
public void editSelf() {
userbean.fatalNotLoggedIn();
setUser(userbean.getCurrentUser());
}
public ListDataModel<AccountEvent> getAccountEvents() {
if (!userbean.isCurrentUser(user)) {
userbean.fatalPermission(Permission.ACCOUNT_MANAGEMENT, RolePermission.READ, "Tried to read read account events for user: ", user);
}
accountlist = new ListDataModel<AccountEvent>(getUser().getAccountEvents());
return accountlist;
}
public String editAccount() {
setAccount(accountlist.getRowData());
return "/account/edit";
}
public void setAccount(AccountEvent account) {
this.account = account;
}
public AccountEvent getAccount() {
return account;
}
public void setUser(User user) {
this.user = user;
}
public User getUser() {
return user;
}
public void merge() {
account = accobean.merge(account);
}
public void delete() {
accobean.delete(account);
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/view/BillManageView.java
...@@ -17,6 +17,7 @@ import fi.insomnia.bortal.enums.Permission; ...@@ -17,6 +17,7 @@ import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission; import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.BillLine; import fi.insomnia.bortal.model.BillLine;
import fi.insomnia.bortal.util.MailMessage;
import fi.insomnia.bortal.utilities.I18n; import fi.insomnia.bortal.utilities.I18n;
@ManagedBean(name = "billManageView") @ManagedBean(name = "billManageView")
...@@ -74,10 +75,11 @@ public class BillManageView extends GenericView { ...@@ -74,10 +75,11 @@ public class BillManageView extends GenericView {
bill = bills.getRowData(); bill = bills.getRowData();
billbean.markPaid(bill, Calendar.getInstance()); billbean.markPaid(bill, Calendar.getInstance());
if (!utilbean.sendMail(bill.getUser(), I18n.get("bill.billMarkedPaidMail.subject"), I18n.get("bill.billMarkedPaidMail.message", (bill.getBillNumber() == null) ? "----" : bill.getBillNumber().toString()))) { MailMessage msg = new MailMessage();
addFaceMessage("email.errorSending"); msg.setSubject(I18n.get("bill.billMarkedPaidMail.subject"));
} msg.setMessage(I18n.get("bill.billMarkedPaidMail.message", (bill.getBillNumber() == null) ? "----" : bill.getBillNumber().toString()));
msg.setTo(bill.getUser());
utilbean.sendMail(msg);
return ""; return "";
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/CardView.java 0 → 100644
package fi.insomnia.bortal.view;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.model.ListDataModel;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.utilities.I18n;
@ManagedBean(name = "cardView")
@SessionScoped
public class CardView {
private ListDataModel<CardTemplate> cardTemplates;
private CardTemplate card;
@EJB
private CardTemplateBeanLocal cfbean;
@EJB
private EventBeanLocal eventBean;
public void initCardTemplates() {
cardTemplates = new ListDataModel<CardTemplate>(cfbean.findAll());
}
public ListDataModel<CardTemplate> getCardTemplates() {
return cardTemplates;
}
public void initCard() {
card = new CardTemplate(eventBean.getCurrentEvent());
}
public void setCard(CardTemplate card) {
this.card = card;
}
public CardTemplate getCard() {
return card;
}
public String createTemplate() {
cfbean.create(card);
return "/user/listCardTemplates";
}
public List<CardTemplate> getTemplatesWithNull() {
ArrayList<CardTemplate> retlist = new ArrayList<CardTemplate>();
CardTemplate dummytempl = new CardTemplate();
dummytempl.setName(I18n.get("cardTemplate.emptyCardTemplate"));
retlist.add(dummytempl);
retlist.addAll(cfbean.findAll());
return retlist;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/PlaceGroupView.java
...@@ -8,14 +8,19 @@ import javax.faces.model.ListDataModel; ...@@ -8,14 +8,19 @@ import javax.faces.model.ListDataModel;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.PlaceBeanLocal;
import fi.insomnia.bortal.beans.PlaceGroupBeanLocal; import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
@ManagedBean(name = "placeGroupView") @ManagedBean(name = "placeGroupView")
@SessionScoped @SessionScoped
public class PlaceGroupView extends GenericView{ public class PlaceGroupView extends GenericView {
private static final Logger logger = LoggerFactory.getLogger(PlaceGroupView.class); private static final Logger logger = LoggerFactory.getLogger(PlaceGroupView.class);
private User user; private User user;
...@@ -25,13 +30,24 @@ public class PlaceGroupView extends GenericView{ ...@@ -25,13 +30,24 @@ public class PlaceGroupView extends GenericView{
private PlaceGroupBeanLocal placegroupBean; private PlaceGroupBeanLocal placegroupBean;
private ListDataModel<GroupMembership> memberlist; private ListDataModel<GroupMembership> memberlist;
@EJB
private PlaceBeanLocal placebean;
private PlaceGroup group;
private String token; private String token;
private ListDataModel<Place> placelist;
private Place place;
public void editSelf() { public void editSelf() {
userBean.fatalNotLoggedIn(); userBean.fatalNotLoggedIn();
setUser(userBean.getCurrentUser()); setUser(userBean.getCurrentUser());
} }
public void initPlacegroupsPlacelist() {
setPlacelist(new ListDataModel<Place>(group.getPlaces()));
}
public void setUser(User user) { public void setUser(User user) {
this.user = user; this.user = user;
} }
...@@ -46,7 +62,7 @@ public class PlaceGroupView extends GenericView{ ...@@ -46,7 +62,7 @@ public class PlaceGroupView extends GenericView{
public ListDataModel<GroupMembership> getGroupMemberships() { public ListDataModel<GroupMembership> getGroupMemberships() {
userBean.fatalNotLoggedIn(); userBean.fatalNotLoggedIn();
memberlist = new ListDataModel<GroupMembership>(placegroupBean.getMemberships(user)); memberlist = new ListDataModel<GroupMembership>(placegroupBean.getMembershipsAndCreations(user));
return memberlist; return memberlist;
} }
...@@ -69,4 +85,64 @@ public class PlaceGroupView extends GenericView{ ...@@ -69,4 +85,64 @@ public class PlaceGroupView extends GenericView{
public String getToken() { public String getToken() {
return token; return token;
} }
public boolean canModify(GroupMembership row) {
boolean ret = false;
if (row != null && (
userBean.getCurrentUser().equals(row.getPlaceGroup().getCreator()) ||
userBean.hasPermission(Permission.MAP, RolePermission.WRITE))) {
ret = true;
}
return ret;
}
public String releasePlace() {
GroupMembership row = memberlist.getRowData();
if (row != null && (userBean.getCurrentUser().equals(row.getPlaceGroup().getCreator()) ||
userBean.hasPermission(Permission.MAP, RolePermission.WRITE))) {
placegroupBean.releaseAndGenerateToken(row);
this.addFaceMessage("placegroupview.placeReleased", row.getPlaceReservation().getName());
} else {
this.addFaceMessage("placegroupview.placeReleaseFailed", row.getPlaceReservation().getName());
}
return null;
}
public String removePlaceFromGroup() {
userBean.fatalPermission(Permission.MAP, RolePermission.WRITE, "No right to release place ", place);
place.getGroup().getPlaces().remove(place);
place.setGroup(null);
place = placebean.mergeChanges(place);
return null;
}
public String editPlace() {
place = placelist.getRowData();
return null;
}
public void setGroup(PlaceGroup group) {
this.group = group;
}
public PlaceGroup getGroup() {
return group;
}
public void setPlacelist(ListDataModel<Place> placelist) {
this.placelist = placelist;
}
public ListDataModel<Place> getPlacelist() {
return placelist;
}
public void setPlace(Place place) {
this.place = place;
}
public Place getPlace() {
return place;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/view/PlaceView.java 0 → 100644
package fi.insomnia.bortal.view;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.model.ListDataModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.PlaceBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.Place;
@ManagedBean(name = "placeView")
@SessionScoped
public class PlaceView {
private static final Logger logger = LoggerFactory.getLogger(PlaceView.class);
private Place place;
@EJB
private UserBeanLocal userbean;
@EJB
private PlaceBeanLocal placebean;
private ListDataModel<Place> placesPlacegroup;
public String editPlace(Place place) {
this.place = place;
logger.debug("editing place {}", place);
return "/place/edit";
}
public Place getPlace() {
userbean.fatalPermission(Permission.MAP, RolePermission.WRITE, "Not permission to modify place");
return place;
}
public String releasePlace() {
userbean.fatalPermission(Permission.MAP, RolePermission.WRITE, "No right to release place ", place);
place = placebean.find(place.getId());
if (!place.release(place.getCurrentUser())) {
logger.debug("Error releasing place.");
}
place = placebean.mergeChanges(place);
return null;
}
public void initGroupsPlacelist() {
if (place.getGroup() != null && !place.getGroup().getPlaces().isEmpty()) {
placesPlacegroup = new ListDataModel<Place>(place.getGroup().getPlaces());
} else {
placesPlacegroup = null;
}
}
public ListDataModel<Place> getPlacesGroupPlaces() {
return placesPlacegroup;
}
public String editPlacegroupPlace() {
place = placesPlacegroup.getRowData();
return "/place/edit";
}
public String removePlaceFromGroup() {
userbean.fatalPermission(Permission.MAP, RolePermission.WRITE, "No right to release place ", place);
place.getGroup().getPlaces().remove(place);
place.setGroup(null);
place = placebean.mergeChanges(place);
return null;
}
public String save() {
placebean.mergeChanges(place);
return null;
}
public String checkMemberships() {
placebean.checkMemberships();
return null;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/RfidView.java 0 → 100644
package fi.insomnia.bortal.view;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.ReaderBeanLocal;
import fi.insomnia.bortal.model.LanEvent;
@ManagedBean(name = "rfidView")
@RequestScoped
public class RfidView extends GenericView {
private String reader;
private String tag;
private String hash;
@EJB
private ReaderBeanLocal readerbean;
public String readTag() {
String ret = "Error";
if (readerbean.checkTag(reader, tag, hash)) {
ret = "Ok";
}
return ret;
}
public String getReader() {
return reader;
}
public void setReader(String reader) {
this.reader = reader;
}
public String getTag() {
return tag;
}
public void setTag(String tag) {
this.tag = tag;
}
public String getHash() {
return hash;
}
public void setHash(String hash) {
this.hash = hash;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/RoleView.java
...@@ -49,6 +49,10 @@ public class RoleView { ...@@ -49,6 +49,10 @@ public class RoleView {
private ListDataModel<RoleRight> rolerights; private ListDataModel<RoleRight> rolerights;
public void initCreate() {
role = new Role(eventbean.getCurrentEvent());
}
public List<Role> getRoleList() { public List<Role> getRoleList() {
userbean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ); userbean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ);
return roleBean.listRoles(); return roleBean.listRoles();
...@@ -106,7 +110,6 @@ public class RoleView { ...@@ -106,7 +110,6 @@ public class RoleView {
return "roleCreated"; return "roleCreated";
} }
public String edit() { public String edit() {
userbean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ); userbean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ);
...@@ -128,9 +131,6 @@ public class RoleView { ...@@ -128,9 +131,6 @@ public class RoleView {
public Role getRole() { public Role getRole() {
userbean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ); userbean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ);
if (role == null) {
role = new Role(eventbean.getCurrentEvent());
}
return role; return role;
} }
...@@ -139,7 +139,7 @@ public class RoleView { ...@@ -139,7 +139,7 @@ public class RoleView {
* the role to set * the role to set
*/ */
public void setRole(Role role) { public void setRole(Role role) {
this.role = role; this.role = role;
} }
/** /**
...@@ -149,5 +149,4 @@ public class RoleView { ...@@ -149,5 +149,4 @@ public class RoleView {
return roleBean.getPossibleParents(getRole()); return roleBean.getPossibleParents(getRole());
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/view/TestDataView.java
...@@ -14,9 +14,11 @@ import javax.faces.bean.RequestScoped; ...@@ -14,9 +14,11 @@ import javax.faces.bean.RequestScoped;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.beans.TestDataBeanLocal; import fi.insomnia.bortal.beans.TestDataBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.beans.UtilBeanLocal;
import fi.insomnia.bortal.handler.SessionHandler; import fi.insomnia.bortal.handler.SessionHandler;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
...@@ -38,6 +40,10 @@ public class TestDataView { ...@@ -38,6 +40,10 @@ public class TestDataView {
private UserBeanLocal userbean; private UserBeanLocal userbean;
@EJB @EJB
private RoleBeanLocal rolebean; private RoleBeanLocal rolebean;
@EJB
private UtilBeanLocal utilbean;
@EJB
private CardTemplateBeanLocal ctbean;
public void generateData() { public void generateData() {
...@@ -78,10 +84,6 @@ public class TestDataView { ...@@ -78,10 +84,6 @@ public class TestDataView {
return null; return null;
} }
public void contextTest() {
testdatabean.contextTest();
}
public void roletest() { public void roletest() {
User usr = userbean.getCurrentUser(); User usr = userbean.getCurrentUser();
List<Role> roles = rolebean.listRoles(); List<Role> roles = rolebean.listRoles();
...@@ -92,4 +94,8 @@ public class TestDataView { ...@@ -92,4 +94,8 @@ public class TestDataView {
logger.debug("roles after: {}", usr.getRoles()); logger.debug("roles after: {}", usr.getRoles());
} }
public void checkCards() {
ctbean.checkAllUsersCardRights();
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
package fi.insomnia.bortal.view; package fi.insomnia.bortal.view;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
import javax.faces.bean.SessionScoped; import javax.faces.bean.SessionScoped;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
...@@ -14,10 +17,13 @@ import org.slf4j.LoggerFactory; ...@@ -14,10 +17,13 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.beans.SecurityBeanLocal; import fi.insomnia.bortal.beans.SecurityBeanLocal;
import fi.insomnia.bortal.beans.SecurityLogType;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.Permission; import fi.insomnia.bortal.enums.Permission;
import fi.insomnia.bortal.enums.RolePermission; import fi.insomnia.bortal.enums.RolePermission;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.I18n; import fi.insomnia.bortal.utilities.I18n;
...@@ -33,14 +39,15 @@ public class UserView extends GenericView { ...@@ -33,14 +39,15 @@ public class UserView extends GenericView {
@EJB @EJB
private RoleBeanLocal roleBean; private RoleBeanLocal roleBean;
@ManagedProperty(value = "#{placeGroupView}")
private PlaceGroupView placegroupView;
private static final Logger logger = LoggerFactory.getLogger(UserView.class); private static final Logger logger = LoggerFactory.getLogger(UserView.class);
private User user; private User user;
private ListDataModel<User> items; private ListDataModel<User> items;
private String password; private String password;
private String passwordcheck; private String passwordcheck;
private ListDataModel<AccountEvent> accountlist;
private AccountEvent account;
public void initCreateuser() { public void initCreateuser() {
user = new User(); user = new User();
...@@ -54,6 +61,20 @@ public class UserView extends GenericView { ...@@ -54,6 +61,20 @@ public class UserView extends GenericView {
return "userEdit"; return "userEdit";
} }
public ListDataModel<PlaceGroup> getPlacegroups() {
List<PlaceGroup> retlist = new ArrayList<PlaceGroup>();
retlist.addAll(user.getPlaceGroups());
for (GroupMembership gm : user.getGroupMemberships()) {
if (!retlist.contains(gm.getPlaceGroup())) {
retlist.add(gm.getPlaceGroup());
}
}
ListDataModel<PlaceGroup> ret = new ListDataModel<PlaceGroup>(retlist);
return ret;
}
public List<Role> getUserRoles() { public List<Role> getUserRoles() {
userBean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ, "does not have permission to view roles at userView!"); userBean.fatalPermission(Permission.ROLE_MANAGEMENT, RolePermission.READ, "does not have permission to view roles at userView!");
...@@ -97,7 +118,7 @@ public class UserView extends GenericView { ...@@ -97,7 +118,7 @@ public class UserView extends GenericView {
if (getUser() == null) { if (getUser() == null) {
logger.warn("Could not create user. function returned null!"); logger.warn("Could not create user. function returned null!");
} else { } else {
securitybean.logMessage(userBean.getCurrentUser(), "Created new user ", getUser().getLogin(), " with id: ", getUser().getId().toString()); securitybean.logMessage(SecurityLogType.genericMessage, userBean.getCurrentUser(), "Created new user ", getUser().getLogin(), " with id: ", getUser().getId().toString());
if (!userBean.isLoggedIn()) { if (!userBean.isLoggedIn()) {
ret = "created"; ret = "created";
...@@ -179,22 +200,18 @@ public class UserView extends GenericView { ...@@ -179,22 +200,18 @@ public class UserView extends GenericView {
return "edit"; return "edit";
} }
public ListDataModel<AccountEvent> getAccountEvents() { public String editGroup(PlaceGroup pg)
accountlist = new ListDataModel<AccountEvent>(getUser().getAccountEvents()); {
return accountlist; placegroupView.setGroup(pg);
return "/place/editGroup";
} }
public String editAccount() { public void setPlacegroupView(PlaceGroupView placegroupView) {
setAccount(accountlist.getRowData()); this.placegroupView = placegroupView;
return "editAccount";
} }
public void setAccount(AccountEvent account) { public PlaceGroupView getPlacegroupView() {
this.account = account; return placegroupView;
} }
public AccountEvent getAccount() {
return account;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/view/flash/HvTest.java deleted 100644 → 0
package fi.insomnia.bortal.view.flash;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
//@RemoteDestination
@Named("hvTest")
public class HvTest {
private static final Logger logger = LoggerFactory.getLogger(HvTest.class);
public String hello(String name) {
logger.info("Fetching hello from HvTest! got param {}", name);
return "hello2 " + name;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/flash/PersistenceUnit.java deleted 100644 → 0
/*
GRANITE DATA SERVICES
Copyright (C) 2007 ADEQUATE SYSTEMS SARL
This file is part of Granite Data Services.
Granite Data Services is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
Granite Data Services is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
package fi.insomnia.bortal.view.flash;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
public class PersistenceUnit {
@Produces @PersistenceContext
EntityManager entityManager;
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/flash/TransactionInterceptor.java deleted 100644 → 0
/*
GRANITE DATA SERVICES
Copyright (C) 2007 ADEQUATE SYSTEMS SARL
This file is part of Granite Data Services.
Granite Data Services is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
Granite Data Services is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
package fi.insomnia.bortal.view.flash;
import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
import javax.transaction.UserTransaction;
@Transactional
@Interceptor
public class TransactionInterceptor {
@Inject
protected UserTransaction userTransaction;
@Inject
protected EntityManager entityManager;
@AroundInvoke
public Object manageTransaction(InvocationContext context) {
Object result = null;
try {
userTransaction.begin();
entityManager.joinTransaction();
result = context.proceed();
entityManager.flush();
userTransaction.commit();
return result;
} catch (Exception e) {
try {
userTransaction.rollback();
} catch (Exception f) {
}
throw new RuntimeException("Transaction failed", e);
}
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/flash/Transactional.java deleted 100644 → 0
/*
GRANITE DATA SERVICES
Copyright (C) 2007 ADEQUATE SYSTEMS SARL
This file is part of Granite Data Services.
Granite Data Services is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
Granite Data Services is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
package fi.insomnia.bortal.view.flash;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.interceptor.InterceptorBinding;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE, ElementType.METHOD})
@InterceptorBinding
public @interface Transactional {
}
code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/CalendarConverter.java
...@@ -2,6 +2,9 @@ package fi.insomnia.bortal.web.converter; ...@@ -2,6 +2,9 @@ package fi.insomnia.bortal.web.converter;
import java.util.Calendar; import java.util.Calendar;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.NoneScoped;
import javax.faces.bean.SessionScoped;
import javax.faces.component.UIComponent; import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.convert.Converter; import javax.faces.convert.Converter;
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/CardTemplateConverter.java 0 → 100644
package fi.insomnia.bortal.web.converter;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.NoneScoped;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.EventPk;
@ManagedBean(name = "cardTemplateConverter")
@NoneScoped
public class CardTemplateConverter implements Converter {
@EJB
private CardTemplateBeanLocal ctbean;
private static final Logger logger = LoggerFactory.getLogger(CardTemplateBeanLocal.class);
@Override
public Object getAsObject(FacesContext context, UIComponent component, String value) {
if (value == null || value.isEmpty()) {
return null;
}
Integer id = Integer.valueOf(value);
logger.debug("Converting CardTemplate value '{}', to id {}", value, id);
CardTemplate ret = ctbean.findById(id);
return ret;
}
@Override
public String getAsString(FacesContext context, UIComponent component, Object value) {
String ret = "";
if (value instanceof CardTemplate) {
EventPk id = ((CardTemplate) value).getId();
if (id != null) {
ret = id.getId().toString();
}
} else {
throw new RuntimeException("Entity not of type CardTemplate!!");
}
return ret;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/EmptyToNullConverter.java
...@@ -2,7 +2,6 @@ package fi.insomnia.bortal.web.converter; ...@@ -2,7 +2,6 @@ package fi.insomnia.bortal.web.converter;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.faces.bean.NoneScoped; import javax.faces.bean.NoneScoped;
import javax.faces.bean.SessionScoped;
import javax.faces.component.UIComponent; import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.convert.Converter; import javax.faces.convert.Converter;
......
code/LanBortalWeb/src/resources/i18n.properties
...@@ -48,6 +48,12 @@ page.place.mygroups.header=Omat paikat ...@@ -48,6 +48,12 @@ page.place.mygroups.header=Omat paikat
page.place.insertToken.pagegroup=user page.place.insertToken.pagegroup=user
page.place.insertToken.header=Syt konepaikkakoodi page.place.insertToken.header=Syt konepaikkakoodi
page.place.edit.pagegroup=admin
page.place.edit.header=Edit place
page.account.edit.pagegroup=admin
page.account.edit.header=Muokkaa tilitapahtumia
page.user.create.pagegroup=user page.user.create.pagegroup=user
page.user.create.header=Uusi kyttj page.user.create.header=Uusi kyttj
page.user.edit.pagegroup=user page.user.edit.pagegroup=user
......
code/LanBortalWeb/src/resources/i18n_fi.properties
...@@ -35,6 +35,26 @@ productshop.commit=Osta ...@@ -35,6 +35,26 @@ productshop.commit=Osta
product.boughtTotal=Tuotteita laskutettu product.boughtTotal=Tuotteita laskutettu
product.paid=Maksettu product.paid=Maksettu
placegroup.printPdf=Tulosta paikkakoodit
placegroup.name=Nimi
placegroup.edited=Muokattu
placegroup.created=Luotu
placegroup.details=Tiedot
placegroup.places=Paikat
placegroup.creator=Varaaja
placegroup.edit=Nyt
placegroupview.releasePlace=Vapauta
placegroupview.placeReleased=Paikka {0} vapautettu
placegroupview.placeReleaseFailed=Paikan vapauttaminen eponnistui!
placegroupview.reservationName=Paikka
placegroupview.token=Paikkakoodi / kyttj
placegroupview.groupCreator=Varaaja
placegroupview.reservationName=Paikka
placegroupview.toptext=
placegroupview.header=Omat paikat
placegroupview.noMemberships=Ei omia paikkoja
role.create=Luo rooli role.create=Luo rooli
role.edit=Muokkaa role.edit=Muokkaa
role.name=Nimi role.name=Nimi
...@@ -46,6 +66,8 @@ role.description=Kuvaus ...@@ -46,6 +66,8 @@ role.description=Kuvaus
role.edit.save=Tallenna role.edit.save=Tallenna
topmenu.adminfront=Admintavaraa topmenu.adminfront=Admintavaraa
topmenu.frontpage=Etusivu topmenu.frontpage=Etusivu
topmenu.shoppings=Kauppa topmenu.shoppings=Kauppa
...@@ -149,7 +171,15 @@ place.description=Kuvaus ...@@ -149,7 +171,15 @@ place.description=Kuvaus
place.name=Nimi place.name=Nimi
place.mapX=X place.mapX=X
place.mapY=Y place.mapY=Y
place.width=Leveys
place.height=Korkeus
place.releasetime=Vapautusaika
place.code=Paikkakoodi
place.product=Tuote
place.commit=Tallenna
editplace.header=Muokkaa paikkaa
place.edit=Muokkaa place.edit=Muokkaa
discount.percentage=Alennusprosentti discount.percentage=Alennusprosentti
discount.code=Alennuskoodi discount.code=Alennuskoodi
discount.details=Tiedot discount.details=Tiedot
...@@ -183,7 +213,16 @@ sidebar.bills=Laskut ...@@ -183,7 +213,16 @@ sidebar.bills=Laskut
sidebar.products=Tuotteet sidebar.products=Tuotteet
sidebar.other=Muuta sidebar.other=Muuta
sidebar.users=Kyttjt sidebar.users=Kyttjt
user.passwordlengthMessage="Liian lyhyt salasana" user.passwordlengthMessage=Salasana liian lyhyt
sidebar.maps=Kartat
sidebar.map.list=Kartat
sidebar.cardTemplate.create=Uusi korttipohja
sidebar.cardTemplate.list=Nyt korttipohjat
cardTemplate.name=Korttipohja
cardTemplate.power=Teho
cardTemplate.roles=Yhdistetyt roolit
topmenu.placemap=Paikkakartta topmenu.placemap=Paikkakartta
userview.passwordsChanged=Salasana vaihdettu userview.passwordsChanged=Salasana vaihdettu
...@@ -195,6 +234,10 @@ accountevent.quantity=Lukumr ...@@ -195,6 +234,10 @@ accountevent.quantity=Lukumr
accountevent.productname=Tuote accountevent.productname=Tuote
accountevent.unitPrice=Yksikkhinta accountevent.unitPrice=Yksikkhinta
accountevent.total=Yhteens accountevent.total=Yhteens
accountevent.eventTime=Tilattu
accountevent.delivered=Toimitettu
accountevent.seller=Myyj
accountevent.commit=Tallenna
mapView.errorWhenReservingPlace=Paikkaa varatessa tapahtui virhe. mapView.errorWhenReservingPlace=Paikkaa varatessa tapahtui virhe.
mapView.errorWhenReleasingPlace=Paikkaa vapauttassa tapahtui virhe. mapView.errorWhenReleasingPlace=Paikkaa vapauttassa tapahtui virhe.
...@@ -237,7 +280,7 @@ placeSelect.legend.red=Varattu paikka ...@@ -237,7 +280,7 @@ placeSelect.legend.red=Varattu paikka
placeSelect.legend.green=Oma ostettu paikka placeSelect.legend.green=Oma ostettu paikka
placeSelect.legend.blue=Oma valittu paikka placeSelect.legend.blue=Oma valittu paikka
placeSelect.legend.white=Vapaa paikka placeSelect.legend.white=Vapaa paikka
placeSelect.legend.grey=Vapautetaan myhemmin placeSelect.legend.grey=Ei vapauteta
placeSelect.totalPlaces=Paikkoja yhteens placeSelect.totalPlaces=Paikkoja yhteens
......
glassfishin_asennus.txt
...@@ -21,13 +21,37 @@ bortalRealm { ...@@ -21,13 +21,37 @@ bortalRealm {
}; };
Huom! Lue komennot lpi ja muokkaa muuttujat sopiviksi!
4. suorita seuraavat komennot hakemistossa glassfish/glassfish/bin/ 4. suorita seuraavat komennot hakemistossa glassfish/glassfish/bin/
# ./asadmin create-auth-realm --classname fi.insomnia.bortal.BortalRealm --property jaas-context=bortalRealm omniarealm # ./asadmin create-auth-realm --classname fi.insomnia.bortal.BortalRealm --property jaas-context=bortalRealm omniarealm
#
# ./asadmin create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGSimpleDataSource --restype javax.sql.DataSource --ping true --property DatabaseName=BortalDb:Password=derkoppa:User=bortal Omniapossu
# ./asadmin create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGSimpleDataSource --restype javax.sql.DataSource --ping true --property serverName=localhost:DatabaseName=bortal:Password=U8uGeK7Sav:User=bortal Omniapossu
5. Lis JDBC resource jdbc/bortal connection poolille Omniapossu wepiklist. 5. Lis JDBC resource jdbc/bortal connection poolille Omniapossu wepiklist.
6. Debug-tulosteet fi namespacesta saa nkyviin seuraavasti: 6. Debug-tulosteet fi namespacesta saa nkyviin seuraavasti:
# echo fi.level=FINEST >> glassfish/domains/domain1/config/logging.properties # echo fi.level=FINEST >> glassfish/domains/domain1/config/logging.properties
\ No newline at end of file
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 liskomentona:
# ./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
10. Lis JMS Destination Resource ( Resources -> JMS Resources -> Destination Resources )
JNDI Name: jms/mailque
Physical destinatino name: mailque
Resource type: javax.jms.Queue
11. (OPTIONAL) Jos haluat JK-connectorin kyttn apachen kanssa:
Configurations -> Server-config -> Network Config -> http-listner1 -> JK Listener ON
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!